@stevederico/dotbot 0.28.0 → 0.31.0

package/test/cron_handler.test.js

@@ -0,0 +1,116 @@
+import { test, describe } from 'node:test';
+import assert from 'node:assert';
+import { createCronHandler } from '../core/cron_handler.js';
+
+/**
+ * Regression tests for the cron heartbeat path.
+ *
+ * These cover the skip-when-no-tasks optimization added in 0.30: a heartbeat
+ * firing with zero active tasks used to send a pointless "[Heartbeat] ..."
+ * message to the LLM on every tick. Now it returns null from
+ * buildHeartbeatContent before the agent is ever called, saving a round trip
+ * on every provider (and real dollars on cloud providers).
+ */
+
+/**
+ * Build a minimal sessionStore stub that returns a fixed session. The session
+ * has no `updatedAt` so the stale-user check is skipped.
+ */
+function makeSessionStore(owner = 'user-1') {
+  return {
+    async getOrCreateDefaultSession() {
+      return { id: 'session-1', owner, messages: [] };
+    },
+    async getSessionInternal(id) {
+      return { id, owner, messages: [], provider: 'ollama', model: 'test' };
+    },
+    async addMessage() {},
+  };
+}
+
+/**
+ * Track whether agent.chat was invoked, without any real streaming.
+ */
+function makeAgentSpy() {
+  const calls = [];
+  return {
+    calls,
+    async *chat(opts) {
+      calls.push(opts);
+      yield { type: 'done', content: '' };
+    },
+  };
+}
+
+describe('cron_handler — heartbeat skip optimization', () => {
+  test('skips the agent call entirely when there are no active tasks', async () => {
+    const sessionStore = makeSessionStore();
+    const agent = makeAgentSpy();
+
+    const handleTask = createCronHandler({
+      sessionStore,
+      cronStore: {},
+      taskStore: null,
+      memoryStore: null,
+      providers: {},
+      hooks: {
+        tasksFinder: async () => [], // the key condition — zero tasks
+      },
+    });
+    handleTask.setAgent(agent);
+
+    await handleTask({ name: 'heartbeat', userId: 'user-1', prompt: 'Any updates?' });
+
+    // Agent must NOT have been called since there's nothing to discuss.
+    assert.strictEqual(agent.calls.length, 0,
+      'agent.chat must not be invoked when tasksFinder returns []');
+  });
+
+  test('still calls the agent when there is at least one active task', async () => {
+    const sessionStore = makeSessionStore();
+    const agent = makeAgentSpy();
+
+    const handleTask = createCronHandler({
+      sessionStore,
+      cronStore: {},
+      taskStore: null,
+      memoryStore: null,
+      providers: {},
+      hooks: {
+        tasksFinder: async () => [
+          { id: 't1', description: 'Ship the scrub', priority: 'high' },
+        ],
+      },
+    });
+    handleTask.setAgent(agent);
+
+    await handleTask({ name: 'heartbeat', userId: 'user-1', prompt: 'Any updates?' });
+
+    assert.strictEqual(agent.calls.length, 1,
+      'agent.chat should be invoked when at least one active task exists');
+  });
+
+  test('skips the agent call if tasksFinder throws', async () => {
+    // Fail-closed guard: if the task store is down, a heartbeat should not
+    // degrade to a meaningless default prompt sent to the LLM.
+    const sessionStore = makeSessionStore();
+    const agent = makeAgentSpy();
+
+    const handleTask = createCronHandler({
+      sessionStore,
+      cronStore: {},
+      taskStore: null,
+      memoryStore: null,
+      providers: {},
+      hooks: {
+        tasksFinder: async () => { throw new Error('db unreachable'); },
+      },
+    });
+    handleTask.setAgent(agent);
+
+    await handleTask({ name: 'heartbeat', userId: 'user-1', prompt: 'Any updates?' });
+
+    assert.strictEqual(agent.calls.length, 0,
+      'agent.chat must not be invoked when tasksFinder throws');
+  });
+});

package/tools/appgen.js

@@ -57,14 +57,7 @@ export function cleanGeneratedCode(code) {
   if (!code) return { code: '', windowSize: { width: 800, height: 650 } };
 
   let cleanCode = code
-    // Remove markdown code blocks
-    .replace(/```javascript/gi, '')
-    .replace(/```jsx/gi, '')
-    .replace(/```js/gi, '')
-    .replace(/```react/gi, '')
-    .replace(/```typescript/gi, '')
-    .replace(/```tsx/gi, '')
-    .replace(/```/g, '')
+    .replace(/```(?:javascript|jsx|js|react|typescript|tsx)?/gi, '')
     // Remove HTML document wrappers
     .replace(/<html[^>]*>[\s\S]*<\/html>/gi, '')
     .replace(/<head[^>]*>[\s\S]*<\/head>/gi, '')
@@ -307,5 +300,3 @@ export const appgenTools = [
     }
   }
 ];
-
-export default appgenTools;

package/tools/browser.js

@@ -616,21 +616,6 @@ export function createBrowserTools(screenshotUrlPattern = (filename) => `/api/ag
             pageSummary += `\n\nPage structure:\n${trimmed}`;
           }
 
-          // Log to activity so Photos app can list the screenshot
-          if (context?.databaseManager) {
-            try {
-              await context.databaseManager.logAgentActivity(
-                context.dbConfig.dbType,
-                context.dbConfig.db,
-                context.dbConfig.connectionString,
-                context.userID,
-                { type: 'image_generation', prompt: `Screenshot: ${title}`, url: screenshotUrl, source: 'browser' }
-              );
-            } catch {
-              /* best effort */
-            }
-          }
-
           // Return image JSON so frontend renders the screenshot inline
           return JSON.stringify({ type: 'image', url: screenshotUrl, prompt: pageSummary });
         } catch (err) {

package/tools/code.js

@@ -52,20 +52,6 @@ export const codeTools = [
 
         await unlink(tmpFile).catch(() => {});
 
-        if (context?.databaseManager) {
-          try {
-            await context.databaseManager.logAgentActivity(
-              context.dbConfig.dbType, context.dbConfig.db, context.dbConfig.connectionString,
-              context.userID, {
-                type: 'code_execution',
-                code: input.code.slice(0, 500),
-                output: (stdout || stderr || '').slice(0, 500),
-                success: !stderr
-              }
-            );
-          } catch (e) { /* best effort */ }
-        }
-
         if (stderr) {
           return `Stderr:\n${stderr}\n\nStdout:\n${stdout}`;
         }
@@ -74,20 +60,6 @@ export const codeTools = [
       } catch (err) {
         await unlink(tmpFile).catch(() => {});
 
-        if (context?.databaseManager) {
-          try {
-            await context.databaseManager.logAgentActivity(
-              context.dbConfig.dbType, context.dbConfig.db, context.dbConfig.connectionString,
-              context.userID, {
-                type: 'code_execution',
-                code: input.code.slice(0, 500),
-                output: (err.stderr || err.message || '').slice(0, 500),
-                success: false
-              }
-            );
-          } catch (e) { /* best effort */ }
-        }
-
         if (err.killed) {
           return "Error: code execution timed out (10s limit)";
         }

package/tools/images.js

@@ -176,16 +176,6 @@ export const imageTools = [
         return result.error;
       }
 
-      // Log to activity for persistence
-      if (context?.databaseManager) {
-        try {
-          await context.databaseManager.logAgentActivity(
-            context.dbConfig.dbType, context.dbConfig.db, context.dbConfig.connectionString,
-            context.userID, { type: 'image_generation', prompt: input.prompt, url: result.url, source: 'agent' }
-          );
-        } catch (e) { /* best effort */ }
-      }
-
       return JSON.stringify({ type: 'image', url: result.url, prompt: input.prompt });
     },
   },

package/tools/index.js

@@ -13,9 +13,9 @@ import { imageTools } from './images.js';
 import { weatherTools } from './weather.js';
 import { notifyTools } from './notify.js';
 import { browserTools, createBrowserTools } from './browser.js';
-import { taskTools, goalTools } from './tasks.js';
+import { taskTools } from './tasks.js';
 import { triggerTools } from './triggers.js';
-import { jobTools, cronTools } from './jobs.js';
+import { jobTools } from './jobs.js';
 import { eventTools } from './events.js';
 import { appgenTools } from './appgen.js';
 
@@ -88,10 +88,8 @@ export {
   browserTools,
   createBrowserTools,
   taskTools,
-  goalTools,   // backwards compatibility alias
   triggerTools,
   jobTools,
-  cronTools,   // backwards compatibility alias
   eventTools,
   appgenTools,
 };

package/tools/jobs.js

@@ -155,5 +155,3 @@ export const jobTools = [
   },
 ];
 
-// Backwards compatibility alias
-export const cronTools = jobTools;

package/tools/memory.js

@@ -37,7 +37,7 @@ export const memoryTools = [
           type: "array",
           items: { type: "string" },
           description:
-            "Short tags for categorization. e.g. ['personal', 'name'] or ['project', 'dottie']",
+            "Short tags for categorization. e.g. ['personal', 'name'] or ['project', 'myapp']",
         },
       },
       required: ["content"],

package/tools/tasks.js

@@ -400,5 +400,3 @@ export const taskTools = [
   },
 ];
 
-// Backwards compatibility: export goalTools as alias
-export const goalTools = taskTools;

package/tools/web.js

@@ -70,15 +70,6 @@ export const webTools = [
               result += "\n\nSources:\n" + [...citations].slice(0, 5).map((url, i) => `${i + 1}. ${url}`).join("\n");
             }
 
-            if (context?.databaseManager) {
-              try {
-                await context.databaseManager.logAgentActivity(
-                  context.dbConfig.dbType, context.dbConfig.db, context.dbConfig.connectionString,
-                  context.userID, { type: 'web_search', query: input.query, provider: 'grok', resultPreview: result.slice(0, 300) }
-                );
-              } catch (e) { /* best effort */ }
-            }
-
             return result || "No results found.";
           } else {
             const errText = await res.text();
@@ -120,15 +111,6 @@ export const webTools = [
 
       const result = parts.join("\n\n");
 
-      if (context?.databaseManager) {
-        try {
-          await context.databaseManager.logAgentActivity(
-            context.dbConfig.dbType, context.dbConfig.db, context.dbConfig.connectionString,
-            context.userID, { type: 'web_search', query: input.query, provider: 'duckduckgo', resultPreview: parts.slice(0, 2).join('\n').slice(0, 300) }
-          );
-        } catch (e) { /* best effort */ }
-      }
-
       return result;
     },
   },
@@ -176,15 +158,6 @@ export const webTools = [
           text = text.slice(0, maxChars) + `\n\n... [truncated, ${text.length} chars total]`;
         }
 
-        if (context?.databaseManager) {
-          try {
-            await context.databaseManager.logAgentActivity(
-              context.dbConfig.dbType, context.dbConfig.db, context.dbConfig.connectionString,
-              context.userID, { type: 'grokipedia_search', query: input.query, url }
-            );
-          } catch (e) { /* best effort */ }
-        }
-
         return text;
       } catch (err) {
         return `Error looking up Grokipedia: ${err.message}`;
@@ -260,15 +233,6 @@ export const webTools = [
             .trim();
         }
 
-        if (context?.databaseManager) {
-          try {
-            await context.databaseManager.logAgentActivity(
-              context.dbConfig.dbType, context.dbConfig.db, context.dbConfig.connectionString,
-              context.userID, { type: 'web_fetch', url: input.url, status: res.status }
-            );
-          } catch (e) { /* best effort */ }
-        }
-
         const maxChars = 8000;
         if (text.length > maxChars) {
           return text.slice(0, maxChars) + `\n\n... [truncated, ${text.length} chars total]`;

package/utils/providers.js

@@ -133,4 +133,25 @@ export const AI_PROVIDERS = {
     }),
     formatResponse: (data) => data.choices?.[0]?.message?.content
   },
+  mlx_local: {
+    // Local MLX-style OpenAI-compatible server (e.g. mlx_lm.server, LM Studio,
+    // vLLM, llama.cpp server). Routes through the `mlx_local` branch in
+    // core/agent.js which auto-detects gpt-oss channel tokens, native
+    // reasoning, and plain-text responses. Override the URL with MLX_LOCAL_URL.
+    id: 'mlx_local',
+    name: 'Local (MLX)',
+    apiUrl: process.env.MLX_LOCAL_URL || 'http://127.0.0.1:1316/v1',
+    defaultModel: '',
+    models: [],
+    local: true,
+    headers: () => ({
+      'Content-Type': 'application/json'
+    }),
+    endpoint: '/chat/completions',
+    formatRequest: (messages, model) => ({
+      model,
+      messages
+    }),
+    formatResponse: (data) => data.choices?.[0]?.message?.content
+  },
 };

package/.claude/settings.local.json

@@ -1,7 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(grep -r \"grok-3\" /Users/sd/Desktop/projects/dotbot --include=\"*.js\" --include=\"*.md\" 2>/dev/null | grep -v node_modules)"
-    ]
-  }
-}

package/examples/sqlite-session-example.js

@@ -1,69 +0,0 @@
-/**
- * SQLiteSessionStore Usage Example
- *
- * Demonstrates how to use SQLite as a session storage backend
- * for the @dottie/agent library. Requires Node.js 22.5+.
- */
-
-import { createAgent, SQLiteSessionStore, coreTools } from '@dottie/agent';
-
-// Initialize SQLite session store
-const sessionStore = new SQLiteSessionStore();
-await sessionStore.init('./sessions.db', {
-  // Optional: Fetch user preferences from your database
-  prefsFetcher: async (userId) => {
-    // Example: fetch from a user database
-    return {
-      agentName: 'Dottie',
-      agentPersonality: 'helpful and concise',
-    };
-  },
-  // Optional: Ensure user heartbeat for cron tasks
-  heartbeatEnsurer: async (userId) => {
-    // Example: update last_seen timestamp in user database
-    console.log(`User ${userId} active`);
-    return null;
-  },
-});
-
-// Create agent with SQLite session storage
-const agent = createAgent({
-  sessionStore,
-  providers: {
-    anthropic: { apiKey: process.env.ANTHROPIC_API_KEY },
-  },
-  tools: coreTools,
-});
-
-// Example 1: Create a new session
-const session = await agent.createSession('user-123', 'claude-sonnet-4-5', 'anthropic');
-console.log('Created session:', session.id);
-
-// Example 2: Chat with the agent
-for await (const event of agent.chat({
-  sessionId: session.id,
-  message: 'What can you help me with?',
-  provider: 'anthropic',
-  model: 'claude-sonnet-4-5',
-})) {
-  if (event.type === 'content_block_delta' && event.delta?.type === 'text_delta') {
-    process.stdout.write(event.delta.text);
-  }
-}
-console.log('\n');
-
-// Example 3: List all sessions for a user
-const sessions = await sessionStore.listSessions('user-123');
-console.log('User sessions:', sessions);
-
-// Example 4: Get or create default session
-const defaultSession = await sessionStore.getOrCreateDefaultSession('user-123');
-console.log('Default session:', defaultSession.id);
-
-// Example 5: Clear session history
-await sessionStore.clearSession(session.id);
-console.log('Session cleared');
-
-// Example 6: Delete a session
-await sessionStore.deleteSession(session.id, 'user-123');
-console.log('Session deleted');

package/observer/index.js

@@ -1,164 +0,0 @@
-/**
- * Browser Observer — in-memory snapshot store and agent tool.
- *
- * The frontend pushes structured browser-state snapshots via POST /api/agent/observer.
- * The agent reads the latest snapshot via the `browser_observe` tool to understand
- * what the user is currently doing in the browser.
- */
-
-const SNAPSHOT_TTL_MS = 5 * 60 * 1000; // 5 minutes
-
-/** @type {Map<string, Object>} userID → { ...snapshot, receivedAt } */
-const snapshots = new Map();
-
-/**
- * Store the latest browser snapshot for a user.
- *
- * @param {string} userID - Authenticated user ID
- * @param {Object} snapshot - Structured browser state from the frontend
- */
-export function storeSnapshot(userID, snapshot) {
-  snapshots.set(userID, { ...snapshot, receivedAt: Date.now() });
-}
-
-/**
- * Retrieve the latest snapshot for a user, or null if stale/missing.
- *
- * @param {string} userID - Authenticated user ID
- * @returns {Object|null} Snapshot with receivedAt, or null
- */
-export function getSnapshot(userID) {
-  const entry = snapshots.get(userID);
-  if (!entry) return null;
-  if (Date.now() - entry.receivedAt > SNAPSHOT_TTL_MS) {
-    snapshots.delete(userID);
-    return null;
-  }
-  return entry;
-}
-
-/**
- * Remove a user's snapshot (cleanup on logout, etc.).
- *
- * @param {string} userID - Authenticated user ID
- */
-export function clearSnapshot(userID) {
-  snapshots.delete(userID);
-}
-
-/**
- * Format a snapshot into plain-text for LLM consumption.
- *
- * @param {Object} snap - Snapshot object from the store
- * @param {boolean} includeActions - Whether to include recent actions
- * @returns {string} Human-readable state description
- */
-function formatSnapshot(snap, includeActions = true) {
-  const ageSec = Math.round((Date.now() - snap.timestamp) / 1000);
-  const lines = [];
-
-  lines.push(`Browser state (${ageSec}s ago):`);
-  lines.push('');
-
-  // Windows
-  if (snap.windows && snap.windows.length > 0) {
-    lines.push(`Open apps (${snap.windowCount || snap.windows.length}):`);
-    for (const w of snap.windows) {
-      const focus = w.isFocused ? ' [focused]' : '';
-      lines.push(`  - ${w.app}${w.title ? ': ' + w.title : ''}${focus}`);
-    }
-  } else {
-    lines.push('No apps open.');
-  }
-
-  if (snap.focusedApp) {
-    lines.push(`Focused: ${snap.focusedApp}`);
-  }
-
-  // Docked panel
-  if (snap.isDottieDocked) {
-    lines.push('DotBot panel: docked (sidebar)');
-  }
-
-  // Input bar
-  if (snap.isInputElevated) {
-    lines.push(`Input bar: elevated${snap.inputValue ? ' — "' + snap.inputValue + '"' : ''}`);
-  }
-
-  // Voice
-  if (snap.voiceState && snap.voiceState !== 'idle') {
-    lines.push(`Voice: ${snap.voiceState}`);
-  }
-
-  // Streaming
-  if (snap.isStreaming) {
-    lines.push('Agent: streaming response');
-  }
-
-  // Last tool call
-  if (snap.lastToolCall) {
-    const tc = snap.lastToolCall;
-    const tcAge = Math.round((Date.now() - tc.timestamp) / 1000);
-    lines.push(`Last tool: ${tc.name} (${tc.status}, ${tcAge}s ago)`);
-  }
-
-  // Messages
-  if (snap.messageCount > 0) {
-    lines.push(`Messages in session: ${snap.messageCount}`);
-  }
-
-  // Provider/model
-  if (snap.currentProvider || snap.currentModel) {
-    lines.push(`Model: ${snap.currentProvider || '?'}/${snap.currentModel || '?'}`);
-  }
-
-  // Layout + dock
-  lines.push(`Layout: ${snap.layoutMode || 'desktop'}`);
-  if (snap.dockApps && snap.dockApps.length > 0) {
-    lines.push(`Dock: ${snap.dockApps.join(', ')}`);
-  }
-
-  // Viewport
-  if (snap.viewport) {
-    lines.push(`Viewport: ${snap.viewport.width}x${snap.viewport.height}`);
-  }
-
-  // Recent actions
-  if (includeActions && snap.recentActions && snap.recentActions.length > 0) {
-    lines.push('');
-    lines.push('Recent actions:');
-    for (const a of snap.recentActions) {
-      const aAge = Math.round((Date.now() - a.timestamp) / 1000);
-      const detail = a.app ? ` (${a.app})` : a.tool ? ` (${a.tool})` : '';
-      lines.push(`  - ${a.action}${detail} — ${aAge}s ago`);
-    }
-  }
-
-  return lines.join('\n');
-}
-
-/** Agent tool definitions for the browser observer. */
-export const observerTools = [
-  {
-    name: 'browser_observe',
-    description:
-      "See what the user is currently doing in Dottie OS — open apps, focused window, voice state, recent actions. " +
-      "Call this when you need context about the user's current activity, or when they reference 'this', 'what I'm looking at', or 'current'.",
-    parameters: {
-      type: 'object',
-      properties: {
-        include_actions: {
-          type: 'boolean',
-          description: 'Include recent user actions (default true)',
-        },
-      },
-    },
-    execute: async (input, signal, context) => {
-      if (!context?.userID) return 'Error: user context not available';
-      const snap = getSnapshot(context.userID);
-      if (!snap) return 'No browser state available. The user may have the tab in the background or just opened the page.';
-      const includeActions = input.include_actions !== false;
-      return formatSnapshot(snap, includeActions);
-    },
-  },
-];