quoroom 0.1.21 → 0.1.22

package/out/mcp/api-server.js

@@ -9914,7 +9914,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "quoroom",
-      version: "0.1.21",
+      version: "0.1.22",
       description: "Autonomous AI agent collective engine \u2014 Queen, Workers, Quorum",
       main: "./out/mcp/server.js",
       bin: {
@@ -9939,7 +9939,7 @@ var require_package = __commonJS({
         "build:mcp": "node scripts/build-mcp.js",
         "build:ui": "vite build --config src/ui/vite.config.ts",
         "kill:ports": "node scripts/kill-ports.js",
-        "kill:dev-ports": "npm run kill:ports -- 4700 3710 5173",
+        "kill:dev-ports": "npm run kill:ports -- 4700 3715 5173",
         "dev:links": "node scripts/dev-links.js",
         dev: `sh -c 'npm run kill:dev-ports && trap "kill 0" INT TERM EXIT; npm run dev:links & npm run dev:room & npm run dev:cloud & wait'`,
         "dev:room": "sh -c 'export QUOROOM_DATA_DIR=$HOME/.quoroom-dev QUOROOM_SKIP_MCP_REGISTER=1; npm run build:mcp && npm run build:ui && node scripts/dev-server.js --port 4700'",
@@ -9947,7 +9947,7 @@ var require_package = __commonJS({
         "dev:room:shared": "npm run build:mcp && npm run build:ui && node scripts/dev-server.js",
         "doctor:split": "node scripts/doctor-split.js",
         "dev:isolated": `sh -c 'npm run kill:dev-ports && trap "kill 0" INT TERM EXIT; npm run dev:links & npm run dev:room:isolated & npm run dev:cloud & VITE_API_PORT=4700 npm run dev:ui & wait'`,
-        "dev:cloud": `sh -c 'npm run kill:ports -- 3710 && cd ../cloud && PORT=3710 CLOUD_PUBLIC_URL=http://127.0.0.1:3710 CLOUD_ALLOWED_ORIGINS='"'"'http://127.0.0.1:3710,http://localhost:3710,http://localhost:5173,http://127.0.0.1:5173,https://quoroom.ai,https://www.quoroom.ai,https://app.quoroom.ai'"'"' npm start'`,
+        "dev:cloud": `sh -c 'npm run kill:ports -- 3715 && cd ../cloud && PORT=3715 CLOUD_PUBLIC_URL=http://127.0.0.1:3715 CLOUD_ALLOWED_ORIGINS='"'"'http://127.0.0.1:3715,http://localhost:3715,http://localhost:5173,http://127.0.0.1:5173,https://quoroom.ai,https://www.quoroom.ai,https://app.quoroom.ai'"'"' npm start'`,
         "dev:ui": "vite --config src/ui/vite.config.ts",
         "seed:style-demo": "sh -c 'export QUOROOM_DATA_DIR=$HOME/.quoroom-dev; node scripts/seed-style-demo.js'",
         typecheck: "tsc --noEmit",
@@ -12069,6 +12069,7 @@ function mapRoomRow(row) {
     queenNickname: row.queen_nickname ?? null,
     chatSessionId: row.chat_session_id ?? null,
     referredByCode: row.referred_by_code ?? null,
+    allowedTools: row.allowed_tools ?? null,
     webhookToken: row.webhook_token ?? null,
     createdAt: row.created_at,
     updatedAt: row.updated_at
@@ -12161,6 +12162,7 @@ function updateRoom(db2, id, updates) {
     config: "config",
     referredByCode: "referred_by_code",
     queenNickname: "queen_nickname",
+    allowedTools: "allowed_tools",
     webhookToken: "webhook_token"
   };
   const fields = [];
@@ -12856,6 +12858,22 @@ function listRoomCycles(db2, roomId, limit = 20) {
   ).all(roomId, safeLimit);
   return rows.map(mapWorkerCycleRow);
 }
+function countProductiveToolCalls(db2, workerId, lastNCycles = 2) {
+  const row = db2.prepare(`
+    SELECT COUNT(*) as cnt FROM cycle_logs
+    WHERE cycle_id IN (
+      SELECT id FROM worker_cycles
+      WHERE worker_id = ? AND status = 'completed'
+      ORDER BY started_at DESC LIMIT ?
+    )
+    AND entry_type = 'tool_call'
+    AND (content LIKE '%web_search%' OR content LIKE '%web_fetch%' OR content LIKE '%remember%'
+      OR content LIKE '%ask_keeper%' OR content LIKE '%inbox_send%'
+      OR content LIKE '%update_progress%' OR content LIKE '%complete_goal%'
+      OR content LIKE '%set_goal%')
+  `).get(workerId, lastNCycles);
+  return row.cnt;
+}
 function cleanupStaleCycles(db2) {
   const result = db2.prepare(
     "UPDATE worker_cycles SET status = 'failed', error_message = 'Server restarted', finished_at = datetime('now','localtime') WHERE status = 'running'"
@@ -23981,33 +23999,131 @@ async function closeBrowser() {
   }
 }
 async function webFetch(url) {
-  const jinaUrl = `https://r.jina.ai/${url}`;
-  const response = await fetch(jinaUrl, {
-    headers: {
-      "Accept": "text/plain",
-      "X-No-Cache": "true"
-    },
-    signal: AbortSignal.timeout(3e4)
+  try {
+    const jinaUrl = `https://r.jina.ai/${url}`;
+    const response = await fetch(jinaUrl, {
+      headers: { "Accept": "text/plain", "X-No-Cache": "true" },
+      signal: AbortSignal.timeout(2e4)
+    });
+    if (response.ok) {
+      const text = await response.text();
+      if (text.length > 200 && !text.includes("Warning: Target URL returned error")) {
+        return text.slice(0, MAX_CONTENT_CHARS);
+      }
+    }
+  } catch {
+  }
+  return fetchWithBrowser(url);
+}
+async function fetchWithBrowser(url) {
+  const browser = await getBrowser();
+  const context = await browser.newContext({
+    userAgent: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
   });
-  if (!response.ok) {
-    throw new Error(`Jina fetch failed: ${response.status} ${response.statusText}`);
+  const page = await context.newPage();
+  try {
+    await page.goto(url, { waitUntil: "domcontentloaded", timeout: 3e4 });
+    const text = await page.innerText("body").catch(() => "");
+    if (!text) throw new Error(`Could not read content from ${url}`);
+    return text.slice(0, MAX_CONTENT_CHARS);
+  } finally {
+    await context.close();
   }
-  const text = await response.text();
-  return text.slice(0, MAX_CONTENT_CHARS);
 }
 async function webSearch(query) {
-  const searchUrl = `https://html.duckduckgo.com/html/?q=${encodeURIComponent(query)}`;
-  const response = await fetch(searchUrl, {
-    headers: {
-      "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
-    },
-    signal: AbortSignal.timeout(15e3)
+  const browserResults = await searchWithBrowser(query);
+  if (browserResults.length > 0) return browserResults;
+  const ddgResults = await searchDdg(query);
+  if (ddgResults.length > 0) return ddgResults;
+  try {
+    const response = await fetch(`https://s.jina.ai/${encodeURIComponent(query)}`, {
+      headers: { "Accept": "application/json", "X-No-Cache": "true" },
+      signal: AbortSignal.timeout(15e3)
+    });
+    if (response.ok) {
+      const data = await response.json();
+      if (data.data && Array.isArray(data.data)) {
+        return data.data.slice(0, 5).map((r) => ({
+          title: r.title ?? "",
+          url: r.url ?? "",
+          snippet: (r.description ?? r.content ?? "").slice(0, 300)
+        })).filter((r) => r.url);
+      }
+    }
+  } catch {
+  }
+  return [];
+}
+async function searchWithBrowser(query) {
+  let browser;
+  try {
+    browser = await getBrowser();
+  } catch {
+    return [];
+  }
+  const context = await browser.newContext({
+    userAgent: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
+    locale: "en-US"
   });
-  if (!response.ok) {
-    throw new Error(`DuckDuckGo search failed: ${response.status}`);
+  const page = await context.newPage();
+  try {
+    await page.goto(`https://search.yahoo.com/search?p=${encodeURIComponent(query)}`, {
+      waitUntil: "domcontentloaded",
+      timeout: 15e3
+    });
+    await page.waitForTimeout(1e3);
+    const results = await page.evaluate(() => {
+      const items = [];
+      const blocks = document.querySelectorAll("#web .algo, .dd.algo, .algo");
+      for (const block of blocks) {
+        const link = block.querySelector("a");
+        const h3 = block.querySelector("h3");
+        const snippetEl = block.querySelector(".compText p, .compText, p");
+        if (!link) continue;
+        const url = link.getAttribute("href") || "";
+        if (!url.startsWith("http")) continue;
+        items.push({
+          title: h3 ? (h3.textContent || "").trim() : (link.textContent || "").trim(),
+          url,
+          snippet: snippetEl ? (snippetEl.textContent || "").trim().slice(0, 300) : ""
+        });
+        if (items.length >= 5) break;
+      }
+      return items;
+    });
+    return results.filter((r) => r.url);
+  } catch {
+    return [];
+  } finally {
+    await context.close();
+  }
+}
+async function searchDdg(query) {
+  for (let attempt = 0; attempt < 3; attempt++) {
+    if (attempt > 0) await new Promise((r) => setTimeout(r, 1e3 * attempt));
+    try {
+      const response = await fetch("https://html.duckduckgo.com/html/", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/x-www-form-urlencoded",
+          "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
+          "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+          "Accept-Language": "en-US,en;q=0.9",
+          "Referer": "https://html.duckduckgo.com/"
+        },
+        body: `q=${encodeURIComponent(query)}&b=`,
+        signal: AbortSignal.timeout(15e3),
+        redirect: "follow"
+      });
+      if (response.status === 202) continue;
+      if (!response.ok) continue;
+      const html = await response.text();
+      const results = parseDdgResults(html).slice(0, 5);
+      if (results.length > 0) return results;
+    } catch {
+    }
   }
-  const html = await response.text();
-  return parseDdgResults(html).slice(0, 5);
+  return [];
 }
 function parseDdgResults(html) {
   const results = [];
@@ -24402,6 +24518,47 @@ var QUEEN_TOOL_DEFINITIONS = [
         required: ["url", "actions"]
       }
     }
+  },
+  // ── Wallet ──────────────────────────────────────────────────────────────
+  {
+    type: "function",
+    function: {
+      name: "quoroom_wallet_balance",
+      description: "Get the room's wallet balance (USDC). Returns address and transaction summary.",
+      parameters: {
+        type: "object",
+        properties: {},
+        required: []
+      }
+    }
+  },
+  {
+    type: "function",
+    function: {
+      name: "quoroom_wallet_send",
+      description: "Send USDC from the room's wallet to an address.",
+      parameters: {
+        type: "object",
+        properties: {
+          to: { type: "string", description: "Recipient address (0x...)" },
+          amount: { type: "string", description: 'Amount (e.g., "10.50")' }
+        },
+        required: ["to", "amount"]
+      }
+    }
+  },
+  {
+    type: "function",
+    function: {
+      name: "quoroom_wallet_history",
+      description: "Get recent wallet transaction history.",
+      parameters: {
+        type: "object",
+        properties: {
+          limit: { type: "string", description: "Max transactions to return (default: 10)" }
+        }
+      }
+    }
   }
 ];
 async function executeQueenTool(db2, roomId, workerId, toolName, args) {
@@ -24422,10 +24579,12 @@ async function executeQueenTool(db2, roomId, workerId, toolName, args) {
         if (goalCheck.roomId !== roomId) return { content: `Error: goal #${goalId} belongs to another room. Your room's goals are shown in the Active Goals section \u2014 use those goal IDs.`, isError: true };
         const observation = String(args.observation ?? args.progress ?? args.message ?? args.text ?? "");
         const metricValue = args.metricValue != null ? Number(args.metricValue) : args.metric_value != null ? Number(args.metric_value) : void 0;
+        const subGoals = getSubGoals(db2, goalId);
         updateGoalProgress(db2, goalId, observation, metricValue, workerId);
         const goal = getGoal(db2, goalId);
         const pct = Math.round((goal?.progress ?? 0) * 100);
-        return { content: `Progress logged on goal #${goalId}. Now at ${pct}%.` };
+        const note = subGoals.length > 0 && metricValue != null ? ` (metricValue ignored \u2014 goal has ${subGoals.length} sub-goals, progress is calculated from them. Update sub-goals directly.)` : "";
+        return { content: `Progress logged on goal #${goalId}. Now at ${pct}%.${note}` };
       }
       case "quoroom_create_subgoal": {
         const goalId = Number(args.goalId);
@@ -24458,6 +24617,13 @@ async function executeQueenTool(db2, roomId, workerId, toolName, args) {
       case "quoroom_propose": {
         const proposalText = String(args.proposal ?? args.text ?? args.description ?? args.content ?? args.idea ?? "").trim();
         if (!proposalText) return { content: 'Error: proposal text is required. Provide a "proposal" string.', isError: true };
+        const recentDecisions = listDecisions(db2, roomId);
+        const isDuplicate = recentDecisions.slice(0, 10).some(
+          (d) => (d.status === "voting" || d.status === "approved") && d.proposal.toLowerCase() === proposalText.toLowerCase()
+        );
+        if (isDuplicate) {
+          return { content: `A similar proposal already exists: "${proposalText}". No need to propose again.`, isError: true };
+        }
         const decisionType = String(args.decisionType ?? args.type ?? args.impact ?? args.category ?? "low_impact");
         const decision = propose(db2, {
           roomId,
@@ -24498,6 +24664,10 @@ async function executeQueenTool(db2, roomId, workerId, toolName, args) {
         const systemPrompt = String(args.systemPrompt ?? args.system_prompt ?? args.instructions ?? args.prompt ?? "").trim();
         if (!name) return { content: 'Error: name is required for quoroom_create_worker. Provide a "name" string.', isError: true };
         if (!systemPrompt) return { content: `Error: systemPrompt is required for quoroom_create_worker. Provide a "systemPrompt" string describing this worker's role and instructions.`, isError: true };
+        const existingWorkers = listRoomWorkers(db2, roomId);
+        if (existingWorkers.some((w) => w.name.toLowerCase() === name.toLowerCase())) {
+          return { content: `Worker "${name}" already exists in this room. Use quoroom_update_worker to modify it, or choose a different name.`, isError: true };
+        }
         const role = args.role && args.role !== args.name ? String(args.role) : void 0;
         const description = args.description ? String(args.description) : void 0;
         const preset = role ? WORKER_ROLE_PRESETS[role] : void 0;
@@ -24530,6 +24700,10 @@ async function executeQueenTool(db2, roomId, workerId, toolName, args) {
         const taskWorkerId = args.workerId ? Number(args.workerId) : void 0;
         const maxTurns = args.maxTurns ? Number(args.maxTurns) : void 0;
         const triggerType = cronExpression ? "cron" : scheduledAt ? "once" : "manual";
+        const existingTasks = listTasks(db2, roomId, "active");
+        if (existingTasks.some((t) => t.name.toLowerCase() === name.toLowerCase())) {
+          return { content: `Task "${name}" already exists. Choose a different name or manage the existing task.`, isError: true };
+        }
         if (taskWorkerId) {
           const taskWorker = getWorker(db2, taskWorkerId);
           if (!taskWorker || taskWorker.roomId !== roomId) {
@@ -24555,6 +24729,11 @@ async function executeQueenTool(db2, roomId, workerId, toolName, args) {
         const name = String(args.name ?? "");
         const content = String(args.content ?? "");
         const type = String(args.type ?? "fact");
+        const existing = listEntities(db2, roomId).find((e) => e.name.toLowerCase() === name.toLowerCase());
+        if (existing) {
+          addObservation(db2, existing.id, content, "queen");
+          return { content: `Updated memory "${name}" (added new observation to existing entry).` };
+        }
         const entity = createEntity(db2, name, type, void 0, roomId);
         addObservation(db2, entity.id, content, "queen");
         return { content: `Remembered "${name}".` };
@@ -24609,6 +24788,26 @@ async function executeQueenTool(db2, roomId, workerId, toolName, args) {
         if (!url) return { content: "Error: url is required", isError: true };
         return { content: await browserAction(url, actions) };
       }
+      // ── Wallet ────────────────────────────────────────────────────
+      case "quoroom_wallet_balance": {
+        const wallet = getWalletByRoom(db2, roomId);
+        if (!wallet) return { content: "No wallet found for this room.", isError: true };
+        const summary = getWalletTransactionSummary(db2, wallet.id);
+        const net = (parseFloat(summary.received) - parseFloat(summary.sent)).toFixed(2);
+        return { content: `Wallet ${wallet.address}: ${net} USDC (received: ${summary.received}, sent: ${summary.sent})` };
+      }
+      case "quoroom_wallet_send": {
+        return { content: "Wallet send requires on-chain transaction \u2014 use the MCP tool quoroom_wallet_send with encryptionKey, or ask the keeper to send funds.", isError: true };
+      }
+      case "quoroom_wallet_history": {
+        const wallet = getWalletByRoom(db2, roomId);
+        if (!wallet) return { content: "No wallet found for this room.", isError: true };
+        const limit = Math.min(Number(args.limit) || 10, 50);
+        const txs = listWalletTransactions(db2, wallet.id, limit);
+        if (txs.length === 0) return { content: "No transactions yet." };
+        const lines = txs.map((tx) => `[${tx.type}] ${tx.amount} USDC \u2014 ${tx.description ?? ""} (${tx.status})`).join("\n");
+        return { content: lines };
+      }
       default:
         return { content: `Unknown tool: ${toolName}`, isError: true };
     }
@@ -25051,6 +25250,14 @@ ${roomTasks.map(
         (t) => `- #${t.id} "${t.name}" [${t.triggerType}] \u2014 ${t.status}`
       ).join("\n")}`);
     }
+    const wallet = getWalletByRoom(db2, roomId);
+    if (wallet) {
+      const summary = getWalletTransactionSummary(db2, wallet.id);
+      const net = (parseFloat(summary.received) - parseFloat(summary.sent)).toFixed(2);
+      contextParts.push(`## Wallet
+Address: ${wallet.address}
+Balance: ${net} USDC (received: ${summary.received}, spent: ${summary.sent})`);
+    }
     if (unreadMessages.length > 0) {
       contextParts.push(`## Unread Messages
 ${unreadMessages.map(
@@ -25088,19 +25295,54 @@ ${top3.map(
     }
     contextParts.push(`## Execution Settings
 ${settingsParts.join("\n")}`);
+    const STUCK_THRESHOLD_CYCLES = 2;
+    const productiveCallCount = countProductiveToolCalls(db2, worker.id, STUCK_THRESHOLD_CYCLES);
+    const recentCompletedCycles = listRoomCycles(db2, roomId, 5).filter((c) => c.workerId === worker.id && c.status === "completed");
+    const isStuck = recentCompletedCycles.length >= STUCK_THRESHOLD_CYCLES && productiveCallCount === 0;
+    if (isStuck) {
+      contextParts.push(`## \u26A0 STUCK DETECTED
+Your last ${STUCK_THRESHOLD_CYCLES} cycles produced no external results (no web searches, no memories stored, no goal progress, no keeper messages). You MUST change strategy NOW:
+- Try a different web search query
+- Store what you know in memory even if incomplete
+- Update goal progress with what you've learned
+- Message the keeper if you're blocked
+Do NOT repeat the same approach. Pivot immediately.`);
+      logBuffer.addSynthetic("system", `Stuck detector: 0 productive tool calls in last ${STUCK_THRESHOLD_CYCLES} cycles \u2014 injecting pivot directive`);
+    }
     const selfRegulateHint = rateLimitEvents.length > 0 ? "\n- **Self-regulate**: You are hitting rate limits. Use quoroom_configure_room to increase your cycle gap or reduce max turns to stay within API limits." : "";
     const isClaude = model === "claude" || model.startsWith("claude-");
     const toolCallInstruction = isClaude ? "Always call tools to take action \u2014 do not just describe what you would do." : "IMPORTANT: You MUST call at least one tool in your response. Respond ONLY with a tool call \u2014 do not write explanatory text without a tool call.";
-    const commsTools = isCli ? "quoroom_inbox_send_keeper (message keeper), quoroom_inbox_list (inter-room), quoroom_inbox_send_room, quoroom_inbox_reply" : "quoroom_ask_keeper";
-    const webTools = isCli ? "(use your built-in web search and fetch tools)" : "quoroom_web_search, quoroom_web_fetch, quoroom_browser";
-    const toolList = `**Goals:** quoroom_set_goal, quoroom_update_progress, quoroom_create_subgoal, quoroom_complete_goal, quoroom_abandon_goal
-**Governance:** quoroom_propose, quoroom_vote
-**Workers:** quoroom_create_worker, quoroom_update_worker
-**Tasks:** quoroom_schedule
-**Memory:** quoroom_remember, quoroom_recall
-**Web:** ${webTools}
-**Comms:** ${commsTools}
-**Settings:** quoroom_configure_room${selfRegulateHint}`;
+    const allowListRaw = status2.room.allowedTools?.trim() || null;
+    const allowSet = allowListRaw ? new Set(allowListRaw.split(",").map((s) => s.trim())) : null;
+    const has = (name) => !allowSet || allowSet.has(name);
+    const toolLines = [];
+    const goalTools = ["quoroom_set_goal", "quoroom_update_progress", "quoroom_create_subgoal", "quoroom_complete_goal", "quoroom_abandon_goal"].filter(has);
+    if (goalTools.length) toolLines.push(`**Goals:** ${goalTools.join(", ")}`);
+    const govTools = ["quoroom_propose", "quoroom_vote"].filter(has);
+    if (govTools.length) toolLines.push(`**Governance:** ${govTools.join(", ")}`);
+    const workerTools = ["quoroom_create_worker", "quoroom_update_worker"].filter(has);
+    if (workerTools.length) toolLines.push(`**Workers:** ${workerTools.join(", ")}`);
+    if (has("quoroom_schedule")) toolLines.push("**Tasks:** quoroom_schedule");
+    const memTools = ["quoroom_remember", "quoroom_recall"].filter(has);
+    if (memTools.length) toolLines.push(`**Memory:** ${memTools.join(", ")}`);
+    const walletToolNames = isCli ? ["quoroom_wallet_balance", "quoroom_wallet_send", "quoroom_wallet_history", "quoroom_wallet_topup"] : ["quoroom_wallet_balance", "quoroom_wallet_send", "quoroom_wallet_history"];
+    const filteredWallet = walletToolNames.filter(has);
+    if (filteredWallet.length) toolLines.push(`**Wallet:** ${filteredWallet.join(", ")}`);
+    const webToolNames = isCli ? null : ["quoroom_web_search", "quoroom_web_fetch", "quoroom_browser"];
+    if (isCli) {
+      if (has("quoroom_web_search") || has("quoroom_web_fetch")) toolLines.push("**Web:** (use your built-in web search and fetch tools)");
+    } else {
+      const filteredWeb = (webToolNames || []).filter(has);
+      if (filteredWeb.length) toolLines.push(`**Web:** ${filteredWeb.join(", ")}`);
+    }
+    const commsToolNames = isCli ? ["quoroom_inbox_send_keeper", "quoroom_inbox_list", "quoroom_inbox_send_room", "quoroom_inbox_reply"] : ["quoroom_ask_keeper"];
+    const filteredComms = commsToolNames.filter(has);
+    if (filteredComms.length) {
+      if (isCli) toolLines.push(`**Comms:** ${filteredComms.map((t) => t === "quoroom_inbox_send_keeper" ? `${t} (message keeper)` : t === "quoroom_inbox_list" ? `${t} (inter-room)` : t).join(", ")}`);
+      else toolLines.push(`**Comms:** ${filteredComms.join(", ")}`);
+    }
+    if (has("quoroom_configure_room")) toolLines.push(`**Settings:** quoroom_configure_room${selfRegulateHint}`);
+    const toolList = toolLines.join("\n");
     const sendKeeperTool = isCli ? "quoroom_inbox_send_keeper" : "quoroom_ask_keeper";
     contextParts.push(`## Instructions
 Based on the current state, decide what to do next and call the appropriate tools. Available tools:
@@ -25109,6 +25351,8 @@ ${toolList}
 
 Do NOT "stand by" or wait for anyone \u2014 every cycle must make progress. Act autonomously: make decisions and execute. Inform the keeper of progress or important updates using ${sendKeeperTool}, but never block on a response. If the keeper hasn't replied, proceed with your best judgment.
 
+Revenue is always a priority. Every room must sustain itself financially. Actively seek ways to earn: offer services to the keeper, propose paid work to other rooms, or find monetizable opportunities in your domain. Check your wallet balance and report financial status to the keeper.
+
 ${toolCallInstruction}`);
     const prompt = contextParts.join("\n\n");
     updateAgentState(db2, worker.id, "acting");
@@ -25117,8 +25361,9 @@ ${toolCallInstruction}`);
     logBuffer.flush();
     const apiKey = apiKeyEarly;
     const needsQueenTools = model === "openai" || model.startsWith("openai:") || model === "anthropic" || model.startsWith("anthropic:") || model.startsWith("claude-api:");
+    const filteredToolDefs = allowSet ? QUEEN_TOOL_DEFINITIONS.filter((t) => allowSet.has(t.function.name)) : QUEEN_TOOL_DEFINITIONS;
     const apiToolOpts = needsQueenTools ? {
-      toolDefs: QUEEN_TOOL_DEFINITIONS,
+      toolDefs: filteredToolDefs,
       onToolCall: async (toolName, args) => {
         logBuffer.addSynthetic("tool_call", `\u2192 ${toolName}(${JSON.stringify(args)})`);
         const result2 = await executeQueenTool(db2, roomId, worker.id, toolName, args);
@@ -25134,6 +25379,8 @@ ${toolCallInstruction}`);
       timeoutMs: 5 * 60 * 1e3,
       maxTurns: maxTurns ?? 10,
       onConsoleLog: logBuffer.onConsoleLog,
+      // CLI models: block non-quoroom MCP tools (daymon, etc.)
+      disallowedTools: isCli ? "mcp__daymon*" : void 0,
       // CLI models: pass resumeSessionId for native --resume
       resumeSessionId,
       // API models: pass conversation history + persistence callback
@@ -25148,6 +25395,23 @@ ${toolCallInstruction}`);
     if (rateLimitInfo) {
       throw new RateLimitError(rateLimitInfo);
     }
+    if (result.exitCode !== 0) {
+      const errorDetail = result.output?.trim() || `exit code ${result.exitCode}`;
+      logBuffer.addSynthetic("error", `Agent execution failed: ${errorDetail.slice(0, 500)}`);
+      logBuffer.flush();
+      completeWorkerCycle(db2, cycle.id, errorDetail.slice(0, 500), result.usage);
+      options?.onCycleLifecycle?.("failed", cycle.id, roomId);
+      logRoomActivity(
+        db2,
+        roomId,
+        "error",
+        `Agent cycle failed (${worker.name}): ${errorDetail.slice(0, 200)}`,
+        errorDetail,
+        worker.id
+      );
+      updateAgentState(db2, worker.id, "idle");
+      return result.output;
+    }
     if (isCli && result.sessionId) {
       saveAgentSession(db2, worker.id, { sessionId: result.sessionId, model });
     }
@@ -25556,6 +25820,7 @@ function registerRoomRoutes(router) {
       const trimmed = body.queenNickname.trim().replace(/\s+/g, "");
       if (trimmed.length > 0 && trimmed.length <= 40) updates.queenNickname = trimmed;
     }
+    if (body.allowedTools !== void 0) updates.allowedTools = body.allowedTools || null;
     if (body.config !== void 0 && typeof body.config === "object" && body.config !== null) {
       updates.config = { ...room.config, ...body.config };
     }
@@ -28047,7 +28312,15 @@ function registerChatRoutes(router) {
       // 3 minutes
     });
     if (result.exitCode !== 0 || result.timedOut) {
-      const reason = result.output?.trim() || (result.timedOut ? "Chat request timed out" : "Chat execution failed");
+      const rawOutput = result.output?.trim();
+      let reason;
+      if (result.timedOut) {
+        reason = "Chat request timed out";
+      } else if (rawOutput) {
+        reason = rawOutput;
+      } else {
+        reason = `Chat execution failed (model: ${model}, exit code: ${result.exitCode})`;
+      }
       return { status: result.timedOut ? 504 : 502, error: reason.slice(0, 500) };
     }
     const response = result.output || "No response";
@@ -28134,6 +28407,7 @@ CREATE TABLE IF NOT EXISTS rooms (
     queen_nickname TEXT,
     chat_session_id TEXT,
     referred_by_code TEXT,
+    allowed_tools TEXT,
     created_at DATETIME DEFAULT (datetime('now','localtime')),
     updated_at DATETIME DEFAULT (datetime('now','localtime'))
 );
@@ -28618,6 +28892,13 @@ function runMigrations(database, log = console.log) {
     database.exec(`ALTER TABLE workers ADD COLUMN max_turns INTEGER`);
     log("Migrated: added cycle_gap_ms and max_turns columns to workers");
   }
+  const hasRoomAllowedTools = database.prepare(
+    `SELECT name FROM pragma_table_info('rooms') WHERE name='allowed_tools'`
+  ).get()?.name;
+  if (!hasRoomAllowedTools) {
+    database.exec(`ALTER TABLE rooms ADD COLUMN allowed_tools TEXT`);
+    log("Migrated: added allowed_tools column to rooms");
+  }
   const ollamaWorkers = database.prepare(`SELECT id FROM workers WHERE model LIKE 'ollama:%'`).all();
   if (ollamaWorkers.length > 0) {
     database.prepare(`UPDATE workers SET model = 'claude' WHERE model LIKE 'ollama:%'`).run();
@@ -28835,7 +29116,7 @@ function semverGt(a, b) {
 }
 function getCurrentVersion() {
   try {
-    return true ? "0.1.21" : null.version;
+    return true ? "0.1.22" : null.version;
   } catch {
     return "0.0.0";
   }
@@ -28992,7 +29273,7 @@ var cachedVersion = null;
 function getVersion3() {
   if (cachedVersion) return cachedVersion;
   try {
-    cachedVersion = true ? "0.1.21" : null.version;
+    cachedVersion = true ? "0.1.22" : null.version;
   } catch {
     cachedVersion = "unknown";
   }

package/out/mcp/cli.js

@@ -21632,6 +21632,7 @@ CREATE TABLE IF NOT EXISTS rooms (
     queen_nickname TEXT,
     chat_session_id TEXT,
     referred_by_code TEXT,
+    allowed_tools TEXT,
     created_at DATETIME DEFAULT (datetime('now','localtime')),
     updated_at DATETIME DEFAULT (datetime('now','localtime'))
 );
@@ -22961,6 +22962,7 @@ function mapRoomRow(row) {
     queenNickname: row.queen_nickname ?? null,
     chatSessionId: row.chat_session_id ?? null,
     referredByCode: row.referred_by_code ?? null,
+    allowedTools: row.allowed_tools ?? null,
     webhookToken: row.webhook_token ?? null,
     createdAt: row.created_at,
     updatedAt: row.updated_at
@@ -23011,6 +23013,7 @@ function updateRoom(db3, id, updates) {
     config: "config",
     referredByCode: "referred_by_code",
     queenNickname: "queen_nickname",
+    allowedTools: "allowed_tools",
     webhookToken: "webhook_token"
   };
   const fields = [];
@@ -23725,6 +23728,22 @@ function listRoomCycles(db3, roomId, limit = 20) {
   ).all(roomId, safeLimit);
   return rows.map(mapWorkerCycleRow);
 }
+function countProductiveToolCalls(db3, workerId, lastNCycles = 2) {
+  const row = db3.prepare(`
+    SELECT COUNT(*) as cnt FROM cycle_logs
+    WHERE cycle_id IN (
+      SELECT id FROM worker_cycles
+      WHERE worker_id = ? AND status = 'completed'
+      ORDER BY started_at DESC LIMIT ?
+    )
+    AND entry_type = 'tool_call'
+    AND (content LIKE '%web_search%' OR content LIKE '%web_fetch%' OR content LIKE '%remember%'
+      OR content LIKE '%ask_keeper%' OR content LIKE '%inbox_send%'
+      OR content LIKE '%update_progress%' OR content LIKE '%complete_goal%'
+      OR content LIKE '%set_goal%')
+  `).get(workerId, lastNCycles);
+  return row.cnt;
+}
 function cleanupStaleCycles(db3) {
   const result = db3.prepare(
     "UPDATE worker_cycles SET status = 'failed', error_message = 'Server restarted', finished_at = datetime('now','localtime') WHERE status = 'running'"
@@ -23967,6 +23986,13 @@ function runMigrations(database, log = console.log) {
     database.exec(`ALTER TABLE workers ADD COLUMN max_turns INTEGER`);
     log("Migrated: added cycle_gap_ms and max_turns columns to workers");
   }
+  const hasRoomAllowedTools = database.prepare(
+    `SELECT name FROM pragma_table_info('rooms') WHERE name='allowed_tools'`
+  ).get()?.name;
+  if (!hasRoomAllowedTools) {
+    database.exec(`ALTER TABLE rooms ADD COLUMN allowed_tools TEXT`);
+    log("Migrated: added allowed_tools column to rooms");
+  }
   const ollamaWorkers = database.prepare(`SELECT id FROM workers WHERE model LIKE 'ollama:%'`).all();
   if (ollamaWorkers.length > 0) {
     database.prepare(`UPDATE workers SET model = 'claude' WHERE model LIKE 'ollama:%'`).run();
@@ -51046,7 +51072,7 @@ var server_exports = {};
 async function main() {
   const server = new McpServer({
     name: "quoroom",
-    version: true ? "0.1.21" : "0.0.0"
+    version: true ? "0.1.22" : "0.0.0"
   });
   registerMemoryTools(server);
   registerSchedulerTools(server);
@@ -51630,33 +51656,131 @@ async function closeBrowser() {
   }
 }
 async function webFetch(url) {
-  const jinaUrl = `https://r.jina.ai/${url}`;
-  const response = await fetch(jinaUrl, {
-    headers: {
-      "Accept": "text/plain",
-      "X-No-Cache": "true"
-    },
-    signal: AbortSignal.timeout(3e4)
+  try {
+    const jinaUrl = `https://r.jina.ai/${url}`;
+    const response = await fetch(jinaUrl, {
+      headers: { "Accept": "text/plain", "X-No-Cache": "true" },
+      signal: AbortSignal.timeout(2e4)
+    });
+    if (response.ok) {
+      const text = await response.text();
+      if (text.length > 200 && !text.includes("Warning: Target URL returned error")) {
+        return text.slice(0, MAX_CONTENT_CHARS);
+      }
+    }
+  } catch {
+  }
+  return fetchWithBrowser(url);
+}
+async function fetchWithBrowser(url) {
+  const browser = await getBrowser();
+  const context = await browser.newContext({
+    userAgent: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
   });
-  if (!response.ok) {
-    throw new Error(`Jina fetch failed: ${response.status} ${response.statusText}`);
+  const page = await context.newPage();
+  try {
+    await page.goto(url, { waitUntil: "domcontentloaded", timeout: 3e4 });
+    const text = await page.innerText("body").catch(() => "");
+    if (!text) throw new Error(`Could not read content from ${url}`);
+    return text.slice(0, MAX_CONTENT_CHARS);
+  } finally {
+    await context.close();
   }
-  const text = await response.text();
-  return text.slice(0, MAX_CONTENT_CHARS);
 }
 async function webSearch(query) {
-  const searchUrl = `https://html.duckduckgo.com/html/?q=${encodeURIComponent(query)}`;
-  const response = await fetch(searchUrl, {
-    headers: {
-      "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
-    },
-    signal: AbortSignal.timeout(15e3)
+  const browserResults = await searchWithBrowser(query);
+  if (browserResults.length > 0) return browserResults;
+  const ddgResults = await searchDdg(query);
+  if (ddgResults.length > 0) return ddgResults;
+  try {
+    const response = await fetch(`https://s.jina.ai/${encodeURIComponent(query)}`, {
+      headers: { "Accept": "application/json", "X-No-Cache": "true" },
+      signal: AbortSignal.timeout(15e3)
+    });
+    if (response.ok) {
+      const data = await response.json();
+      if (data.data && Array.isArray(data.data)) {
+        return data.data.slice(0, 5).map((r) => ({
+          title: r.title ?? "",
+          url: r.url ?? "",
+          snippet: (r.description ?? r.content ?? "").slice(0, 300)
+        })).filter((r) => r.url);
+      }
+    }
+  } catch {
+  }
+  return [];
+}
+async function searchWithBrowser(query) {
+  let browser;
+  try {
+    browser = await getBrowser();
+  } catch {
+    return [];
+  }
+  const context = await browser.newContext({
+    userAgent: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
+    locale: "en-US"
   });
-  if (!response.ok) {
-    throw new Error(`DuckDuckGo search failed: ${response.status}`);
+  const page = await context.newPage();
+  try {
+    await page.goto(`https://search.yahoo.com/search?p=${encodeURIComponent(query)}`, {
+      waitUntil: "domcontentloaded",
+      timeout: 15e3
+    });
+    await page.waitForTimeout(1e3);
+    const results = await page.evaluate(() => {
+      const items = [];
+      const blocks = document.querySelectorAll("#web .algo, .dd.algo, .algo");
+      for (const block of blocks) {
+        const link = block.querySelector("a");
+        const h3 = block.querySelector("h3");
+        const snippetEl = block.querySelector(".compText p, .compText, p");
+        if (!link) continue;
+        const url = link.getAttribute("href") || "";
+        if (!url.startsWith("http")) continue;
+        items.push({
+          title: h3 ? (h3.textContent || "").trim() : (link.textContent || "").trim(),
+          url,
+          snippet: snippetEl ? (snippetEl.textContent || "").trim().slice(0, 300) : ""
+        });
+        if (items.length >= 5) break;
+      }
+      return items;
+    });
+    return results.filter((r) => r.url);
+  } catch {
+    return [];
+  } finally {
+    await context.close();
   }
-  const html = await response.text();
-  return parseDdgResults(html).slice(0, 5);
+}
+async function searchDdg(query) {
+  for (let attempt = 0; attempt < 3; attempt++) {
+    if (attempt > 0) await new Promise((r) => setTimeout(r, 1e3 * attempt));
+    try {
+      const response = await fetch("https://html.duckduckgo.com/html/", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/x-www-form-urlencoded",
+          "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
+          "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+          "Accept-Language": "en-US,en;q=0.9",
+          "Referer": "https://html.duckduckgo.com/"
+        },
+        body: `q=${encodeURIComponent(query)}&b=`,
+        signal: AbortSignal.timeout(15e3),
+        redirect: "follow"
+      });
+      if (response.status === 202) continue;
+      if (!response.ok) continue;
+      const html = await response.text();
+      const results = parseDdgResults(html).slice(0, 5);
+      if (results.length > 0) return results;
+    } catch {
+    }
+  }
+  return [];
 }
 function parseDdgResults(html) {
   const results = [];
@@ -51785,10 +51909,12 @@ async function executeQueenTool(db3, roomId, workerId, toolName, args2) {
         if (goalCheck.roomId !== roomId) return { content: `Error: goal #${goalId} belongs to another room. Your room's goals are shown in the Active Goals section \u2014 use those goal IDs.`, isError: true };
         const observation = String(args2.observation ?? args2.progress ?? args2.message ?? args2.text ?? "");
         const metricValue = args2.metricValue != null ? Number(args2.metricValue) : args2.metric_value != null ? Number(args2.metric_value) : void 0;
+        const subGoals = getSubGoals(db3, goalId);
         updateGoalProgress(db3, goalId, observation, metricValue, workerId);
         const goal = getGoal(db3, goalId);
         const pct = Math.round((goal?.progress ?? 0) * 100);
-        return { content: `Progress logged on goal #${goalId}. Now at ${pct}%.` };
+        const note = subGoals.length > 0 && metricValue != null ? ` (metricValue ignored \u2014 goal has ${subGoals.length} sub-goals, progress is calculated from them. Update sub-goals directly.)` : "";
+        return { content: `Progress logged on goal #${goalId}. Now at ${pct}%.${note}` };
       }
       case "quoroom_create_subgoal": {
         const goalId = Number(args2.goalId);
@@ -51821,6 +51947,13 @@ async function executeQueenTool(db3, roomId, workerId, toolName, args2) {
       case "quoroom_propose": {
         const proposalText = String(args2.proposal ?? args2.text ?? args2.description ?? args2.content ?? args2.idea ?? "").trim();
         if (!proposalText) return { content: 'Error: proposal text is required. Provide a "proposal" string.', isError: true };
+        const recentDecisions = listDecisions(db3, roomId);
+        const isDuplicate = recentDecisions.slice(0, 10).some(
+          (d) => (d.status === "voting" || d.status === "approved") && d.proposal.toLowerCase() === proposalText.toLowerCase()
+        );
+        if (isDuplicate) {
+          return { content: `A similar proposal already exists: "${proposalText}". No need to propose again.`, isError: true };
+        }
         const decisionType = String(args2.decisionType ?? args2.type ?? args2.impact ?? args2.category ?? "low_impact");
         const decision = propose(db3, {
           roomId,
@@ -51861,6 +51994,10 @@ async function executeQueenTool(db3, roomId, workerId, toolName, args2) {
         const systemPrompt = String(args2.systemPrompt ?? args2.system_prompt ?? args2.instructions ?? args2.prompt ?? "").trim();
         if (!name) return { content: 'Error: name is required for quoroom_create_worker. Provide a "name" string.', isError: true };
         if (!systemPrompt) return { content: `Error: systemPrompt is required for quoroom_create_worker. Provide a "systemPrompt" string describing this worker's role and instructions.`, isError: true };
+        const existingWorkers = listRoomWorkers(db3, roomId);
+        if (existingWorkers.some((w) => w.name.toLowerCase() === name.toLowerCase())) {
+          return { content: `Worker "${name}" already exists in this room. Use quoroom_update_worker to modify it, or choose a different name.`, isError: true };
+        }
         const role = args2.role && args2.role !== args2.name ? String(args2.role) : void 0;
         const description = args2.description ? String(args2.description) : void 0;
         const preset = role ? WORKER_ROLE_PRESETS[role] : void 0;
@@ -51893,6 +52030,10 @@ async function executeQueenTool(db3, roomId, workerId, toolName, args2) {
         const taskWorkerId = args2.workerId ? Number(args2.workerId) : void 0;
         const maxTurns = args2.maxTurns ? Number(args2.maxTurns) : void 0;
         const triggerType = cronExpression ? "cron" : scheduledAt ? "once" : "manual";
+        const existingTasks = listTasks(db3, roomId, "active");
+        if (existingTasks.some((t) => t.name.toLowerCase() === name.toLowerCase())) {
+          return { content: `Task "${name}" already exists. Choose a different name or manage the existing task.`, isError: true };
+        }
         if (taskWorkerId) {
           const taskWorker = getWorker(db3, taskWorkerId);
           if (!taskWorker || taskWorker.roomId !== roomId) {
@@ -51918,6 +52059,11 @@ async function executeQueenTool(db3, roomId, workerId, toolName, args2) {
         const name = String(args2.name ?? "");
         const content = String(args2.content ?? "");
         const type = String(args2.type ?? "fact");
+        const existing = listEntities(db3, roomId).find((e) => e.name.toLowerCase() === name.toLowerCase());
+        if (existing) {
+          addObservation(db3, existing.id, content, "queen");
+          return { content: `Updated memory "${name}" (added new observation to existing entry).` };
+        }
         const entity = createEntity(db3, name, type, void 0, roomId);
         addObservation(db3, entity.id, content, "queen");
         return { content: `Remembered "${name}".` };
@@ -51972,6 +52118,26 @@ async function executeQueenTool(db3, roomId, workerId, toolName, args2) {
         if (!url) return { content: "Error: url is required", isError: true };
         return { content: await browserAction(url, actions) };
       }
+      // ── Wallet ────────────────────────────────────────────────────
+      case "quoroom_wallet_balance": {
+        const wallet = getWalletByRoom(db3, roomId);
+        if (!wallet) return { content: "No wallet found for this room.", isError: true };
+        const summary = getWalletTransactionSummary(db3, wallet.id);
+        const net = (parseFloat(summary.received) - parseFloat(summary.sent)).toFixed(2);
+        return { content: `Wallet ${wallet.address}: ${net} USDC (received: ${summary.received}, sent: ${summary.sent})` };
+      }
+      case "quoroom_wallet_send": {
+        return { content: "Wallet send requires on-chain transaction \u2014 use the MCP tool quoroom_wallet_send with encryptionKey, or ask the keeper to send funds.", isError: true };
+      }
+      case "quoroom_wallet_history": {
+        const wallet = getWalletByRoom(db3, roomId);
+        if (!wallet) return { content: "No wallet found for this room.", isError: true };
+        const limit = Math.min(Number(args2.limit) || 10, 50);
+        const txs = listWalletTransactions(db3, wallet.id, limit);
+        if (txs.length === 0) return { content: "No transactions yet." };
+        const lines = txs.map((tx) => `[${tx.type}] ${tx.amount} USDC \u2014 ${tx.description ?? ""} (${tx.status})`).join("\n");
+        return { content: lines };
+      }
       default:
         return { content: `Unknown tool: ${toolName}`, isError: true };
     }
@@ -52334,6 +52500,47 @@ var init_queen_tools = __esm({
             required: ["url", "actions"]
           }
         }
+      },
+      // ── Wallet ──────────────────────────────────────────────────────────────
+      {
+        type: "function",
+        function: {
+          name: "quoroom_wallet_balance",
+          description: "Get the room's wallet balance (USDC). Returns address and transaction summary.",
+          parameters: {
+            type: "object",
+            properties: {},
+            required: []
+          }
+        }
+      },
+      {
+        type: "function",
+        function: {
+          name: "quoroom_wallet_send",
+          description: "Send USDC from the room's wallet to an address.",
+          parameters: {
+            type: "object",
+            properties: {
+              to: { type: "string", description: "Recipient address (0x...)" },
+              amount: { type: "string", description: 'Amount (e.g., "10.50")' }
+            },
+            required: ["to", "amount"]
+          }
+        }
+      },
+      {
+        type: "function",
+        function: {
+          name: "quoroom_wallet_history",
+          description: "Get recent wallet transaction history.",
+          parameters: {
+            type: "object",
+            properties: {
+              limit: { type: "string", description: "Max transactions to return (default: 10)" }
+            }
+          }
+        }
       }
     ];
   }
@@ -52713,6 +52920,14 @@ ${roomTasks.map(
         (t) => `- #${t.id} "${t.name}" [${t.triggerType}] \u2014 ${t.status}`
       ).join("\n")}`);
     }
+    const wallet = getWalletByRoom(db3, roomId);
+    if (wallet) {
+      const summary = getWalletTransactionSummary(db3, wallet.id);
+      const net = (parseFloat(summary.received) - parseFloat(summary.sent)).toFixed(2);
+      contextParts.push(`## Wallet
+Address: ${wallet.address}
+Balance: ${net} USDC (received: ${summary.received}, spent: ${summary.sent})`);
+    }
     if (unreadMessages.length > 0) {
       contextParts.push(`## Unread Messages
 ${unreadMessages.map(
@@ -52750,19 +52965,54 @@ ${top3.map(
     }
     contextParts.push(`## Execution Settings
 ${settingsParts.join("\n")}`);
+    const STUCK_THRESHOLD_CYCLES = 2;
+    const productiveCallCount = countProductiveToolCalls(db3, worker.id, STUCK_THRESHOLD_CYCLES);
+    const recentCompletedCycles = listRoomCycles(db3, roomId, 5).filter((c) => c.workerId === worker.id && c.status === "completed");
+    const isStuck = recentCompletedCycles.length >= STUCK_THRESHOLD_CYCLES && productiveCallCount === 0;
+    if (isStuck) {
+      contextParts.push(`## \u26A0 STUCK DETECTED
+Your last ${STUCK_THRESHOLD_CYCLES} cycles produced no external results (no web searches, no memories stored, no goal progress, no keeper messages). You MUST change strategy NOW:
+- Try a different web search query
+- Store what you know in memory even if incomplete
+- Update goal progress with what you've learned
+- Message the keeper if you're blocked
+Do NOT repeat the same approach. Pivot immediately.`);
+      logBuffer.addSynthetic("system", `Stuck detector: 0 productive tool calls in last ${STUCK_THRESHOLD_CYCLES} cycles \u2014 injecting pivot directive`);
+    }
     const selfRegulateHint = rateLimitEvents.length > 0 ? "\n- **Self-regulate**: You are hitting rate limits. Use quoroom_configure_room to increase your cycle gap or reduce max turns to stay within API limits." : "";
     const isClaude = model === "claude" || model.startsWith("claude-");
     const toolCallInstruction = isClaude ? "Always call tools to take action \u2014 do not just describe what you would do." : "IMPORTANT: You MUST call at least one tool in your response. Respond ONLY with a tool call \u2014 do not write explanatory text without a tool call.";
-    const commsTools = isCli ? "quoroom_inbox_send_keeper (message keeper), quoroom_inbox_list (inter-room), quoroom_inbox_send_room, quoroom_inbox_reply" : "quoroom_ask_keeper";
-    const webTools = isCli ? "(use your built-in web search and fetch tools)" : "quoroom_web_search, quoroom_web_fetch, quoroom_browser";
-    const toolList = `**Goals:** quoroom_set_goal, quoroom_update_progress, quoroom_create_subgoal, quoroom_complete_goal, quoroom_abandon_goal
-**Governance:** quoroom_propose, quoroom_vote
-**Workers:** quoroom_create_worker, quoroom_update_worker
-**Tasks:** quoroom_schedule
-**Memory:** quoroom_remember, quoroom_recall
-**Web:** ${webTools}
-**Comms:** ${commsTools}
-**Settings:** quoroom_configure_room${selfRegulateHint}`;
+    const allowListRaw = status2.room.allowedTools?.trim() || null;
+    const allowSet = allowListRaw ? new Set(allowListRaw.split(",").map((s) => s.trim())) : null;
+    const has = (name) => !allowSet || allowSet.has(name);
+    const toolLines = [];
+    const goalTools = ["quoroom_set_goal", "quoroom_update_progress", "quoroom_create_subgoal", "quoroom_complete_goal", "quoroom_abandon_goal"].filter(has);
+    if (goalTools.length) toolLines.push(`**Goals:** ${goalTools.join(", ")}`);
+    const govTools = ["quoroom_propose", "quoroom_vote"].filter(has);
+    if (govTools.length) toolLines.push(`**Governance:** ${govTools.join(", ")}`);
+    const workerTools = ["quoroom_create_worker", "quoroom_update_worker"].filter(has);
+    if (workerTools.length) toolLines.push(`**Workers:** ${workerTools.join(", ")}`);
+    if (has("quoroom_schedule")) toolLines.push("**Tasks:** quoroom_schedule");
+    const memTools = ["quoroom_remember", "quoroom_recall"].filter(has);
+    if (memTools.length) toolLines.push(`**Memory:** ${memTools.join(", ")}`);
+    const walletToolNames = isCli ? ["quoroom_wallet_balance", "quoroom_wallet_send", "quoroom_wallet_history", "quoroom_wallet_topup"] : ["quoroom_wallet_balance", "quoroom_wallet_send", "quoroom_wallet_history"];
+    const filteredWallet = walletToolNames.filter(has);
+    if (filteredWallet.length) toolLines.push(`**Wallet:** ${filteredWallet.join(", ")}`);
+    const webToolNames = isCli ? null : ["quoroom_web_search", "quoroom_web_fetch", "quoroom_browser"];
+    if (isCli) {
+      if (has("quoroom_web_search") || has("quoroom_web_fetch")) toolLines.push("**Web:** (use your built-in web search and fetch tools)");
+    } else {
+      const filteredWeb = (webToolNames || []).filter(has);
+      if (filteredWeb.length) toolLines.push(`**Web:** ${filteredWeb.join(", ")}`);
+    }
+    const commsToolNames = isCli ? ["quoroom_inbox_send_keeper", "quoroom_inbox_list", "quoroom_inbox_send_room", "quoroom_inbox_reply"] : ["quoroom_ask_keeper"];
+    const filteredComms = commsToolNames.filter(has);
+    if (filteredComms.length) {
+      if (isCli) toolLines.push(`**Comms:** ${filteredComms.map((t) => t === "quoroom_inbox_send_keeper" ? `${t} (message keeper)` : t === "quoroom_inbox_list" ? `${t} (inter-room)` : t).join(", ")}`);
+      else toolLines.push(`**Comms:** ${filteredComms.join(", ")}`);
+    }
+    if (has("quoroom_configure_room")) toolLines.push(`**Settings:** quoroom_configure_room${selfRegulateHint}`);
+    const toolList = toolLines.join("\n");
     const sendKeeperTool = isCli ? "quoroom_inbox_send_keeper" : "quoroom_ask_keeper";
     contextParts.push(`## Instructions
 Based on the current state, decide what to do next and call the appropriate tools. Available tools:
@@ -52771,6 +53021,8 @@ ${toolList}
 
 Do NOT "stand by" or wait for anyone \u2014 every cycle must make progress. Act autonomously: make decisions and execute. Inform the keeper of progress or important updates using ${sendKeeperTool}, but never block on a response. If the keeper hasn't replied, proceed with your best judgment.
 
+Revenue is always a priority. Every room must sustain itself financially. Actively seek ways to earn: offer services to the keeper, propose paid work to other rooms, or find monetizable opportunities in your domain. Check your wallet balance and report financial status to the keeper.
+
 ${toolCallInstruction}`);
     const prompt = contextParts.join("\n\n");
     updateAgentState(db3, worker.id, "acting");
@@ -52779,8 +53031,9 @@ ${toolCallInstruction}`);
     logBuffer.flush();
     const apiKey = apiKeyEarly;
     const needsQueenTools = model === "openai" || model.startsWith("openai:") || model === "anthropic" || model.startsWith("anthropic:") || model.startsWith("claude-api:");
+    const filteredToolDefs = allowSet ? QUEEN_TOOL_DEFINITIONS.filter((t) => allowSet.has(t.function.name)) : QUEEN_TOOL_DEFINITIONS;
     const apiToolOpts = needsQueenTools ? {
-      toolDefs: QUEEN_TOOL_DEFINITIONS,
+      toolDefs: filteredToolDefs,
       onToolCall: async (toolName, args2) => {
         logBuffer.addSynthetic("tool_call", `\u2192 ${toolName}(${JSON.stringify(args2)})`);
         const result2 = await executeQueenTool(db3, roomId, worker.id, toolName, args2);
@@ -52796,6 +53049,8 @@ ${toolCallInstruction}`);
       timeoutMs: 5 * 60 * 1e3,
       maxTurns: maxTurns ?? 10,
       onConsoleLog: logBuffer.onConsoleLog,
+      // CLI models: block non-quoroom MCP tools (daymon, etc.)
+      disallowedTools: isCli ? "mcp__daymon*" : void 0,
       // CLI models: pass resumeSessionId for native --resume
       resumeSessionId,
       // API models: pass conversation history + persistence callback
@@ -52810,6 +53065,23 @@ ${toolCallInstruction}`);
     if (rateLimitInfo) {
       throw new RateLimitError(rateLimitInfo);
     }
+    if (result.exitCode !== 0) {
+      const errorDetail = result.output?.trim() || `exit code ${result.exitCode}`;
+      logBuffer.addSynthetic("error", `Agent execution failed: ${errorDetail.slice(0, 500)}`);
+      logBuffer.flush();
+      completeWorkerCycle(db3, cycle.id, errorDetail.slice(0, 500), result.usage);
+      options?.onCycleLifecycle?.("failed", cycle.id, roomId);
+      logRoomActivity(
+        db3,
+        roomId,
+        "error",
+        `Agent cycle failed (${worker.name}): ${errorDetail.slice(0, 200)}`,
+        errorDetail,
+        worker.id
+      );
+      updateAgentState(db3, worker.id, "idle");
+      return result.output;
+    }
     if (isCli && result.sessionId) {
       saveAgentSession(db3, worker.id, { sessionId: result.sessionId, model });
     }
@@ -52887,7 +53159,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "quoroom",
-      version: "0.1.21",
+      version: "0.1.22",
       description: "Autonomous AI agent collective engine \u2014 Queen, Workers, Quorum",
       main: "./out/mcp/server.js",
       bin: {
@@ -52912,7 +53184,7 @@ var require_package = __commonJS({
         "build:mcp": "node scripts/build-mcp.js",
         "build:ui": "vite build --config src/ui/vite.config.ts",
         "kill:ports": "node scripts/kill-ports.js",
-        "kill:dev-ports": "npm run kill:ports -- 4700 3710 5173",
+        "kill:dev-ports": "npm run kill:ports -- 4700 3715 5173",
         "dev:links": "node scripts/dev-links.js",
         dev: `sh -c 'npm run kill:dev-ports && trap "kill 0" INT TERM EXIT; npm run dev:links & npm run dev:room & npm run dev:cloud & wait'`,
         "dev:room": "sh -c 'export QUOROOM_DATA_DIR=$HOME/.quoroom-dev QUOROOM_SKIP_MCP_REGISTER=1; npm run build:mcp && npm run build:ui && node scripts/dev-server.js --port 4700'",
@@ -52920,7 +53192,7 @@ var require_package = __commonJS({
         "dev:room:shared": "npm run build:mcp && npm run build:ui && node scripts/dev-server.js",
         "doctor:split": "node scripts/doctor-split.js",
         "dev:isolated": `sh -c 'npm run kill:dev-ports && trap "kill 0" INT TERM EXIT; npm run dev:links & npm run dev:room:isolated & npm run dev:cloud & VITE_API_PORT=4700 npm run dev:ui & wait'`,
-        "dev:cloud": `sh -c 'npm run kill:ports -- 3710 && cd ../cloud && PORT=3710 CLOUD_PUBLIC_URL=http://127.0.0.1:3710 CLOUD_ALLOWED_ORIGINS='"'"'http://127.0.0.1:3710,http://localhost:3710,http://localhost:5173,http://127.0.0.1:5173,https://quoroom.ai,https://www.quoroom.ai,https://app.quoroom.ai'"'"' npm start'`,
+        "dev:cloud": `sh -c 'npm run kill:ports -- 3715 && cd ../cloud && PORT=3715 CLOUD_PUBLIC_URL=http://127.0.0.1:3715 CLOUD_ALLOWED_ORIGINS='"'"'http://127.0.0.1:3715,http://localhost:3715,http://localhost:5173,http://127.0.0.1:5173,https://quoroom.ai,https://www.quoroom.ai,https://app.quoroom.ai'"'"' npm start'`,
         "dev:ui": "vite --config src/ui/vite.config.ts",
         "seed:style-demo": "sh -c 'export QUOROOM_DATA_DIR=$HOME/.quoroom-dev; node scripts/seed-style-demo.js'",
         typecheck: "tsc --noEmit",
@@ -53345,6 +53617,7 @@ function registerRoomRoutes(router) {
       const trimmed = body.queenNickname.trim().replace(/\s+/g, "");
       if (trimmed.length > 0 && trimmed.length <= 40) updates.queenNickname = trimmed;
     }
+    if (body.allowedTools !== void 0) updates.allowedTools = body.allowedTools || null;
     if (body.config !== void 0 && typeof body.config === "object" && body.config !== null) {
       updates.config = { ...room.config, ...body.config };
     }
@@ -55344,7 +55617,15 @@ function registerChatRoutes(router) {
       // 3 minutes
     });
     if (result.exitCode !== 0 || result.timedOut) {
-      const reason = result.output?.trim() || (result.timedOut ? "Chat request timed out" : "Chat execution failed");
+      const rawOutput = result.output?.trim();
+      let reason;
+      if (result.timedOut) {
+        reason = "Chat request timed out";
+      } else if (rawOutput) {
+        reason = rawOutput;
+      } else {
+        reason = `Chat execution failed (model: ${model}, exit code: ${result.exitCode})`;
+      }
       return { status: result.timedOut ? 504 : 502, error: reason.slice(0, 500) };
     }
     const response = result.output || "No response";
@@ -55558,7 +55839,7 @@ function semverGt(a, b) {
 }
 function getCurrentVersion() {
   try {
-    return true ? "0.1.21" : null.version;
+    return true ? "0.1.22" : null.version;
   } catch {
     return "0.0.0";
   }
@@ -55741,7 +56022,7 @@ var init_updateChecker = __esm({
 function getVersion3() {
   if (cachedVersion) return cachedVersion;
   try {
-    cachedVersion = true ? "0.1.21" : null.version;
+    cachedVersion = true ? "0.1.22" : null.version;
   } catch {
     cachedVersion = "unknown";
   }
@@ -62056,7 +62337,7 @@ __export(update_exports, {
 });
 function getCurrentVersion2() {
   try {
-    return true ? "0.1.21" : null.version;
+    return true ? "0.1.22" : null.version;
   } catch {
     return "0.0.0";
   }

package/out/mcp/server.js

@@ -31163,6 +31163,7 @@ CREATE TABLE IF NOT EXISTS rooms (
     queen_nickname TEXT,
     chat_session_id TEXT,
     referred_by_code TEXT,
+    allowed_tools TEXT,
     created_at DATETIME DEFAULT (datetime('now','localtime')),
     updated_at DATETIME DEFAULT (datetime('now','localtime'))
 );
@@ -32357,6 +32358,7 @@ function mapRoomRow(row) {
     queenNickname: row.queen_nickname ?? null,
     chatSessionId: row.chat_session_id ?? null,
     referredByCode: row.referred_by_code ?? null,
+    allowedTools: row.allowed_tools ?? null,
     webhookToken: row.webhook_token ?? null,
     createdAt: row.created_at,
     updatedAt: row.updated_at
@@ -32445,6 +32447,7 @@ function updateRoom(db2, id, updates) {
     config: "config",
     referredByCode: "referred_by_code",
     queenNickname: "queen_nickname",
+    allowedTools: "allowed_tools",
     webhookToken: "webhook_token"
   };
   const fields = [];
@@ -33002,6 +33005,13 @@ function runMigrations(database, log = console.log) {
     database.exec(`ALTER TABLE workers ADD COLUMN max_turns INTEGER`);
     log("Migrated: added cycle_gap_ms and max_turns columns to workers");
   }
+  const hasRoomAllowedTools = database.prepare(
+    `SELECT name FROM pragma_table_info('rooms') WHERE name='allowed_tools'`
+  ).get()?.name;
+  if (!hasRoomAllowedTools) {
+    database.exec(`ALTER TABLE rooms ADD COLUMN allowed_tools TEXT`);
+    log("Migrated: added allowed_tools column to rooms");
+  }
   const ollamaWorkers = database.prepare(`SELECT id FROM workers WHERE model LIKE 'ollama:%'`).all();
   if (ollamaWorkers.length > 0) {
     database.prepare(`UPDATE workers SET model = 'claude' WHERE model LIKE 'ollama:%'`).run();
@@ -47485,7 +47495,7 @@ Share this with the keeper or potential collaborators. Rooms created through thi
 async function main() {
   const server = new McpServer({
     name: "quoroom",
-    version: true ? "0.1.21" : "0.0.0"
+    version: true ? "0.1.22" : "0.0.0"
   });
   registerMemoryTools(server);
   registerSchedulerTools(server);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quoroom",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "description": "Autonomous AI agent collective engine — Queen, Workers, Quorum",
   "main": "./out/mcp/server.js",
   "bin": {
@@ -25,7 +25,7 @@
     "build:mcp": "node scripts/build-mcp.js",
     "build:ui": "vite build --config src/ui/vite.config.ts",
     "kill:ports": "node scripts/kill-ports.js",
-    "kill:dev-ports": "npm run kill:ports -- 4700 3710 5173",
+    "kill:dev-ports": "npm run kill:ports -- 4700 3715 5173",
     "dev:links": "node scripts/dev-links.js",
     "dev": "sh -c 'npm run kill:dev-ports && trap \"kill 0\" INT TERM EXIT; npm run dev:links & npm run dev:room & npm run dev:cloud & wait'",
     "dev:room": "sh -c 'export QUOROOM_DATA_DIR=$HOME/.quoroom-dev QUOROOM_SKIP_MCP_REGISTER=1; npm run build:mcp && npm run build:ui && node scripts/dev-server.js --port 4700'",
@@ -33,7 +33,7 @@
     "dev:room:shared": "npm run build:mcp && npm run build:ui && node scripts/dev-server.js",
     "doctor:split": "node scripts/doctor-split.js",
     "dev:isolated": "sh -c 'npm run kill:dev-ports && trap \"kill 0\" INT TERM EXIT; npm run dev:links & npm run dev:room:isolated & npm run dev:cloud & VITE_API_PORT=4700 npm run dev:ui & wait'",
-    "dev:cloud": "sh -c 'npm run kill:ports -- 3710 && cd ../cloud && PORT=3710 CLOUD_PUBLIC_URL=http://127.0.0.1:3710 CLOUD_ALLOWED_ORIGINS='\"'\"'http://127.0.0.1:3710,http://localhost:3710,http://localhost:5173,http://127.0.0.1:5173,https://quoroom.ai,https://www.quoroom.ai,https://app.quoroom.ai'\"'\"' npm start'",
+    "dev:cloud": "sh -c 'npm run kill:ports -- 3715 && cd ../cloud && PORT=3715 CLOUD_PUBLIC_URL=http://127.0.0.1:3715 CLOUD_ALLOWED_ORIGINS='\"'\"'http://127.0.0.1:3715,http://localhost:3715,http://localhost:5173,http://127.0.0.1:5173,https://quoroom.ai,https://www.quoroom.ai,https://app.quoroom.ai'\"'\"' npm start'",
     "dev:ui": "vite --config src/ui/vite.config.ts",
     "seed:style-demo": "sh -c 'export QUOROOM_DATA_DIR=$HOME/.quoroom-dev; node scripts/seed-style-demo.js'",
     "typecheck": "tsc --noEmit",