@sulala/agent 0.1.39 → 0.1.41

package/dist/agent/lead-agent-schedule.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Default Lead Agent schedule configuration.
+ * This ensures the Lead Agent runs on a configurable cron schedule.
+ */
+/**
+ * Ensure the Lead Agent is scheduled to run autonomously.
+ * Called at startup to initialize the default schedule if not already present.
+ */
+export declare function ensureLeadAgentSchedule(): void;
+//# sourceMappingURL=lead-agent-schedule.d.ts.map

package/dist/agent/lead-agent-schedule.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lead-agent-schedule.d.ts","sourceRoot":"","sources":["../../src/agent/lead-agent-schedule.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAQH;;;GAGG;AACH,wBAAgB,uBAAuB,IAAI,IAAI,CAoC9C"}

package/dist/agent/lead-agent-schedule.js

@@ -0,0 +1,49 @@
+/**
+ * Default Lead Agent schedule configuration.
+ * This ensures the Lead Agent runs on a configurable cron schedule.
+ */
+import { getAgentBySlug, listScheduledJobs, insertScheduledJob } from '../db/index.js';
+import { log } from '../db/index.js';
+const LEAD_AGENT_SCHEDULE_ID = 'lead-agent-daily';
+const DEFAULT_LEAD_AGENT_CRON = '0 8 * * *'; // Daily at 08:00 UTC
+/**
+ * Ensure the Lead Agent is scheduled to run autonomously.
+ * Called at startup to initialize the default schedule if not already present.
+ */
+export function ensureLeadAgentSchedule() {
+    const agent = getAgentBySlug('lead-agent');
+    if (!agent || !agent.enabled) {
+        log('lead-agent', 'info', 'Lead Agent not enabled, skipping schedule setup');
+        return;
+    }
+    // Check if schedule already exists
+    const existing = listScheduledJobs(false).find((j) => j.id === LEAD_AGENT_SCHEDULE_ID);
+    if (existing) {
+        log('lead-agent', 'debug', 'Lead Agent schedule already exists');
+        return;
+    }
+    // Create default schedule
+    try {
+        insertScheduledJob({
+            id: LEAD_AGENT_SCHEDULE_ID,
+            name: 'Lead Agent Daily Run',
+            description: 'Autonomous lead generation and reporting (daily at 08:00 UTC)',
+            cron_expression: DEFAULT_LEAD_AGENT_CRON,
+            task_type: 'lead_agent_run',
+            payload: JSON.stringify({
+                agentId: agent.id,
+                provider: agent.default_provider || 'openai',
+                model: agent.default_model || 'gpt-4o-mini',
+            }),
+            enabled: 1,
+        });
+        log('lead-agent', 'info', 'Lead Agent schedule created', {
+            scheduleId: LEAD_AGENT_SCHEDULE_ID,
+            cron: DEFAULT_LEAD_AGENT_CRON,
+        });
+    }
+    catch (err) {
+        log('lead-agent', 'error', `Failed to create Lead Agent schedule: ${err instanceof Error ? err.message : String(err)}`);
+    }
+}
+//# sourceMappingURL=lead-agent-schedule.js.map

package/dist/agent/lead-agent-schedule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lead-agent-schedule.js","sourceRoot":"","sources":["../../src/agent/lead-agent-schedule.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACvF,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAErC,MAAM,sBAAsB,GAAG,kBAAkB,CAAC;AAClD,MAAM,uBAAuB,GAAG,WAAW,CAAC,CAAC,qBAAqB;AAElE;;;GAGG;AACH,MAAM,UAAU,uBAAuB;IACrC,MAAM,KAAK,GAAG,cAAc,CAAC,YAAY,CAAC,CAAC;IAC3C,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QAC7B,GAAG,CAAC,YAAY,EAAE,MAAM,EAAE,iDAAiD,CAAC,CAAC;QAC7E,OAAO;IACT,CAAC;IAED,mCAAmC;IACnC,MAAM,QAAQ,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,sBAAsB,CAAC,CAAC;IACvF,IAAI,QAAQ,EAAE,CAAC;QACb,GAAG,CAAC,YAAY,EAAE,OAAO,EAAE,oCAAoC,CAAC,CAAC;QACjE,OAAO;IACT,CAAC;IAED,0BAA0B;IAC1B,IAAI,CAAC;QACH,kBAAkB,CAAC;YACjB,EAAE,EAAE,sBAAsB;YAC1B,IAAI,EAAE,sBAAsB;YAC5B,WAAW,EAAE,+DAA+D;YAC5E,eAAe,EAAE,uBAAuB;YACxC,SAAS,EAAE,gBAAgB;YAC3B,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC;gBACtB,OAAO,EAAE,KAAK,CAAC,EAAE;gBACjB,QAAQ,EAAE,KAAK,CAAC,gBAAgB,IAAI,QAAQ;gBAC5C,KAAK,EAAE,KAAK,CAAC,aAAa,IAAI,aAAa;aAC5C,CAAC;YACF,OAAO,EAAE,CAAC;SACX,CAAC,CAAC;QACH,GAAG,CAAC,YAAY,EAAE,MAAM,EAAE,6BAA6B,EAAE;YACvD,UAAU,EAAE,sBAAsB;YAClC,IAAI,EAAE,uBAAuB;SAC9B,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,GAAG,CAAC,YAAY,EAAE,OAAO,EAAE,yCAAyC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC1H,CAAC;AACH,CAAC"}

package/dist/agent/lead-agent.d.ts

@@ -0,0 +1,60 @@
+/**
+ * Lead Agent Workflow — autonomous lead generation and reporting.
+ *
+ * Pipeline:
+ * 1. Recall ICP and past leads from memory
+ * 2. Search for new potential leads
+ * 3. Score and deduplicate leads
+ * 4. Store in knowledge graph and memory
+ * 5. Generate and save report
+ * 6. Record metrics
+ */
+import { type AgentStreamEvent } from './loop.js';
+export interface LeadAgentWorkflowOptions {
+    /** Session ID for the workflow run. */
+    sessionId: string;
+    /** Optional user ID. */
+    userId?: string;
+    /** Override provider (defaults to agent's default_provider). */
+    provider?: string;
+    /** Override model (defaults to agent's default_model). */
+    model?: string;
+    /** Max execution time in ms. */
+    timeoutMs?: number;
+    /** Optional abort signal for cancellation. */
+    signal?: AbortSignal;
+    /** When set, workflow uses streaming and calls this for each event (for live UI). */
+    onStreamEvent?: (ev: AgentStreamEvent) => void;
+}
+export interface LeadAgentWorkflowResult {
+    success: boolean;
+    turnCount: number;
+    leadsFound: number;
+    message: string;
+    reportPath?: string;
+    error?: string;
+}
+export type OutputDestination = 'file' | 'google_sheet' | 'google_doc';
+export interface LeadAgentSetup {
+    targetIndustry: string;
+    targetRole: string;
+    companySize: 'any' | 'startup' | 'smb' | 'enterprise';
+    leadSource: 'web_search' | 'custom';
+    numLeads: number;
+    geographicFocus: string;
+    enrichmentDepth: 'basic' | 'standard' | 'deep';
+    /** Where to save the leads report. 'file' = file_write (always available). */
+    outputDestination: OutputDestination;
+    /** Optional: spreadsheet ID for Google Sheets (from URL docs.google.com/spreadsheets/d/ID) */
+    spreadsheetId?: string;
+    /** Optional: document ID for Google Docs (from URL docs.google.com/document/d/ID) */
+    documentId?: string;
+}
+/**
+ * Run the Lead Agent workflow.
+ *
+ * Sends a system prompt + user instruction to guide the agent through the pipeline.
+ * Workflow is autonomous: the agent decides when to call tools and when to finish.
+ */
+export declare function runLeadAgentWorkflow(_agentId: string, options: LeadAgentWorkflowOptions): Promise<LeadAgentWorkflowResult>;
+//# sourceMappingURL=lead-agent.d.ts.map

package/dist/agent/lead-agent.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lead-agent.d.ts","sourceRoot":"","sources":["../../src/agent/lead-agent.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,EAAoC,KAAK,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAGpF,MAAM,WAAW,wBAAwB;IACvC,uCAAuC;IACvC,SAAS,EAAE,MAAM,CAAC;IAElB,wBAAwB;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,gEAAgE;IAChE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,0DAA0D;IAC1D,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,gCAAgC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,8CAA8C;IAC9C,MAAM,CAAC,EAAE,WAAW,CAAC;IAErB,qFAAqF;IACrF,aAAa,CAAC,EAAE,CAAC,EAAE,EAAE,gBAAgB,KAAK,IAAI,CAAC;CAChD;AAED,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,iBAAiB,GAAG,MAAM,GAAG,cAAc,GAAG,YAAY,CAAC;AAEvE,MAAM,WAAW,cAAc;IAC7B,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,YAAY,CAAC;IACtD,UAAU,EAAE,YAAY,GAAG,QAAQ,CAAC;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,OAAO,GAAG,UAAU,GAAG,MAAM,CAAC;IAC/C,8EAA8E;IAC9E,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,8FAA8F;IAC9F,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qFAAqF;IACrF,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAiGD;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,uBAAuB,CAAC,CA2FlC"}

package/dist/agent/lead-agent.js

@@ -0,0 +1,205 @@
+/**
+ * Lead Agent Workflow — autonomous lead generation and reporting.
+ *
+ * Pipeline:
+ * 1. Recall ICP and past leads from memory
+ * 2. Search for new potential leads
+ * 3. Score and deduplicate leads
+ * 4. Store in knowledge graph and memory
+ * 5. Generate and save report
+ * 6. Record metrics
+ */
+import { recordAgentMetric, getAgentBySlug, getChannelConfig } from '../db/index.js';
+import { runAgentTurn, runAgentTurnStream } from './loop.js';
+import { log } from '../db/index.js';
+const LEAD_AGENT_SETUP_KEY = 'lead_agent_setup';
+function getLeadAgentSetup() {
+    const raw = getChannelConfig(LEAD_AGENT_SETUP_KEY);
+    if (!raw?.trim()) {
+        return {
+            targetIndustry: '',
+            targetRole: '',
+            companySize: 'any',
+            leadSource: 'web_search',
+            numLeads: 10,
+            geographicFocus: '',
+            enrichmentDepth: 'standard',
+            outputDestination: 'file',
+        };
+    }
+    try {
+        const o = JSON.parse(raw);
+        const dest = ['file', 'google_sheet', 'google_doc'].includes(String(o.outputDestination))
+            ? o.outputDestination
+            : 'file';
+        return {
+            targetIndustry: typeof o.targetIndustry === 'string' ? o.targetIndustry : '',
+            targetRole: typeof o.targetRole === 'string' ? o.targetRole : '',
+            companySize: ['any', 'startup', 'smb', 'enterprise'].includes(String(o.companySize)) ? o.companySize : 'any',
+            leadSource: ['web_search', 'custom'].includes(String(o.leadSource)) ? o.leadSource : 'web_search',
+            numLeads: typeof o.numLeads === 'number' && o.numLeads >= 1 ? Math.min(100, Math.round(o.numLeads)) : 10,
+            geographicFocus: typeof o.geographicFocus === 'string' ? o.geographicFocus : '',
+            enrichmentDepth: ['basic', 'standard', 'deep'].includes(String(o.enrichmentDepth)) ? o.enrichmentDepth : 'standard',
+            outputDestination: dest,
+            spreadsheetId: typeof o.spreadsheetId === 'string' ? o.spreadsheetId.trim() || undefined : undefined,
+            documentId: typeof o.documentId === 'string' ? o.documentId.trim() || undefined : undefined,
+        };
+    }
+    catch {
+        return {
+            targetIndustry: '',
+            targetRole: '',
+            companySize: 'any',
+            leadSource: 'web_search',
+            numLeads: 10,
+            geographicFocus: '',
+            enrichmentDepth: 'standard',
+            outputDestination: 'file',
+        };
+    }
+}
+function buildCriteriaBlock(setup) {
+    const parts = [];
+    if (setup.targetIndustry?.trim())
+        parts.push(`Target industry: ${setup.targetIndustry.trim()}`);
+    if (setup.targetRole?.trim())
+        parts.push(`Target roles (decision-makers): ${setup.targetRole.trim()}`);
+    if (setup.companySize && setup.companySize !== 'any') {
+        const labels = { startup: 'Startup (1-50)', smb: 'SMB (50-500)', enterprise: 'Enterprise (500+)' };
+        parts.push(`Company size: ${labels[setup.companySize] ?? setup.companySize}`);
+    }
+    if (setup.leadSource === 'web_search')
+        parts.push('Lead source: Web search (use web_search to find prospects).');
+    if (setup.geographicFocus?.trim())
+        parts.push(`Geographic focus: ${setup.geographicFocus.trim()}`);
+    if (setup.enrichmentDepth && setup.enrichmentDepth !== 'basic') {
+        const depth = {
+            standard: 'Enrich with company size, industry, tech stack where possible.',
+            deep: 'Enrich with company size, industry, tech stack, funding, recent news, social profiles where possible.',
+        };
+        parts.push(`Enrichment: ${depth[setup.enrichmentDepth] ?? setup.enrichmentDepth}`);
+    }
+    if (parts.length === 0)
+        return '';
+    return `Configured criteria (use these when searching and scoring):\n${parts.map((p) => `- ${p}`).join('\n')}\n\n`;
+}
+function buildOutputInstruction(setup) {
+    const dest = setup.outputDestination;
+    if (dest === 'google_sheet') {
+        const idHint = setup.spreadsheetId
+            ? `Use spreadsheet_id="${setup.spreadsheetId}" (from the URL).`
+            : 'Create a new spreadsheet with sheets_create if none is specified, or use an existing one.';
+        return `6. Save the leads report to Google Sheets:
+   - Format: header row (Company, Role, Name, Industry, Size, Link, Score), then one row per lead.
+   - ${idHint}
+   - Use sheets_update_values to write the header and data, or sheets_append_values to append rows. Range: Sheet1!A1:G.
+   - Report back with the spreadsheet URL or "saved to Google Sheets [url]".`;
+    }
+    if (dest === 'google_doc') {
+        const idHint = setup.documentId
+            ? `Use document_id="${setup.documentId}" (from the URL). Get endIndex with docs_get_document, then docs_insert_text at that index.`
+            : 'Create a new document with docs_create, then use docs_insert_text to add the report content (header + table or list of leads).';
+        return `6. Save the leads report to Google Docs:
+   - ${idHint}
+   - Format: title "Lead Report", then a table or list of leads (company, role, name, industry, size, link, score).
+   - Report back with the document URL or "saved to Google Docs [url]".`;
+    }
+    return `6. Generate a summary report (CSV or JSON) and use file_write to save it (leads.csv or leads.json). Report back with "saved to [path]".`;
+}
+/**
+ * Run the Lead Agent workflow.
+ *
+ * Sends a system prompt + user instruction to guide the agent through the pipeline.
+ * Workflow is autonomous: the agent decides when to call tools and when to finish.
+ */
+export async function runLeadAgentWorkflow(_agentId, options) {
+    const agent = getAgentBySlug('lead-agent');
+    if (!agent) {
+        log('lead-agent', 'error', 'Lead Agent not found');
+        return {
+            success: false,
+            turnCount: 0,
+            leadsFound: 0,
+            message: 'Lead Agent not found',
+            error: 'Lead Agent not configured',
+        };
+    }
+    const setup = getLeadAgentSetup();
+    const outputInstruction = buildOutputInstruction(setup);
+    const systemPrompt = agent.persona_prompt ||
+        `You are a lead generation specialist. Your job is to:
+1. Use memory_recall and knowledge_query to retrieve your ICP and existing leads.
+2. Use web_search and web_fetch to discover new potential leads (companies, decision-makers).
+3. Score each lead 0–100 against your ICP criteria.
+4. Deduplicate leads to avoid duplicates.
+5. Use memory_store and knowledge_add_entity to record new leads and company relationships.
+${outputInstruction}
+7. Respond with a summary: "Found X leads, saved to [path/url], metrics: [...]"`;
+    const criteriaBlock = buildCriteriaBlock(setup);
+    const userPrompt = `Run your full lead generation pipeline now.
+${criteriaBlock}
+Here's your workflow:
+1. Recall ICP criteria and existing leads
+2. Search for new prospects (web_search for companies in target market; use the criteria above to shape your search)
+3. Score and deduplicate
+4. Store new leads in memory and knowledge graph
+5. Save the report (about ${setup.numLeads} leads) to the configured destination. Use your available tools.
+6. Report back with metrics: leads_found, unique_companies, and where the report was saved
+
+Use your available tools to complete this end-to-end. Work autonomously.`;
+    const turnOptions = {
+        sessionId: options.sessionId,
+        systemPrompt,
+        userMessage: userPrompt,
+        provider: options.provider || agent.default_provider || undefined,
+        model: options.model || agent.default_model || undefined,
+        max_tokens: 4096,
+        signal: options.signal,
+        skipToolApproval: true, // autonomous run, don't wait for approval
+    };
+    try {
+        const result = options.onStreamEvent
+            ? await runAgentTurnStream(turnOptions, options.onStreamEvent)
+            : await runAgentTurn(turnOptions);
+        // Parse the final response for metrics
+        const finalContent = result.finalContent || '';
+        const leadsMatch = finalContent.match(/(\d+)\s+leads?/i);
+        const leadsFound = leadsMatch ? parseInt(leadsMatch[1], 10) : 0;
+        // Record metrics
+        recordAgentMetric(agent.id, 'leads_found', leadsFound, String(leadsFound));
+        recordAgentMetric(agent.id, 'last_run', Date.now(), new Date().toISOString());
+        recordAgentMetric(agent.id, 'last_report', undefined, finalContent.slice(0, 500));
+        log('lead-agent', 'info', 'Workflow completed', {
+            sessionId: options.sessionId,
+            leadsFound,
+            turnsNeeded: result.turnCount,
+        });
+        return {
+            success: true,
+            turnCount: result.turnCount,
+            leadsFound,
+            message: finalContent,
+            reportPath: extractReportPath(finalContent),
+        };
+    }
+    catch (err) {
+        const errorMsg = err instanceof Error ? err.message : String(err);
+        log('lead-agent', 'error', 'Workflow failed', { sessionId: options.sessionId, error: errorMsg });
+        return {
+            success: false,
+            turnCount: 0,
+            leadsFound: 0,
+            message: 'Workflow failed',
+            error: errorMsg,
+        };
+    }
+}
+/**
+ * Extract the report file path from the agent's final message.
+ * Looks for patterns like "saved to /path/to/leads.csv" or "leads.json".
+ */
+function extractReportPath(content) {
+    const match = content.match(/(?:saved to|report:?\s*|path:?\s*)([^\s,\n]+\.(?:csv|json|md))/i);
+    return match ? match[1] : undefined;
+}
+//# sourceMappingURL=lead-agent.js.map

package/dist/agent/lead-agent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lead-agent.js","sourceRoot":"","sources":["../../src/agent/lead-agent.ts"],"names":[],"mappings":"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"}

package/dist/agent/loop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loop.d.ts","sourceRoot":"","sources":["../../src/agent/loop.ts"],"names":[],"mappings":"AA2BA,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAGrE,MAAM,MAAM,gBAAgB,GACxB;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACpC;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACnC;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GACrD;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GACzF;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAoCvC,2GAA2G;AAC3G,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAiBjE;AAED,uHAAuH;AACvH,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,CAAC,eAAe,GAAG;IAAE,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,EAAE,EAC9C,kBAAkB,EAAE,MAAM,GACzB,MAAM,CAKR;AA+FD,qIAAqI;AACrI,wBAAgB,yBAAyB,IAAI,MAAM,CAMlD;AAyPD,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oEAAoE;IACpE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2EAA2E;IAC3E,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,kIAAkI;IAClI,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,wIAAwI;IACxI,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,gBAAgB,EAAE,CAAC;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,uFAAuF;IACvF,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAgKD,wBAAsB,YAAY,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAiLlF;AAED,2EAA2E;AAC3E,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,CAAC,EAAE,EAAE,gBAAgB,KAAK,IAAI,GACtC,OAAO,CAAC,aAAa,CAAC,CAiQxB"}
+{"version":3,"file":"loop.d.ts","sourceRoot":"","sources":["../../src/agent/loop.ts"],"names":[],"mappings":"AA2BA,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAGrE,MAAM,MAAM,gBAAgB,GACxB;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACpC;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACnC;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GACrD;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GACzF;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAoCvC,2GAA2G;AAC3G,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAiBjE;AAED,uHAAuH;AACvH,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,CAAC,eAAe,GAAG;IAAE,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,EAAE,EAC9C,kBAAkB,EAAE,MAAM,GACzB,MAAM,CAKR;AA+FD,qIAAqI;AACrI,wBAAgB,yBAAyB,IAAI,MAAM,CAMlD;AAyPD,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oEAAoE;IACpE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2EAA2E;IAC3E,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,kIAAkI;IAClI,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,wIAAwI;IACxI,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,gBAAgB,EAAE,CAAC;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,uFAAuF;IACvF,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAmND,wBAAsB,YAAY,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAiLlF;AAED,2EAA2E;AAC3E,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,CAAC,EAAE,EAAE,gBAAgB,KAAK,IAAI,GACtC,OAAO,CAAC,aAAa,CAAC,CAiQxB"}

package/dist/agent/loop.js

@@ -479,7 +479,55 @@ function collectFiles(base) {
     }
     return files;
 }
-function loadContextFromPaths() {
+/** Extract first "## Tool: name" from skill body for the index. */
+function extractToolNameFromBody(body) {
+    const m = body.match(/##\s+Tool:\s*(\S+)/);
+    return m ? m[1].trim() : undefined;
+}
+/** Build a short relevance hint based on the current user message so the model picks the right tool. */
+function buildRelevanceHint(userMessage) {
+    if (!userMessage || typeof userMessage !== 'string')
+        return '';
+    const msg = userMessage.toLowerCase().trim();
+    if (/fetch|news|perigon|articles|trending/.test(msg) && !/create\s+(a\s+)?skill/.test(msg)) {
+        return '**For this request:** Use the **perigon_fetch_articles** tool (Perigon Articles skill). Do NOT use create_skill or mcp_twitter_*.\n\n';
+    }
+    if (/create\s+(a\s+)?skill|create\s+skill\s+for/.test(msg)) {
+        return '**For this request:** User wants to create a skill. Use **create_skill** with the Sulala format (see Workspace rules below).\n\n';
+    }
+    if (/post|tweet|bluesky|social\s+post/.test(msg)) {
+        return '**For this request:** Use the skill tool for the requested platform (e.g. bluesky post, x_post) or mcp_twitter_* for Twitter. Do NOT use perigon_fetch_articles.\n\n';
+    }
+    return '';
+}
+/** Build only the workspace rules relevant to the user message to keep the prompt focused. */
+function buildWorkspaceSection(userMessage) {
+    const msg = (userMessage || '').toLowerCase();
+    const isFetchNews = /fetch|news|perigon|articles|trending/.test(msg) && !/create\s+(a\s+)?skill/.test(msg);
+    const isCreateSkill = /create\s+(a\s+)?skill|create\s+skill\s+for/.test(msg);
+    const isPost = /post|tweet|bluesky/.test(msg);
+    const isWatch = /watch\s+folder|automation|when\s+(file|image)/.test(msg);
+    const parts = [];
+    // Always include a one-line "use existing skills" rule when request is about fetching data
+    if (isFetchNews) {
+        parts.push('Use **perigon_fetch_articles** for Perigon/news. Do not create_skill.');
+    }
+    if (isCreateSkill) {
+        parts.push('**Creating a skill:** Use create_skill. README: name, description, metadata with env + envHints, body with ## Tool: <name>. tools.yaml: name, request.url, queryParams with $env:KEY, parameters[].name, response. requiredEnv: same as metadata.');
+    }
+    if (isPost) {
+        parts.push('For posting: use the skill tool for that platform or mcp_*; do not use perigon_fetch_articles.');
+    }
+    if (isWatch) {
+        parts.push(`Watch-folder: create script in ${config.workspaceDir}/scripts/, credentials in .env, then register_automation.`);
+    }
+    // If no specific match, add a short general rule
+    if (parts.length === 0) {
+        parts.push('Match the user request to an Available skill and use that skill\'s tool. For fetch/news use perigon_fetch_articles. Only use create_skill when user explicitly asks to create a skill.');
+    }
+    return `## Workspace\n\n${parts.join('\n\n')}\n\n`;
+}
+function loadContextFromPaths(userMessage) {
     const paths = getSkillPaths(config);
     const bySkillName = new Map();
     const nonSkillChunks = [];
@@ -495,8 +543,9 @@ function loadContextFromPaths() {
                 const slug = fileName.replace(/\.md$/, '');
                 if (parsed.name && parsed.description && isSkillEnabled(slug)) {
                     const oauthScopes = extractOAuthScopesFromFrontmatter(parsed.frontmatterBlock);
+                    const toolName = extractToolNameFromBody(parsed.body);
                     bySkillName.set(parsed.name, {
-                        index: { name: parsed.name, description: parsed.description },
+                        index: { name: parsed.name, description: parsed.description, ...(toolName ? { toolName } : {}) },
                         body: parsed.body,
                         slug,
                         ...(oauthScopes?.length ? { oauthScopes } : {}),
@@ -513,6 +562,13 @@ function loadContextFromPaths() {
     }
     const skillsConfig = loadSkillsConfig();
     const skillIndex = Array.from(bySkillName.values()).map((v) => v.index);
+    const indexLines = skillIndex.map((s) => {
+        const toolPart = s.toolName ? ` (tool: **${s.toolName}**)` : '';
+        return `- **${s.name}**${toolPart}: ${s.description}`;
+    });
+    const indexSection = indexLines.length > 0
+        ? `### Available skills (use the tool name when the request matches)\n${indexLines.join('\n')}\n\n`
+        : '';
     const chunks = Array.from(bySkillName.values()).map((v) => {
         const entryScopes = skillsConfig.entries?.[v.slug]?.oauthScopes;
         const scopes = Array.isArray(entryScopes) && entryScopes.length > 0 ? entryScopes : v.oauthScopes;
@@ -520,25 +576,14 @@ function loadContextFromPaths() {
         return `### Skill: ${v.index.name}\n\n${scopeLine}${v.body}`;
     });
     chunks.push(...nonSkillChunks);
-    if (chunks.length === 0)
+    if (chunks.length === 0 && indexSection === '')
         return '';
-    const indexSection = skillIndex.length > 0
-        ? `### Available skills (use when the user's request matches)\n${skillIndex.map((s) => `- **${s.name}**: ${s.description}`).join('\n')}\n\n`
-        : '';
-    // Inject workspace path so the agent knows where to create skills and watch-folder automations.
-    const workspaceSection = `## Workspace\n\n` +
-        `- **Installing skills from the hub**: When the user asks for something that needs a capability you don't have (e.g. "read my Gmail", "post to Bluesky", "fetch news"), use **search_skills_registry** with a short query (e.g. "gmail", "bluesky", "news"). If you find a matching skill, suggest installing it by name and ask for confirmation (e.g. "I can add the Gmail skill so I can read your email. Should I install it? (yes/no)"). If the user agrees, use **install_skill_from_registry** with that skill's slug. If the tool returns \`needsConfig: true\`, tell the user to go to **Dashboard → Skills**, open that skill, complete the setup (env vars or OAuth), then **come back and ask again**—do not assume the skill is ready until they have configured it.\n\n` +
-        `- **MCP and skills (posting or other actions on a service)**: (1) **Prefer MCP tools**: when the user asks to post or act on a service (e.g. X/Twitter, Gmail), use a tool whose name starts with **mcp_** and matches the service (e.g. mcp_twitter_*, mcp_gmail_*) if available. (2) If no matching MCP tool exists, use the skill tool (e.g. x_post for X/Twitter) or follow the skill doc (run_command with credentials from skill config). Never use an integration tool for a different provider. (3) **If a tool fails**: the system will automatically try the other option (MCP or skill) when possible; you will receive the result from whichever succeeded. Do not ask the user to "try MCP" or "try the skill" unless both attempts already failed.\n\n` +
-        `- **Skills you create**: use **write_file** with path \`${config.skillsWorkspaceMyDir}/<slug>/README.md\` (e.g. \`${config.skillsWorkspaceMyDir}/my-skill/README.md\`). Also create \`${config.skillsWorkspaceMyDir}/<slug>/tools.yaml\` with \`tools: []\` and a short comment so the user can add required tools there. Do not use \`~\` or \`$HOME\`. Hub-installed skills live in \`${config.skillsWorkspaceDir}/<slug>/\`; keep created-by-you skills in \`${config.skillsWorkspaceMyDir}/\`.\n\n` +
-        `- **Scripts and watch-folder automations**: Workspace root is \`${config.workspaceDir}\`. When the user asks to watch a folder and do something (e.g. post new images to Bluesky or Facebook):\n` +
-        `  1. Create a script under \`${config.workspaceDir}/scripts/\` (e.g. \`scripts/watch_bluesky.sh\` or \`scripts/watch_facebook.sh\`) that accepts the **file path as first argument** (\`$1\`) and uses env vars for credentials.\n` +
-        `  2. Store credentials in \`${config.workspaceDir}/.env\` (e.g. \`BSKY_HANDLE=...\`, \`BSKY_APP_PASSWORD=...\` or \`PAGE_ACCESS_TOKEN=...\`). Use **write_file** to create or append lines to \`.env\`.\n` +
-        `  3. Call **register_automation** with \`id\`, \`script\` (e.g. \`scripts/watch_bluesky.sh\`), \`watch_folders\` (array of absolute paths), and optional \`filter: "image"\` for image-only. The agent will run your script when matching files are added.\n` +
-        `  4. **Always test the script yourself** before replying: run it with **run_command** and a real file path from the watch folder (e.g. an existing image). Example: \`bash -lc "set -a; source ${config.workspaceDir}/.env; set +a; ${config.workspaceDir}/scripts/your_script.sh /path/to/existing/image.jpg"\`. If it fails (e.g. missing argument, auth error), fix the script or .env and run again until it succeeds. Do not tell the user to test manually.\n\n`;
-    return `\n\n## Context\n\n${workspaceSection}${indexSection}${chunks.join('\n\n')}`;
+    const relevanceHint = buildRelevanceHint(userMessage);
+    const workspaceSection = buildWorkspaceSection(userMessage);
+    return `\n\n## Context\n\n${relevanceHint}${workspaceSection}${indexSection}${chunks.join('\n\n')}`;
 }
-async function resolveSystemPrompt(sessionId, basePrompt, messageCount) {
-    const context = loadContextFromPaths();
+async function resolveSystemPrompt(sessionId, basePrompt, messageCount, userMessage) {
+    const context = loadContextFromPaths(userMessage);
     let withContext = basePrompt + context;
     const sessionMemory = getMemoryForContext('session', sessionId, { limit: 20, maxChars: 2000 });
     const sharedKey = getSharedScopeKeyForSession(sessionId);
@@ -568,7 +613,7 @@ export async function runAgentTurn(options) {
         const historyLimit = config.agentMaxHistoryMessages > 0 ? config.agentMaxHistoryMessages + 50 : 80;
         const history = getAgentMessages(sessionId, historyLimit);
         const baseSystem = (optionPrompt ?? config.agentSystemPrompt ?? DEFAULT_SYSTEM) + AUTOMATION_JOBS_APPENDIX;
-        let systemPrompt = await resolveSystemPrompt(sessionId, baseSystem, history.length + 1);
+        let systemPrompt = await resolveSystemPrompt(sessionId, baseSystem, history.length + 1, userMessage);
         const estimatedTotalTokens = systemPrompt.length + estimateTokens(rowsToMessages(history));
         if (config.agentMemoryFlushBeforeCompaction &&
             config.agentMemoryFlushSilentTurn &&
@@ -717,7 +762,7 @@ export async function runAgentTurnStream(options, onEvent) {
         const historyLimit = config.agentMaxHistoryMessages > 0 ? config.agentMaxHistoryMessages + 50 : 80;
         const history = getAgentMessages(sessionId, historyLimit);
         const baseSystem = (optionPrompt ?? config.agentSystemPrompt ?? DEFAULT_SYSTEM) + AUTOMATION_JOBS_APPENDIX;
-        let systemPrompt = await resolveSystemPrompt(sessionId, baseSystem, history.length + 1);
+        let systemPrompt = await resolveSystemPrompt(sessionId, baseSystem, history.length + 1, userMessage);
         const estimatedTotalTokens = systemPrompt.length + estimateTokens(rowsToMessages(history));
         if (config.agentMemoryFlushBeforeCompaction &&
             config.agentMemoryFlushSilentTurn &&