@c4t4/heyamigo 0.9.21 → 0.9.24

package/dist/queue/worker.js

@@ -9,7 +9,7 @@ import { estimate as estimateJob } from '../estimates/index.js';
 import { extractFlags, filterFlagsByRole } from '../memory/digest-flag.js';
 import { isValidSlug } from '../memory/journals.js';
 import { enqueueAsyncTask, enqueueBrowserTask } from './async-tasks.js';
-import { enqueueCron } from './crons.js';
+import { addCronUsage, enqueueCron } from './crons.js';
 import { enqueueMemoryWrite } from './memory-writes.js';
 import { enqueueOutbound } from './outbound.js';
 import { formatLocalTime, resolveTimeExpression } from './time-expr.js';
@@ -104,6 +104,12 @@ async function callClaude(job) {
     if (job.senderNumber) {
         addDailyTokens(job.senderNumber, turnInput + turnOutput);
     }
+    // Cron-attribution: if this Job was synthesized by a [CRON: ... PROMPT]
+    // firing, charge the cron row's running total. Lets /crons show
+    // cumulative token cost per recurring schedule.
+    if (job.cronId) {
+        addCronUsage(job.cronId, turnInput, turnOutput);
+    }
     const rawFlags = extractFlags(reply);
     const { clean, digest, journals, journalCreates, asyncTasks, asyncBrowserTasks, sendTexts, crons, reminds, } = filterFlagsByRole(rawFlags, job.allowedTags);
     // Detect any stripped tags so we can log + nudge the role config
@@ -245,25 +251,62 @@ async function callClaude(job) {
     const cronBase = `chat-cron-${job.jid}-${Date.now()}`;
     for (let i = 0; i < crons.length; i++) {
         const c = crons[i];
+        // Variant maps to enqueueInto + payload shape. SAY stays as the
+        // current behavior (text delivery, no AI). PROMPT/ASYNC/BROWSER
+        // route through inbound/async/browser respectively at fire time.
+        let enqueueInto;
+        let payload;
+        switch (c.variant) {
+            case 'SAY':
+                enqueueInto = 'outbound';
+                payload = { address: chatAddress, kind: 'text', text: c.body };
+                break;
+            case 'PROMPT':
+                enqueueInto = 'inbound';
+                payload = {
+                    address: chatAddress,
+                    prompt: c.body,
+                    senderNumber: job.senderNumber,
+                    personId: null, // resolved at preamble time
+                };
+                break;
+            case 'ASYNC':
+                enqueueInto = 'async';
+                payload = {
+                    address: chatAddress,
+                    description: c.body,
+                    senderNumber: job.senderNumber,
+                };
+                break;
+            case 'BROWSER':
+                enqueueInto = 'browser';
+                payload = {
+                    address: chatAddress,
+                    description: c.body,
+                    senderNumber: job.senderNumber,
+                };
+                break;
+        }
         try {
             enqueueCron({
                 name: `${cronBase}-${i}`,
-                enqueueInto: 'outbound',
-                payload: { address: chatAddress, kind: 'text', text: c.body },
+                enqueueInto,
+                payload,
                 recurrence: c.recurrence,
-                // Sender's local timezone so @daily HH:MM fires in their
-                // wall-clock time, not the server's.
+                // Sender's local timezone so cron expressions like "0 9 * * *"
+                // fire at their wall-clock 9am, not the server's.
                 timezone: senderTz,
             });
             logger.info({
                 jid: job.jid,
                 recurrence: c.recurrence,
+                variant: c.variant,
                 tz: senderTz,
                 chars: c.body.length,
             }, 'CRON tag scheduled');
         }
         catch (err) {
-            logger.warn({ err, jid: job.jid, recurrence: c.recurrence }, 'CRON tag failed (bad recurrence?)');
+            logger.warn({ err, jid: job.jid, recurrence: c.recurrence, variant: c.variant }, 'CRON tag failed (bad recurrence?)');
         }
     }
     // REMIND resolution uses the same senderTz computed above.

package/migrations/0009_crons_usage_tracking.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `crons` ADD `fire_count` integer DEFAULT 0 NOT NULL;--> statement-breakpoint
+ALTER TABLE `crons` ADD `total_input_tokens` integer DEFAULT 0 NOT NULL;--> statement-breakpoint
+ALTER TABLE `crons` ADD `total_output_tokens` integer DEFAULT 0 NOT NULL;