@myvillage/cli 1.30.0 → 1.32.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myvillage/cli",
-  "version": "1.30.0",
+  "version": "1.32.0",
   "description": "MyVillageOS CLI for community developers",
   "type": "module",
   "bin": {

package/src/agent-runtime/loop.js

@@ -12,7 +12,8 @@ import { getMCPTools, cleanupMCPClients } from './mcp-client.js';
 import { gatherContext } from './context.js';
 import { isWithinActiveHours, getNextCheckInMs } from './scheduler.js';
 import { parse as parseYaml } from 'yaml';
-import { postAgentHeartbeat, listAgentTasks, claimAgentTask, completeAgentTask } from '../utils/api.js';
+import { postAgentHeartbeat, listAgentTasks, claimAgentTask, completeAgentTask, refreshAccessToken } from '../utils/api.js';
+import { getAccessToken, isTokenExpired } from '../utils/auth.js';
 import { readAgentWisdom } from '../utils/wisdom.js';
 
 export async function agentLoop(agentName, { signal }) {
@@ -115,6 +116,29 @@ export async function agentLoop(agentName, { signal }) {
     logActivity(agentDir, { type: 'loop_start', iteration });
     updateHeartbeat(agentDir);
 
+    // Refresh OAuth token and reconnect MCP if the access token rotated.
+    // Why: the daemon is started with a snapshot of MYVILLAGE_ACCESS_TOKEN in
+    // env (see agent-local.js). The MCP client baked that token into its
+    // Authorization header at construction time and has no refresh path of
+    // its own — so once the OAuth token expires (~1h) every MCP tool call
+    // 401s until the daemon is restarted. Re-read credentials each loop and
+    // swap the MCP client when the token changes.
+    try {
+      if (isTokenExpired()) {
+        await refreshAccessToken();
+      }
+      const currentToken = getAccessToken();
+      if (currentToken && currentToken !== process.env.MYVILLAGE_ACCESS_TOKEN) {
+        process.env.MYVILLAGE_ACCESS_TOKEN = currentToken;
+        await cleanupMCPClients();
+        const refreshed = await getMCPTools(agentDir, config);
+        tools = refreshed.tools;
+        logActivity(agentDir, { type: 'mcp_reconnected', reason: 'token rotated' });
+      }
+    } catch (err) {
+      logActivity(agentDir, { type: 'error', error: `Token refresh / MCP reconnect failed: ${err.message}` });
+    }
+
     // Activity counters for this iteration
     const activity = {
       postsCreated: 0,
@@ -335,16 +359,30 @@ Guidelines:
       // whether the action tools actually succeeded — not on the model's
       // self-report. The LLM sometimes claims "I posted!" after a tool error.
       if (activeTask && config.man?.village_agent_id) {
+        // Three independent failure signals:
+        //   1. action tools tried and all failed (original signal — still right)
+        //   2. any tool errored AND no action tool succeeded (e.g. an
+        //      MCP/auth error during discovery means the LLM never got to
+        //      call an action tool — older versions marked these COMPLETED)
+        //   3. the LLM explicitly declared failure in its final text
+        //      (matches the `**Task Failed:` sentinel the model emits when
+        //      it gives up after repeated tool errors)
+        const llmDeclaredFailure = /^\s*\*\*Task Failed/i.test(result.text || '');
+        const hasToolErrors = taskActionAudit.toolErrors.length > 0;
         const shouldFail =
-          taskActionAudit.actionToolsCalled > 0 &&
-          taskActionAudit.actionToolsSucceeded === 0;
+          (taskActionAudit.actionToolsCalled > 0 && taskActionAudit.actionToolsSucceeded === 0) ||
+          (hasToolErrors && taskActionAudit.actionToolsSucceeded === 0) ||
+          llmDeclaredFailure;
 
         try {
           if (shouldFail) {
             const firstError = taskActionAudit.toolErrors[0];
+            const firstLine = (result.text || '').split('\n').find(l => l.trim()) || '';
             const errorMessage = firstError
               ? `${firstError.tool} failed: ${firstError.message}`
-              : 'Action tools called but all failed';
+              : llmDeclaredFailure
+                ? firstLine.replace(/^\*\*|\*\*$/g, '').slice(0, 300) || 'Agent declared task failed'
+                : 'Action tools called but all failed';
             await completeAgentTask(config.man.village_agent_id, activeTask.id, {
               errorMessage,
               output: {
@@ -393,11 +431,17 @@ Guidelines:
             durationMs: Date.now() - loopStart,
             activitySummary: { feedItemsRead, mentionsFound },
           });
-        } catch {
+        } catch (err) {
+          if (isPausedResponse(err)) throw new AgentPausedError();
           logActivity(agentDir, { type: 'error', error: 'Failed to send server heartbeat' });
         }
       }
     } catch (err) {
+      if (err instanceof AgentPausedError) {
+        logActivity(agentDir, { type: 'agent_paused', message: err.message });
+        console.log('\n[MyVillage] This agent has been paused by an admin. Exiting.\n');
+        break;
+      }
       logActivity(agentDir, {
         type: 'error',
         error: err.message,
@@ -545,9 +589,23 @@ function summarizeToolResult(tr) {
   return text.slice(0, 200);
 }
 
+class AgentPausedError extends Error {
+  constructor(message = 'Agent is paused by an admin') {
+    super(message);
+    this.name = 'AgentPausedError';
+    this.code = 'AGENT_PAUSED';
+  }
+}
+
+function isPausedResponse(err) {
+  return err?.response?.status === 409 && err?.response?.data?.code === 'AGENT_PAUSED';
+}
+
 // Pull up to 5 pending tasks and claim the first one we can win the race for.
 // Returns the claimed task or null. Errors are swallowed and logged — the loop
-// should keep running on transient backend issues.
+// should keep running on transient backend issues. A pause response (409
+// AGENT_PAUSED) is the one exception: rethrown as AgentPausedError so the
+// outer loop can shut down cleanly.
 async function pollAndClaim(villageAgentId, agentDir) {
   try {
     const result = await listAgentTasks(villageAgentId, { status: 'PENDING', limit: 5 });
@@ -557,12 +615,15 @@ async function pollAndClaim(villageAgentId, agentDir) {
       try {
         const claim = await claimAgentTask(villageAgentId, task.id);
         return claim.data || task;
-      } catch {
-        // Race lost (409) or transient — try the next task
+      } catch (err) {
+        if (isPausedResponse(err)) throw new AgentPausedError();
+        // Race lost (409 not-paused) or transient — try the next task
       }
     }
     return null;
   } catch (err) {
+    if (err instanceof AgentPausedError) throw err;
+    if (isPausedResponse(err)) throw new AgentPausedError();
     logActivity(agentDir, { type: 'error', error: `Task poll failed: ${err.message}` });
     return null;
   }

package/src/utils/api.js

@@ -50,7 +50,7 @@ export function createClient(baseURL) {
   return client;
 }
 
-async function refreshAccessToken() {
+export async function refreshAccessToken() {
   const config = getConfig();
   const creds = loadCredentials();