Merge pull request #52 from ssdeanx/develop

Develop

Author: ssdeanx

app/chat/providers/chat-context.tsx

@@ -321,7 +321,7 @@ export function ChatProvider({
   }, [messages])
 
   const sendMessage = useCallback(
-    (text: string, _files?: File[]) => {
+    (text: string, files?: File[]) => {
       if (!text.trim() || isLoading) {return}
       setChatError(null)
       aiSendMessage({ text: text.trim() })

app/networks/providers/network-context.tsx

@@ -295,18 +295,28 @@ export function NetworkProvider({
     for (const message of messages) {
       if (message.role === "assistant" && message.parts !== null) {
         for (const [partIndex, part] of message.parts.entries()) {
-          // Handle agent and workflow progress events
+          // Handle legacy agent/workflow events by normalizing them into progress events
           if (part.type === "data-tool-agent" || part.type === "data-tool-workflow") {
-            const agentPart = part as { data: AgentDataPart }
-            const eventData = agentPart.data
+            const agentPart = part as { data?: AgentDataPart }
+            const eventData = agentPart.data as Record<string, unknown> | undefined
+            const dataObj = eventData?.data as Record<string, unknown> | undefined
 
-            if (eventData?.data?.text?.trim()) {
+            const msg = typeof dataObj?.text === 'string' ? dataObj.text
+              : typeof dataObj?.message === 'string' ? dataObj.message
+              : typeof eventData?.message === 'string' ? eventData.message
+              : typeof eventData?.text === 'string' ? eventData.text
+              : ''
+
+            const stage = typeof eventData?.stage === 'string' ? eventData.stage : (typeof dataObj?.stage === 'string' ? dataObj.stage : part.type.replace("data-tool-", ""))
+            const agentId = typeof eventData?.id === 'string' ? eventData.id : undefined
+
+            if (msg && msg.trim().length > 0) {
               allProgressEvents.push({
                 id: `${message.id}-${part.type}-${partIndex}`,
-                stage: part.type.replace("data-tool-", ""),
+                stage: String(stage),
                 status: "in-progress",
-                message: eventData.data.text,
-                agentId: eventData.id,
+                message: msg,
+                agentId,
                 timestamp: new Date(),
                 data: eventData,
               })
@@ -318,7 +328,7 @@ export function NetworkProvider({
             const progressPart = part as { type: string; data?: { status?: string; message?: string; stage?: string; agentId?: string } }
             const eventData = progressPart.data
 
-            if (eventData?.status && (eventData.status === "in-progress" || eventData.status === "done" || eventData.status === "error")) {
+            if (typeof eventData?.status === 'string' && (eventData.status === "in-progress" || eventData.status === "done")) {
               allProgressEvents.push({
                 id: `${message.id}-${part.type}-${partIndex}`,
                 stage: eventData.stage ?? "progress",

app/workflows/providers/workflow-context.tsx

@@ -319,17 +319,20 @@ export function WorkflowProvider({
             }
           }
 
-          // Handle tool agent events (data-tool-agent)
+          // Handle legacy tool agent events (data-tool-agent) by normalizing into progress events
           if (part.type === "data-tool-agent") {
             const agentPart = part as { data?: AgentDataPart }
-            const eventData = agentPart.data
+            const eventData = agentPart.data as Record<string, unknown> | undefined
+            const dataObj = eventData?.data as Record<string, unknown> | undefined
+            const msg = typeof dataObj?.text === 'string' ? dataObj.text : (typeof dataObj?.message === 'string' ? dataObj.message : (typeof eventData?.message === 'string' ? eventData.message : `Agent executing tool`))
+            const stage = typeof eventData?.stage === 'string' ? eventData.stage : 'tool agent'
 
-            if (eventData) {
+            if (msg && msg.trim().length > 0) {
               allProgressEvents.push({
                 id: `${message.id}-${part.type}-${partIndex}`,
-                stage: "tool agent",
-                status: "in-progress",
-                message: `Agent executing tool`,
+                stage: String(stage),
+                status: 'in-progress',
+                message: msg,
                 timestamp: new Date(),
                 data: eventData,
               })

eslint.config.js

@@ -62,8 +62,8 @@ export default [
             },
         },
         rules: {
-            'no-unused-vars': ['warn', { argsIgnorePattern: '^_', varsIgnorePattern: '^_' }],
-            '@typescript-eslint/no-unused-vars': ['warn', { argsIgnorePattern: '^_', varsIgnorePattern: '^_' }],
+            'no-unused-vars': ['warn', {  }],
+            '@typescript-eslint/no-unused-vars': ['warn', {}],
             'no-console': 'warn',
             'no-var': 'warn',
             'object-shorthand': 'error',

memory-bank/copilot-rules.md

@@ -152,6 +152,32 @@ If any fail, do NOT proceed. Fix issues first.
 
 ---
 
+## Tool Streaming & Progress Events
+
+All tools must follow the TASK001 streaming convention:
+
+- Prefer the runtime agent instance via `context.mastra.getAgent('<agentId>')` when available, otherwise fall back to the local agent import.
+- If the agent exposes a stream API, call `agent.stream(prompt)` returning a `MastraModelOutput` and:
+  - Pipe `textStream` / `fullStream` to `context.writer` so the UI receives nested chunks
+  - Await `stream.text` for the final text
+  - Use `stream.object` when present for structured responses and fall back to JSON parsing of `stream.text`
+- If no streaming API, call `agent.generate(prompt)` and parse `response.object` or JSON text as a fallback.
+- Emit progress events with the exact format below at start/in-progress/done:
+
+```typescript
+await context?.writer?.custom({
+  type: 'data-tool-progress',
+  data: {
+    status: 'in-progress',
+    message: `📈 Fetching tool-id data for ${inputData.symbol}/${inputData.market}`,
+    stage: 'tool-id'
+  },
+  id: 'tool-id'
+});
+```
+
+- Update the TASK001 scratchpad (`/memory-bank/tasks/TASK001-tool-streaming.md`) when implementing or changing tool streaming behavior.
+
 ## 🎨 UI Component Rules
 
 ### Component Locations

memory-bank/memory-bank-instructions.md

@@ -37,6 +37,7 @@ This document instructs GitHub Copilot on how to:
    - Status check       → + progress.md
 ```
 
+Note: For tool implementation tasks, consult `memory-bank/tasks/TASK001-tool-streaming.md` which documents the standard streaming and progress-event conventions (use `context.writer` with `data-tool-progress` start/in-progress/done events, and prefer `agent.stream()` with `MastraModelOutput` when available). Update the task scratchpad with any deviations or agent-specific details.
 ### On Context Reset (New Session)
 
 ```markdown

memory-bank/tasks/TASK001-tool-streaming.md

@@ -1 +1 @@
-# [Task 001] - Implement Tool Streaming with Writer in ALL Tools\n\n**Status:** In Progress  \n**Added:** 2025-11-22  \n**Updated:** 2025-11-22\n\n## Original Request\n\nUser: Fetch Mastra tool streaming docs, implement in #file:tools. Clarified: ALL tools use writer directly, no utility.\n\n## Thought Process\n\nMastra docs: execute({context, writer?}): await writer?.write({type:'custom-event'| 'progress', ...}); return result. 12 tools need surgical updates: add writer param, emit start/progress/end.\n\n## Implementation Plan\n\n- Create tasks structure\n- Update all 12 .tool.ts executes\n- Add streaming tests\n- Update AGENTS.md\n\n## Progress Tracking\n\n**Overall Status:** In Progress - 10%\n\n### Subtasks\n\n| ID  | Description                          | Status      | Updated     | Notes \n|-----|--------------------------------------|-------------|-------------|-------\n| 1.1 | Create tasks/ folder & files         | Complete    | 2025-11-22 | Done\n| 1.2 | Read all tool files                  | In Progress | 2025-11-22 | 3 read, 9 pending\n| 1.3 | Edit weather-tool.ts                 | Not Started |             | \n| 1.4 | Edit serpapi-search.tool.ts          | Not Started |             | \n| ... | Edit remaining tools                 | Not Started |             | \n| 1.x | Tests & AGENTS.md                    | Not Started |             | \n\n## Progress Log\n\n### 2025-11-22\n- Created tasks structure\n- Read 3 sample tools\n- Planning batch edits\n
+# [Task 001] - Implement Tool Streaming with Writer in ALL Tools\n\n**Status:** In Progress  \n**Added:** 2025-11-22  \n**Updated:** 2025-11-22\n\n## Original Request\n\nUser: Fetch Mastra tool streaming docs, implement in #file:tools. Clarified: ALL tools use writer directly, no utility.\n\n## Thought Process\n\nMastra docs: execute({context, writer?}): await writer?.write({type:'custom-event'| 'progress', ...}); return result. 12 tools need surgical updates: add writer param, emit start/progress/end.\n\n## Implementation Plan\n\n- Create tasks structure\n- Update all 12 .tool.ts executes\n- Add streaming tests\n- Update AGENTS.md\n\n## Progress Tracking\n\n**Overall Status:** In Progress - 10%\n\n### Subtasks\n\n| ID  | Description                          | Status      | Updated     | Notes \n|-----|--------------------------------------|-------------|-------------|-------\n| 1.1 | Create tasks/ folder & files         | Complete    | 2025-11-22 | Done\n| 1.2 | Read all tool files                  | In Progress | 2025-11-22 | 3 read, 9 pending\n| 1.3 | Edit weather-tool.ts                 | Not Started |             | \n| 1.4 | Edit serpapi-search.tool.ts          | Not Started |             | \n| ... | Edit remaining tools                 | Not Started |             | \n| 1.x | Tests & AGENTS.md                    | Not Started |             | \n\n## Progress Log\n\n### 2025-11-22\n- Created tasks structure\n- Read 3 sample tools\n- Planning batch edits\n

memory-bank/tasks/TASK001-update-2025-12-14.md

@@ -0,0 +1,27 @@
+# TASK001 - Update Log (2025-12-14)
+
+Summary of changes performed to align tools with the streaming + progress convention:
+
+- Replaced `data-tool-agent` messages with `data-tool-progress` (standard in-progress/done events) in:
+  - `src/mastra/tools/evaluateResultTool.ts`
+  - `src/mastra/tools/extractLearningsTool.ts`
+  - `src/mastra/tools/editor-agent-tool.ts`
+  - `src/mastra/tools/copywriter-agent-tool.ts`
+
+- Normalized nested-agent streaming pattern in tools to:
+  - Prefer `context.mastra.getAgent()` runtime instance if available, otherwise fall back to local agent import
+  - Use `agent.stream(prompt)` returning `MastraModelOutput` when available
+  - Pipe `textStream` / `fullStream` to `context.writer`
+  - Parse `stream.object` or JSON text safely for structured output
+
+- Updated `src/mastra/tools/financial-chart-tools.ts` to use the same streaming pattern and to validate agent capability (check for `generate` or `stream`).
+
+- Updated client-side parsers to normalize legacy `data-tool-agent` parts into `data-tool-progress` events:
+  - `app/networks/providers/network-context.tsx`
+  - `app/workflows/providers/workflow-context.tsx`
+
+- Updated `src/mastra/tools/AGENTS.md` with a note referencing this task and the progress convention.
+
+Notes:
+- Tests will be added next to verify that progress events and streaming behavior are emitted consistently. (Pending)
+- If you'd like, I can add/restore unit tests and run the test suite now.

src/mastra/AGENTS.md

@@ -45,7 +45,7 @@ This folder contains the middleware and high-level components that define Mastra
 
 - Use explicit Zod schemas for every tool input/output.
 - Keep tools small and side-effect-free when possible; agents orchestrate tools and handle context.
-- Use `RuntimeContext` to enforce access control in tools and workflows.
+- Use `RequestContext` (per-request) or agent-specific runtime context types (e.g. `EditorRuntimeContext`) to enforce access control in tools and workflows.
 
 ---
 Last updated: 2025-11-26

src/mastra/agents/researchAgent.ts

@@ -34,6 +34,9 @@ export type UserTier = 'free' | 'pro' | 'enterprise'
 export interface ResearchRuntimeContext {
   'user-tier': UserTier
   language: 'en' | 'es' | 'ja' | 'fr'
+  // Optional runtime fields the server middleware may populate
+  userId?: string
+  researchPhase?: 'initial' | 'followup' | 'validation' | string
 }
 log.info('Initializing Research Agent...')
 
@@ -46,13 +49,18 @@ export const researchAgent = new Agent({
     // runtimeContext is read at invocation time
     const userTier = requestContext.get('user-tier') ?? 'free'
     const language = requestContext.get('language') ?? 'en'
+    const userId = requestContext.get('userId') ?? 'anonymous'
+    const researchPhase = requestContext.get('researchPhase') ?? 'initial'
+
     return {
       role: 'system',
       content: `
         <role>
 
         Tier: ${userTier}
         Language: ${language}
+        UserId: ${userId}
+        Research Phase: ${researchPhase}
 
         You are a Senior Research Analyst. Your goal is to research topics thoroughly by following a precise, multi-phase process.
         </role>
@@ -160,8 +168,8 @@ export const researchAgent = new Agent({
       // higher quality (chat style) for enterprise
       return google.chat('gemini-3-pro-preview')
     } else if (userTier === 'pro') {
-      // Chat bison for pro as well
-      return googleAI
+      // cheaper/faster model for pro tier
+      return 'google/gemini-2.5-flash-preview-09-2025'
     }
     // cheaper/faster model for free tier
     return google.chat('gemini-2.5-flash-preview-09-2025')