akemon 0.2.23 → 0.2.25

package/dist/task-module.js

@@ -13,12 +13,14 @@ import { SIG, sig } from "./types.js";
 import { selfDir, biosPath, localNow, loadBioState, saveBioState, syncEnergyFromTokens, loadAgentConfig, getDueUserTasks, loadTaskRuns, saveTaskRuns, loadDirectives, buildDirectivesPrompt, appendTaskHistory, notifyOwner, updateHungerDecay, updateNaturalDecay, resetTokenCountIfNewDay, computeSociability, appendBioEvent, bioStatePromptModifier, feedHunger, SHOP_ITEMS, logBioStatus, logBioDecision, } from "./self.js";
 import { appendMessage } from "./context.js";
 import { buildRoleContext } from "./role-module.js";
+import { sortByQuadrant, dedupeWorkItems, computeRetryDelay } from "./task-helpers.js";
+import { updateMetrics } from "./metrics.js";
+import { downgradeForRetry } from "./engine-routing.js";
 // ---------------------------------------------------------------------------
 // Config
 // ---------------------------------------------------------------------------
 const INITIAL_DELAY = 60_000; // 1 min after startup
 const POLL_INTERVAL = 30_000; // 30s between polls
-const RETRY_INTERVALS = [0, 30_000, 5 * 60_000, 30 * 60_000, 2 * 3600_000];
 const USER_TASK_MAX_RETRIES = 2;
 const USER_TASK_RETRY_DELAY = 2 * 60_000;
 export class TaskModule {
@@ -82,6 +84,7 @@ export class TaskModule {
             module: "task",
             pendingRetries: this.orderRetry.size + this.userTaskRetry.size,
             gaveUp: this.gaveUp.size,
+            executing: this.executing.size,
         };
     }
     /** Push-notify an urgent order (bypasses poll interval) */
@@ -140,9 +143,12 @@ export class TaskModule {
                     if (retry && Date.now() < retry.nextAt)
                         continue;
                     const urgent = this.urgentOrderIds.has(order.id);
+                    const isRetry = this.orderRetry.has(order.id);
+                    const rawOrigin = order.human_origin ? "user_manual" : "platform";
                     queue.push({
                         type: "order", id: order.id,
                         quadrant: urgent ? 1 : 2, // orders are important (paid work)
+                        origin: isRetry ? downgradeForRetry(rawOrigin) : rawOrigin,
                         data: order,
                     });
                 }
@@ -162,6 +168,7 @@ export class TaskModule {
                     queue.push({
                         type: "user_task", id: taskKey,
                         quadrant: rt ? 1 : 2, // retries are urgent+important
+                        origin: rt ? downgradeForRetry("user_manual") : "user_manual",
                         data: task,
                     });
                 }
@@ -176,6 +183,7 @@ export class TaskModule {
                     queue.push({
                         type: "relay_task", id: task.id,
                         quadrant: 3, // urgent but less important
+                        origin: "platform",
                         data: task,
                     });
                 }
@@ -197,16 +205,9 @@ export class TaskModule {
         }
         logBioStatus(bio, "work-active");
         // --- Eisenhower sort: Q1 > Q2 > Q3 > Q4 ---
-        queue.sort((a, b) => a.quadrant - b.quadrant);
+        const sorted = sortByQuadrant(queue);
         // Dedup
-        const seen = new Set();
-        const deduped = queue.filter(item => {
-            const key = `${item.type}:${item.id}`;
-            if (seen.has(key))
-                return false;
-            seen.add(key);
-            return true;
-        });
+        const deduped = dedupeWorkItems(sorted);
         // Bio filtering (fear & boredom)
         const filtered = await this.applyBioFilter(deduped, bio);
         if (!filtered.length)
@@ -215,18 +216,20 @@ export class TaskModule {
         // Execute sequentially
         for (const item of filtered) {
             try {
-                if (item.type === "order")
+                if (item.type === "order") {
                     this.executing.add(item.id);
+                    updateMetrics({ task_executing: this.executing.size });
+                }
                 switch (item.type) {
                     case "order":
-                        await this.executeOrder(item.data);
+                        await this.executeOrder(item.data, item.origin);
                         this.urgentOrderIds.delete(item.id);
                         break;
                     case "user_task":
-                        await this.executeUserTask(item.data);
+                        await this.executeUserTask(item.data, item.origin);
                         break;
                     case "relay_task":
-                        await this.executeRelayTask(item.data);
+                        await this.executeRelayTask(item.data, item.origin);
                         break;
                 }
             }
@@ -234,8 +237,13 @@ export class TaskModule {
                 console.log(`[task] Error processing ${item.type}:${item.id}: ${err.message}`);
             }
             finally {
-                if (item.type === "order")
+                if (item.type === "order") {
                     this.executing.delete(item.id);
+                    updateMetrics({
+                        task_executing: this.executing.size,
+                        task_pending_retries: this.orderRetry.size + this.userTaskRetry.size,
+                    });
+                }
             }
         }
         bus.emit(SIG.CYCLE_END, sig(SIG.CYCLE_END, { ts: Date.now() }));
@@ -291,7 +299,7 @@ export class TaskModule {
     // ---------------------------------------------------------------------------
     // Execute order
     // ---------------------------------------------------------------------------
-    async executeOrder(order) {
+    async executeOrder(order, origin = "platform") {
         if (!this.ctx)
             return;
         const { workdir, agentName, bus } = this.ctx;
@@ -340,13 +348,14 @@ RESPOND IN THE SAME LANGUAGE AS THE REQUEST.`;
             const orderConvId = `pub_${buyerPubId}${productScope}`;
             const orderUserMsg = order.buyer_task || "(no message)";
             await appendMessage(workdir, agentName, orderConvId, "User", orderUserMsg);
-            console.log(`[task] Fulfilling order ${order.id}...`);
+            console.log(`[task] Fulfilling order ${order.id}... (origin=${origin})`);
             const result = await this.ctx.requestCompute({
                 context,
                 question,
                 priority: "high",
                 tools: ["Bash(curl *)"],
                 relay: this.relayHttp ? { http: this.relayHttp, agentName } : undefined,
+                origin,
             });
             if (!result.success)
                 throw new Error(result.error || "compute failed");
@@ -400,10 +409,11 @@ RESPOND IN THE SAME LANGUAGE AS THE REQUEST.`;
             // Retry logic
             const current = this.orderRetry.get(order.id) || { count: 0, nextAt: 0 };
             current.count++;
-            if (current.count < RETRY_INTERVALS.length) {
-                current.nextAt = Date.now() + RETRY_INTERVALS[current.count];
+            const delay = computeRetryDelay(current.count);
+            if (delay !== null) {
+                current.nextAt = Date.now() + delay;
                 this.orderRetry.set(order.id, current);
-                console.log(`[task] Retry ${order.id} in ${RETRY_INTERVALS[current.count] / 1000}s`);
+                console.log(`[task] Retry ${order.id} in ${delay / 1000}s`);
                 try {
                     await relay.extendOrder(order.id);
                 }
@@ -423,7 +433,7 @@ RESPOND IN THE SAME LANGUAGE AS THE REQUEST.`;
     // ---------------------------------------------------------------------------
     // Execute user task
     // ---------------------------------------------------------------------------
-    async executeUserTask(task) {
+    async executeUserTask(task, origin = "user_manual") {
         if (!this.ctx)
             return;
         const { workdir, agentName, bus } = this.ctx;
@@ -458,6 +468,7 @@ Your personal directory: ${sd}/`;
                 priority: "high",
                 tools: ["Bash(curl *)"],
                 relay: this.relayHttp ? { http: this.relayHttp, agentName } : undefined,
+                origin,
             });
             if (!result.success)
                 throw new Error(result.error || "compute failed");
@@ -483,8 +494,9 @@ Your personal directory: ${sd}/`;
             relay?.reportLog("user_task", taskKey, "failed", err.message, []);
             const retry = this.userTaskRetry.get(taskKey) || { count: 0, nextAt: 0 };
             retry.count++;
-            if (retry.count <= USER_TASK_MAX_RETRIES) {
-                retry.nextAt = Date.now() + USER_TASK_RETRY_DELAY;
+            const retryDelay = computeRetryDelay(retry.count);
+            if (retryDelay !== null) {
+                retry.nextAt = Date.now() + retryDelay;
                 this.userTaskRetry.set(taskKey, retry);
                 await appendTaskHistory(workdir, agentName, {
                     ts: localNow(), id: taskKey, type: "user_task", status: "retry",
@@ -508,7 +520,7 @@ Your personal directory: ${sd}/`;
     // ---------------------------------------------------------------------------
     // Execute relay platform task
     // ---------------------------------------------------------------------------
-    async executeRelayTask(task) {
+    async executeRelayTask(task, origin = "platform") {
         if (!this.ctx)
             return;
         const { workdir, agentName, bus } = this.ctx;
@@ -557,9 +569,10 @@ Complete this task. Use the environment info above and tools (curl, etc.) as nee
             const result = await this.ctx.requestCompute({
                 context,
                 question,
-                priority: "normal",
+                priority: "low",
                 tools: ["Bash(curl *)"],
                 relay: this.relayHttp ? { http: this.relayHttp, agentName } : undefined,
+                origin,
             });
             if (!result.success)
                 throw new Error(result.error || "compute failed");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akemon",
-  "version": "0.2.23",
+  "version": "0.2.25",
   "description": "Agent work marketplace — train your agent, let it work for others",
   "type": "module",
   "license": "MIT",
@@ -28,7 +28,8 @@
     "build": "tsc && cp src/live.html dist/live.html",
     "dev": "tsc --watch",
     "start": "node dist/cli.js",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "npm run build",
+    "test": "tsc -p tsconfig.test.json && node --test test-dist/*.test.js"
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.0.0",