@myagentroam/agent 0.9.80 → 0.9.81

package/dist/sdk/agent.js

@@ -435,11 +435,12 @@ export async function createMarAgent(options) {
                             ? {}
                             : { workspaceDisplayPath: logicalWorkspace })
                     });
-                    let agentInstructionMessage = mode === 'compact'
-                        ? undefined
-                        : renderAgentInstructions(instructionContext?.entries ?? [], previousMayContainAgentInstructions);
-                    let agentInstructionInsertIndex = mode === 'compact' ? undefined : Math.max(0, messages.length - 1);
-                    if (agentInstructionInsertIndex &&
+                    let agentInstructionMessage = renderAgentInstructions(instructionContext?.entries ?? [], previousMayContainAgentInstructions);
+                    let agentInstructionInsertIndex = mode === 'compact'
+                        ? contextualInstructionInsertIndex(messages)
+                        : Math.max(0, messages.length - 1);
+                    if (mode !== 'compact' &&
+                        agentInstructionInsertIndex &&
                         messages[agentInstructionInsertIndex - 1]?.contextKind === 'environment')
                         agentInstructionInsertIndex--;
                     const tools = withCodeModeResultTypes(availableTools.filter((tool) => tool.name !== 'skill' || (instructionContext?.skills.size ?? 0) > 0));
@@ -506,7 +507,8 @@ export async function createMarAgent(options) {
                     if (mode === 'compact') {
                         const compactSystemPrompt = initialSystemPrompt;
                         const compactHistory = [...messages];
-                        const nativeMessages = buildNativeCompactionMessages(messages, {
+                        const projectedHistory = normalizeMessagesForModel(insertContextualInstructions(compactHistory, agentInstructionInsertIndex, agentInstructionMessage), { supportsImages: false });
+                        const nativeMessages = buildNativeCompactionMessages(projectedHistory, {
                             focus: input.prompt,
                             highDensityCompaction: selectedModel.highDensityCompaction
                         });
@@ -555,7 +557,11 @@ export async function createMarAgent(options) {
                         let compactSummary = '';
                         const compactSystemPrompt = buildExecutionSystemPrompt(executionTools, 'run');
                         const compactHistory = retainCurrent ? messages.slice(0, -1) : messages;
-                        const nativeCompactMessages = buildNativeCompactionMessages(compactHistory, {
+                        const compactInstructionInsertIndex = retainCurrent
+                            ? contextualInstructionInsertIndex(compactHistory)
+                            : agentInstructionInsertIndex;
+                        const projectedHistory = normalizeMessagesForModel(insertContextualInstructions(compactHistory, compactInstructionInsertIndex, agentInstructionMessage), { supportsImages: false });
+                        const nativeCompactMessages = buildNativeCompactionMessages(projectedHistory, {
                             highDensityCompaction: selectedModel.highDensityCompaction
                         });
                         const compactOverheadTokens = estimatedRequestTokens(compactSystemPrompt, buildCompactionMessages('', selectedModel.highDensityCompaction), executionTools);
@@ -696,9 +702,11 @@ export async function createMarAgent(options) {
                                 deltaMessages: requestContextMessages.slice(sessionRuntime.responsesChain.messageCount)
                             }
                             : undefined;
-                        const modelMessages = normalizeMessagesForModel(insertContextualInstructions(requestContextMessages, agentInstructionInsertIndex, agentInstructionMessage), {
-                            supportsImages: selectedModel.inputCapabilities.includes('IMAGE')
-                        });
+                        const modelMessages = mode === 'compact'
+                            ? normalizeMessagesForModel(requestContextMessages, { supportsImages: false })
+                            : normalizeMessagesForModel(insertContextualInstructions(requestContextMessages, agentInstructionInsertIndex, agentInstructionMessage), {
+                                supportsImages: selectedModel.inputCapabilities.includes('IMAGE')
+                            });
                         let sawModelSemanticEvent = false;
                         const roundMessageCount = messages.length;
                         const persistToolCalls = async (calls) => {
@@ -1697,6 +1705,14 @@ function insertContextualInstructions(messages, index, content, environmentConte
         });
     return result;
 }
+function contextualInstructionInsertIndex(messages) {
+    let index = messages.findLastIndex((message) => message.role === 'user' && message.contextKind !== 'environment');
+    if (index < 0)
+        return 0;
+    if (index > 0 && messages[index - 1]?.contextKind === 'environment')
+        index--;
+    return index;
+}
 function estimatedRequestTokens(system, messages, tools, images) {
     const transientImageCount = messages.reduce((total, message) => total + (message.images?.length ?? 0), images?.length ?? 0);
     const textMessages = messages.map((message) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myagentroam/agent",
-  "version": "0.9.80",
+  "version": "0.9.81",
   "description": "Embeddable MAR coding agent SDK and CLI.",
   "license": "Apache-2.0",
   "type": "module",