@gopersonal/advisor 1.0.4 → 2.0.0

package/build/index.js

@@ -170,11 +170,44 @@ function getModelOverride() {
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
-async function askOpencode(prompt, systemPrompt) {
+function extractTextFromMessages(messages) {
+    const allText = [];
+    for (const m of messages) {
+        const msg = m;
+        if (msg.info && typeof msg.info === "object" && "role" in msg.info && msg.info.role === "assistant") {
+            if (Array.isArray(msg.parts)) {
+                for (const part of msg.parts) {
+                    if (part && typeof part === "object" && part.type === "text" && "text" in part) {
+                        allText.push(String(part.text));
+                    }
+                }
+            }
+        }
+    }
+    return allText.join("\n");
+}
+function extractToolSummary(messages) {
+    const tools = [];
+    for (const m of messages) {
+        const msg = m;
+        if (Array.isArray(msg.parts)) {
+            for (const part of msg.parts) {
+                const p = part;
+                if (p && p.type === "tool-invocation" && p.toolName) {
+                    const args = p.args ? JSON.stringify(p.args).slice(0, 200) : "";
+                    tools.push(`- ${p.toolName}${args ? `: ${args}` : ""}`);
+                }
+            }
+        }
+    }
+    return tools.length > 0 ? `\n\n## Tools used\n${tools.join("\n")}` : "";
+}
+async function runOpencodeSession(prompt, systemPrompt, options = {}) {
+    const { timeoutMs = 90_000, stableThreshold = 3, sessionTitle = "Advisor Query", } = options;
     const client = await getOpencodeClient();
     const directory = process.env.ADVISOR_DIRECTORY;
     const sessionResult = await client.session.create({
-        title: "Advisor Query",
+        title: sessionTitle,
         ...(directory ? { directory } : {}),
     });
     if (!sessionResult.data) {
@@ -183,7 +216,6 @@ async function askOpencode(prompt, systemPrompt) {
     const sessionId = sessionResult.data.id;
     const modelOverride = getModelOverride();
     try {
-        // Send the prompt asynchronously - returns 204 immediately while session processes
         try {
             await client.session.promptAsync({
                 sessionID: sessionId,
@@ -192,21 +224,19 @@ async function askOpencode(prompt, systemPrompt) {
                 ...(directory ? { directory } : {}),
                 parts: [{ type: "text", text: prompt }],
             });
-            console.error(`[advisor] Prompt submitted async`);
+            console.error(`[advisor] Prompt submitted (timeout: ${timeoutMs / 1000}s, stable: ${stableThreshold} cycles)`);
         }
         catch (err) {
             const msg = err instanceof Error ? err.message : String(err);
             throw new Error(`Failed to submit prompt: ${msg}`);
         }
-        // Poll for the assistant's response and auto-answer any questions
-        const maxWaitMs = 90_000;
         const pollIntervalMs = 2000;
         const startTime = Date.now();
-        let lastTextLength = 0;
+        let lastContentLength = 0;
         let stableCount = 0;
         const answeredQuestions = new Set();
         await sleep(3000);
-        while (Date.now() - startTime < maxWaitMs) {
+        while (Date.now() - startTime < timeoutMs) {
             // Auto-answer any pending questions (opencode agent may ask permission)
             try {
                 const questions = await client.question.list({});
@@ -215,7 +245,6 @@ async function askOpencode(prompt, systemPrompt) {
                         if (q.sessionID === sessionId && !answeredQuestions.has(q.id)) {
                             console.error(`[advisor] Auto-answering question: ${q.id}`);
                             const answers = q.questions.map((qi) => {
-                                // Pick the first option for each question
                                 const opts = qi.options;
                                 return opts && opts.length > 0 ? [opts[0].label] : ["yes"];
                             });
@@ -231,7 +260,6 @@ async function askOpencode(prompt, systemPrompt) {
             catch {
                 // question API may not be available, ignore
             }
-            // Check messages for the assistant's response
             const messagesResult = await client.session.messages({
                 sessionID: sessionId,
             });
@@ -246,12 +274,13 @@ async function askOpencode(prompt, systemPrompt) {
                 await sleep(pollIntervalMs);
                 continue;
             }
-            // Extract text parts
+            // Extract text from latest assistant message
             const textParts = [];
             if (Array.isArray(assistantMsg.parts)) {
                 for (const part of assistantMsg.parts) {
-                    if (part && typeof part === "object" && part.type === "text" && "text" in part) {
-                        textParts.push(String(part.text));
+                    const p = part;
+                    if (p && p.type === "text" && "text" in p) {
+                        textParts.push(String(p.text));
                     }
                 }
             }
@@ -261,27 +290,52 @@ async function askOpencode(prompt, systemPrompt) {
             if (info.time && typeof info.time === "object") {
                 const time = info.time;
                 if (time.completed && currentText.length > 0) {
-                    console.error(`[advisor] Response completed (${currentText.length} chars)`);
-                    return currentText;
+                    console.error(`[advisor] Completed (${currentText.length} chars)`);
+                    const toolSummary = extractToolSummary(messages);
+                    return currentText + toolSummary;
                 }
             }
-            // Fallback: text stopped growing for 3 cycles
-            if (currentText.length > 0) {
-                if (currentText.length === lastTextLength) {
+            // Stability check: use total content across ALL messages to detect when agent stops working
+            const totalContentLength = messages.reduce((acc, m) => {
+                const msg = m;
+                if (Array.isArray(msg.parts)) {
+                    for (const p of msg.parts) {
+                        const part = p;
+                        if (part && "text" in part)
+                            acc += String(part.text).length;
+                        if (part && part.type === "tool-invocation")
+                            acc += 100; // count tool calls as content
+                    }
+                }
+                return acc;
+            }, 0);
+            if (totalContentLength > 0) {
+                if (totalContentLength === lastContentLength) {
                     stableCount++;
-                    if (stableCount >= 3) {
-                        console.error(`[advisor] Response stable (${currentText.length} chars)`);
-                        return currentText;
+                    if (stableCount >= stableThreshold) {
+                        console.error(`[advisor] Stable after ${stableThreshold} cycles (${totalContentLength} total content)`);
+                        const toolSummary = extractToolSummary(messages);
+                        return currentText + toolSummary;
                     }
                 }
                 else {
                     stableCount = 0;
-                    lastTextLength = currentText.length;
+                    lastContentLength = totalContentLength;
                 }
             }
             await sleep(pollIntervalMs);
         }
-        throw new Error("Timed out waiting for advisor response");
+        // Timeout — return partial results if available
+        const finalMessages = await client.session.messages({ sessionID: sessionId });
+        if (finalMessages.data && Array.isArray(finalMessages.data)) {
+            const text = extractTextFromMessages(finalMessages.data);
+            const toolSummary = extractToolSummary(finalMessages.data);
+            if (text) {
+                console.error(`[advisor] Timed out but returning partial result (${text.length} chars)`);
+                return text + toolSummary + "\n\n[Note: Task timed out but partial work was completed]";
+            }
+        }
+        throw new Error("Timed out waiting for response");
     }
     finally {
         try {
@@ -292,6 +346,14 @@ async function askOpencode(prompt, systemPrompt) {
         }
     }
 }
+// Legacy wrapper for advisory tools
+async function askOpencode(prompt, systemPrompt) {
+    return runOpencodeSession(prompt, systemPrompt, {
+        timeoutMs: 90_000,
+        stableThreshold: 3,
+        sessionTitle: "Advisor Query",
+    });
+}
 // --- MCP Server setup ---
 const server = new McpServer({
     name: "advisor",
@@ -401,6 +463,66 @@ server.registerTool("get_second_opinion", {
         };
     }
 });
+// Tool 3: execute_task
+server.registerTool("execute_task", {
+    description: "Delegate a coding task to a separate AI agent that will actually DO the work — edit files, run commands, " +
+        "create code, fix bugs, etc. Use this when you want another agent to independently complete a task. " +
+        "The agent has full access to the project: it can read/write files, run bash commands, and make changes. " +
+        "Use this for: implementing features, fixing bugs, refactoring code, writing tests, running builds, " +
+        "setting up configurations, or any hands-on coding work you want to delegate. " +
+        "Be specific about what you want done — the agent works independently and returns results when finished.",
+    inputSchema: {
+        task: z
+            .string()
+            .describe("Clear description of what needs to be done. Be specific: include file paths, function names, " +
+            "expected behavior, and acceptance criteria. The more detail you provide, the better the result."),
+        context: z
+            .string()
+            .optional()
+            .describe("Additional context: relevant code snippets, error messages, architectural decisions, " +
+            "or constraints the agent should know about."),
+        files_to_focus: z
+            .string()
+            .optional()
+            .describe("Comma-separated list of file paths the agent should focus on (e.g. 'src/auth.ts, src/routes/login.ts'). " +
+            "Helps the agent find relevant code faster."),
+    },
+}, async ({ task, context, files_to_focus }) => {
+    const systemPrompt = `You are a senior software engineer executing a coding task. Your job is to COMPLETE the task, not discuss it.\n\n` +
+        `RULES:\n` +
+        `1. DO the work. Read files, write code, run commands. Don't just explain what to do.\n` +
+        `2. Start by understanding the codebase — read relevant files before making changes.\n` +
+        `3. Make all necessary changes to fully complete the task.\n` +
+        `4. After making changes, verify they work (run the code, check for errors, test if possible).\n` +
+        `5. If you encounter an error, fix it. Don't stop at the first problem.\n` +
+        `6. When done, provide a brief summary of what you changed and why.\n\n` +
+        `You have full access to the project filesystem and shell. Use your tools actively.`;
+    let userPrompt = `## Task\n${task}`;
+    if (context) {
+        userPrompt += `\n\n## Context\n${context}`;
+    }
+    if (files_to_focus) {
+        userPrompt += `\n\n## Key files to focus on\n${files_to_focus}`;
+    }
+    try {
+        const result = await runOpencodeSession(userPrompt, systemPrompt, {
+            timeoutMs: 300_000, // 5 minutes — tasks need more time than advisory questions
+            stableThreshold: 8, // 16 seconds of no activity — tasks involve tool calls between text
+            sessionTitle: "Task Execution",
+        });
+        return { content: [{ type: "text", text: result }] };
+    }
+    catch (error) {
+        const msg = error instanceof Error ? error.message : String(error);
+        return {
+            content: [{
+                    type: "text",
+                    text: `Task execution failed: ${msg}\nMake sure opencode is installed and configured with a provider.`,
+                }],
+            isError: true,
+        };
+    }
+});
 // --- Start the server ---
 async function main() {
     const transport = new StdioServerTransport();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gopersonal/advisor",
-  "version": "1.0.4",
+  "version": "2.0.0",
   "type": "module",
   "main": "./build/index.js",
   "bin": {
@@ -24,7 +24,7 @@
   ],
   "author": "gopersonal",
   "license": "ISC",
-  "description": "MCP server that gives AI agents a second opinion via OpenCode SDK",
+  "description": "MCP server that gives AI agents advice and can execute coding tasks via OpenCode SDK",
   "repository": {
     "type": "git",
     "url": "https://github.com/gopersonal/calvincode-mcps"