@forloop-cc/forloop-opencode-plugin-planner 2.2.16 → 2.2.18

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@forloop-cc/forloop-opencode-plugin-planner",
-  "version": "2.2.16",
+  "version": "2.2.18",
   "description": "ForLoop integration plugin for opencode — Sprint, story, and agent tools for the ForLoop platform",
   "type": "module",
   "license": "MIT",

package/plugins/capabilities/api-client.ts

@@ -119,7 +119,6 @@ export class ForLoopAPIClient {
 
   private async ensureOpencodeApiToken(endpoint: string): Promise<void> {
     if (this.tokenType !== 'jwt') return;
-    if (!endpoint.startsWith('/api/opencode/')) return;
     if (endpoint.startsWith('/api/opencode/auth/tokens')) return;
 
     if (!this.jwtExchangePromise) {
@@ -221,7 +220,20 @@ export class ForLoopAPIClient {
           throw error;
         }
 
-        return response.json();
+        if (response.status === 204) {
+          return undefined as unknown as T;
+        }
+
+        const text = await response.text();
+        if (!text) {
+          return undefined as unknown as T;
+        }
+
+        try {
+          return JSON.parse(text) as T;
+        } catch {
+          throw new APIError('invalid_response', 'Failed to parse response body as JSON', 502);
+        }
       } catch (error) {
         lastError = error as Error;
         
@@ -456,8 +468,9 @@ export class ForLoopAPIClient {
   async getConversationHistory(params?: ConversationHistoryParams): Promise<any> {
     const query = new URLSearchParams();
     if (params?.sprintId) query.append('sprintId', String(params.sprintId));
+    if (params?.conversationId) query.append('conversationId', String(params.conversationId));
     if (params?.limit) query.append('limit', String(params.limit));
-    return this.request(`/api/opencode/messages?${query}`);
+    return this.request(`/api/opencode/conversations/context?${query}`);
   }
 
   async clearConversationHistory(params?: ClearHistoryParams): Promise<any> {
@@ -623,6 +636,7 @@ export interface WriteConversationEventInput {
 
 export interface ConversationHistoryParams {
   sprintId?: number;
+  conversationId?: string;
   limit?: number;
 }
 

package/plugins/hooks/message-recorder.ts

@@ -75,6 +75,22 @@ function extractTextFromParts(parts: any[]): string {
     .join('');
 }
 
+function isPendingUserMessagePart(messageID: string): boolean {
+  if (!messageID) return false;
+  for (const pending of userMessageBuffer.values()) {
+    if (pending.messageId === messageID) return true;
+  }
+  return false;
+}
+
+function looksLikeInjectedContext(text: string): boolean {
+  return (
+    text.includes('Current user request:') ||
+    text.includes('Conversation history:') ||
+    text.includes('Conversation summary:')
+  );
+}
+
 export function createChatMessageHook(client: ForLoopAPIClient) {
   return async (input: any, output: any) => {
     const sprintId = readActiveSprintId();
@@ -110,6 +126,7 @@ export function createEventHook(client: ForLoopAPIClient) {
   const textBuffer = new Map<string, string>();
   const readyToStream = new Set<string>(); // messageIDs that have passed the context phase
   const directSentText = new Map<string, string>(); // trackingId → last full text sent via direct HTTP
+  const directSentIndex = new Map<string, number>(); // trackingId → next chunk index
 
   const sendStreamDelta = (sprintId: number, trackingId: string, taskId: string, fullText: string) => {
     const lastSent = directSentText.get(trackingId) || '';
@@ -117,12 +134,14 @@ export function createEventHook(client: ForLoopAPIClient) {
     const delta = fullText.startsWith(lastSent) ? fullText.substring(lastSent.length) : fullText;
     if (!delta) return;
     directSentText.set(trackingId, fullText);
+    const index = directSentIndex.get(trackingId) || 0;
+    directSentIndex.set(trackingId, index + 1);
     client.sendStreamChunk({
       taskId: taskId || '',
       trackingId,
       sprintId,
       chunk: delta,
-      index: 0,
+      index,
     }).catch((err: Error) => {
       console.warn('[ForLoop] Direct stream chunk failed:', err.message);
     });
@@ -153,12 +172,19 @@ export function createEventHook(client: ForLoopAPIClient) {
             break;
           }
 
-          // Skip the initial context text (the conversation history loaded by the agent).
-          // Context text is massive (30K+ chars), assistant responses are small (<5K).
-          // Also track that we've seen the context and subsequent text is streamable.
-          const textLen = (part.text || '').length;
-          if (!readyToStream.has(messageID) && textLen > 5000) {
-            if (debugStream) console.error('[stream-event] skipping context text', { trackingId, messageID, textLen });
+          // Text parts that belong to the pending user message carry the
+          // injected conversation history — never stream them as agent output.
+          if (isPendingUserMessagePart(messageID || '')) {
+            if (debugStream) console.error('[stream-event] skipping user-message text', { trackingId, messageID });
+            break;
+          }
+
+          // Fallback: the very first text part of a message that carries the
+          // injected-prompt markers is a replay of the loaded context, not a
+          // genuine response. A length threshold alone would discard long
+          // assistant replies.
+          if (!readyToStream.has(messageID) && looksLikeInjectedContext(part.text || '')) {
+            if (debugStream) console.error('[stream-event] skipping injected context text', { trackingId, messageID });
             readyToStream.add(messageID); // mark as past context
             break;
           }
@@ -166,6 +192,7 @@ export function createEventHook(client: ForLoopAPIClient) {
           readyToStream.add(messageID);
           const current = textBuffer.get(part.messageID) || '';
           textBuffer.set(part.messageID, part.text || current);
+          const textLen = (part.text || '').length;
           if (debugStream) console.error('[stream-event] writing chunk', { trackingId, textLen });
 
           // Send delta directly for real-time streaming (primary path)

package/plugins/tools/agent-suggestion-tools.ts

@@ -173,14 +173,26 @@ export function createConversationHistoryTool(client: ForLoopAPIClient) {
       const resolution = await resolveSprintId(args.sprintId, context.directory);
       const sprintId = resolution.sprintId || args.sprintId;
 
+      if (typeof sprintId !== 'number' || !Number.isInteger(sprintId) || sprintId <= 0) {
+        return [
+          '❌ No sprint ID provided.',
+          '',
+          'Please specify a sprint ID using one of these methods:',
+          '  1. Pass --sprintId flag',
+          '  2. Set FORLOOP_SPRINT_ID environment variable',
+          '  3. Use a git branch named sprint-XXX (e.g., sprint-123)',
+        ].join('\n');
+      }
+
       try {
         const history = await client.getConversationHistory({
           sprintId,
           limit: args.limit,
         });
 
-        const messages = history.messages || [];
-        if (messages.length === 0) {
+        const summaries = history?.summaries || [];
+        const messages = history?.messages || [];
+        if (summaries.length === 0 && messages.length === 0) {
           return 'No conversation history found.';
         }
 
@@ -189,28 +201,15 @@ export function createConversationHistoryTool(client: ForLoopAPIClient) {
           '',
         ];
 
-        for (const msg of messages.slice(0, args.limit)) {
-          const preview = (msg.userMessage || 'No message').substring(0, 80);
-          const hasResponse = msg.agentResponse && msg.agentResponse.trim();
-
-          lines.push(`📌 **${preview}**${preview.length >= 80 ? '...' : ''}`);
-
-          if (msg.conversationId) {
-            const agentMatch = msg.conversationId.match(/agent:([^:]+)/);
-            if (agentMatch) {
-              lines.push(`   Agent: ${agentMatch[1]} | ${formatDate(msg.timestamp)}`);
-            } else {
-              lines.push(`   ${formatDate(msg.timestamp)}`);
-            }
-          } else {
-            lines.push(`   ${formatDate(msg.timestamp)}`);
-          }
-
-          if (hasResponse) {
-            const respPreview = msg.agentResponse.substring(0, 100);
-            lines.push(`   → ${respPreview}${msg.agentResponse.length > 100 ? '...' : ''}`);
-          }
+        for (const summary of summaries) {
+          lines.push('📋 **Sprint summary**', '', summary, '');
+        }
 
+        for (const msg of messages.slice(0, args.limit)) {
+          const badge = msg.role === 'assistant' ? '🤖 Assistant' : '👤 User';
+          const content = String(msg.content || '');
+          const preview = content.substring(0, 120);
+          lines.push(`${badge}: ${preview}${content.length > 120 ? '...' : ''}`);
           lines.push('');
         }
 
@@ -264,12 +263,3 @@ export function createClearHistoryTool(client: ForLoopAPIClient) {
     },
   });
 }
-
-function formatDate(dateString: string): string {
-  return new Date(dateString).toLocaleDateString('en-US', {
-    month: 'short',
-    day: 'numeric',
-    hour: '2-digit',
-    minute: '2-digit',
-  });
-}

package/plugins/tools/ai-trigger-tools.ts

@@ -111,9 +111,15 @@ function createCreatorGenerateTool(client: ForLoopAPIClient) {
           storyId: args.storyId,
         });
 
+        // The ECS pipeline (EventBridge → SFN → ECS) does not carry `metadata`,
+        // so the Creator agent only ever sees the `message`. Bake the storyId into
+        // the message so the Creator can forloopContextFetch the correct story.
+        const baseMessage = args.message || 'Generate the files described in the assigned story';
+        const message = `${baseMessage}\n\nTarget story ID: ${args.storyId}`;
+
         const response = await client.chatWithAI({
           sprintId: args.sprintId,
-          message: args.message,
+          message,
           selectedAgentKey: 'forLoopCreator',
           type: 'creator.generate',
           metadata: { channel: 'creator_generate', storyId: args.storyId },