@mclean-capital/neura 3.5.1 → 3.5.3

package/core/server.bundled.mjs

@@ -73035,7 +73035,9 @@ function loadNeuraSkills(options = {}) {
   const repoLocal = resolve(cwd, ".neura", "skills");
   const global2 = options.globalSkillsDir ?? resolve(homedir2(), ".neura", "skills");
   const explicit = options.explicitPaths ?? [];
-  const skillPaths = [repoLocal, global2, ...explicit];
+  const skillPaths = [repoLocal, global2];
+  if (options.bundledSkillsDir) skillPaths.push(options.bundledSkillsDir);
+  skillPaths.push(...explicit);
   log12.info("loading Neura skills (repo-local \u2192 global \u2192 explicit, pi defaults excluded)", {
     cwd,
     skillPaths
@@ -73142,6 +73144,7 @@ var SkillWatcher = class {
   registry;
   cwd;
   globalSkillsDir;
+  bundledSkillsDir;
   explicitPaths;
   debounceMs;
   onReload;
@@ -73153,6 +73156,7 @@ var SkillWatcher = class {
     this.registry = options.registry;
     this.cwd = options.cwd ?? process.cwd();
     this.globalSkillsDir = options.globalSkillsDir ?? resolve2(homedir3(), ".neura", "skills");
+    this.bundledSkillsDir = options.bundledSkillsDir;
     this.explicitPaths = options.explicitPaths ?? [];
     this.debounceMs = options.debounceMs ?? 200;
     this.onReload = options.onReload;
@@ -73165,7 +73169,9 @@ var SkillWatcher = class {
     if (this.watcher) return;
     this.reload();
     const repoLocal = resolve2(this.cwd, ".neura", "skills");
-    const paths = [repoLocal, this.globalSkillsDir, ...this.explicitPaths];
+    const paths = [repoLocal, this.globalSkillsDir];
+    if (this.bundledSkillsDir) paths.push(this.bundledSkillsDir);
+    paths.push(...this.explicitPaths);
     log13.info("starting skill watcher", { paths, debounceMs: this.debounceMs });
     this.watcher = chokidar.watch(paths, {
       ignoreInitial: true,
@@ -73241,6 +73247,7 @@ var SkillWatcher = class {
       const result = loadNeuraSkills({
         cwd: this.cwd,
         globalSkillsDir: this.globalSkillsDir,
+        bundledSkillsDir: this.bundledSkillsDir,
         explicitPaths: this.explicitPaths
       });
       this.registry.replaceAll(result.skills);
@@ -76084,6 +76091,18 @@ var MEMORY_NAMES = /* @__PURE__ */ new Set([
   "memory_stats"
 ]);
 
+// src/tools/voice-redact.ts
+function redactTaskForVoice(task) {
+  const { workerId, ...rest } = task;
+  return { ...rest, hasActiveWorker: workerId !== null };
+}
+function redactCommentForVoice(comment) {
+  if (comment.author.startsWith("worker:")) {
+    return { ...comment, author: "worker" };
+  }
+  return comment;
+}
+
 // src/tools/task-tools.ts
 var log15 = new Logger("tool:task");
 var ALL_STATUSES = [
@@ -76114,7 +76133,7 @@ var taskToolDefs = [
   {
     type: "function",
     name: "create_task",
-    description: "Create a new task. Use when the user asks you to do something actionable (file operations, research, code changes, reminders). Orchestrator uses create_task to brief a worker BEFORE dispatching \u2014 pair with dispatch_worker when the user confirms. Include `goal` whenever possible (what success looks like).",
+    description: "Create a new task. Use when the user asks you to do something actionable (file operations, research, code changes, reminders). Orchestrator uses create_task to brief a worker BEFORE dispatching \u2014 pair with dispatch_worker when the user confirms. Include `goal` whenever possible (what success looks like). The returned `id` is an internal handle for subsequent tool calls \u2014 NEVER speak it aloud; refer to the task by its title when talking to the user.",
     parameters: {
       type: "object",
       properties: {
@@ -76264,7 +76283,7 @@ var taskToolDefs = [
   {
     type: "function",
     name: "dispatch_worker",
-    description: "Dispatch a worker to execute an existing task. The task must already have a clear goal + context \u2014 call create_task first, confirm with the user for non-trivial / destructive work, then dispatch. Returns a worker_id immediately; progress flows via comments on the task.",
+    description: "Dispatch a worker to execute an existing task. The task must already have a clear goal + context \u2014 call create_task first, confirm with the user for non-trivial / destructive work, then dispatch. Progress flows via comments on the task (see get_task). When confirming to the user, speak naturally about the task ('Dispatching the worker now') \u2014 do NOT quote task IDs or worker IDs aloud, the TTS reads UUIDs letter by letter and it's jarring.",
     parameters: {
       type: "object",
       properties: {
@@ -76325,7 +76344,12 @@ async function handleTaskTool(name, args, ctx) {
               goal: t2.goal,
               source: t2.source,
               version: t2.version,
-              workerId: t2.workerId
+              // workerId deliberately omitted from the voice-facing
+              // listing — TTS reads UUIDs letter-by-letter. Callers
+              // that need the worker id should go through
+              // list_active_workers (which runs internal tool calls
+              // that don't narrate).
+              hasActiveWorker: t2.workerId !== null
             }))
           }
         };
@@ -76335,7 +76359,27 @@ async function handleTaskTool(name, args, ctx) {
         const query = args.query;
         const task = await ctx.taskTools.getTask(query);
         if (!task) return { result: { found: false } };
-        return { result: { found: true, task } };
+        let comments = [];
+        try {
+          const recentDesc = await ctx.taskTools.listTaskComments(task.id, {
+            limit: 50,
+            order: "desc",
+            excludeTypes: ["heartbeat"]
+          });
+          comments = recentDesc.reverse();
+        } catch (err) {
+          log15.error("failed to load task comments for get_task", {
+            taskId: task.id,
+            err: String(err)
+          });
+        }
+        return {
+          result: {
+            found: true,
+            task: redactTaskForVoice(task),
+            comments: comments.map(redactCommentForVoice)
+          }
+        };
       }
       case "update_task": {
         if (!ctx.taskTools) return { error: "Task system not available" };
@@ -76396,7 +76440,6 @@ async function handleTaskTool(name, args, ctx) {
         return {
           result: {
             dispatched: true,
-            workerId: outcome.workerId,
             message: `Worker dispatched. You'll hear progress updates as it works.`
           }
         };
@@ -77385,6 +77428,44 @@ async function insertComment(db, opts) {
   );
   return mapTaskComment(result.rows[0]);
 }
+async function listComments(db, opts) {
+  const limit2 = opts.limit ?? 500;
+  const order = opts.order ?? "asc";
+  const filters = ["task_id = $1"];
+  const values = [opts.taskId];
+  let idx = 2;
+  if (opts.type !== void 0) {
+    const types3 = Array.isArray(opts.type) ? opts.type : [opts.type];
+    const placeholders = types3.map(() => `$${idx++}`).join(", ");
+    filters.push(`type IN (${placeholders})`);
+    values.push(...types3);
+  } else if (opts.excludeTypes && opts.excludeTypes.length > 0) {
+    const placeholders = opts.excludeTypes.map(() => `$${idx++}`).join(", ");
+    filters.push(`type NOT IN (${placeholders})`);
+    values.push(...opts.excludeTypes);
+  }
+  if (opts.since) {
+    filters.push(`created_at > $${idx++}`);
+    values.push(opts.since);
+  }
+  const result = await db.query(
+    `SELECT * FROM task_comments
+     WHERE ${filters.join(" AND ")}
+     ORDER BY created_at ${order === "desc" ? "DESC" : "ASC"}
+     LIMIT $${idx}`,
+    [...values, limit2]
+  );
+  return result.rows.map((r2) => mapTaskComment(r2));
+}
+async function pruneHeartbeats(db, taskId, author) {
+  const result = await db.query(
+    `DELETE FROM task_comments
+     WHERE task_id = $1 AND type = 'heartbeat' AND author = $2
+     RETURNING id`,
+    [taskId, author]
+  );
+  return result.rows.length;
+}
 async function countOpenRequests(db, taskId) {
   const result = await db.query(
     `SELECT COUNT(*)::TEXT as count FROM task_comments
@@ -78423,6 +78504,12 @@ async function applyTaskUpdate(args) {
       urgency: payload.comment.urgency ?? null,
       metadata: payload.comment.metadata ?? null
     });
+    if (payload.comment.type !== "heartbeat" && actor.startsWith("worker:")) {
+      try {
+        await pruneHeartbeats(db, task.id, actor);
+      } catch {
+      }
+    }
   }
   const refreshed = await getWorkItem(db, task.id);
   if (!refreshed) {
@@ -78932,22 +79019,40 @@ async function handleWorkerControlTool(name, args, ctx) {
       case "pause_worker": {
         const workerId = args.worker_id;
         const result = await ctx.workerControl.pauseWorker(workerId);
-        return { result };
+        return {
+          result: { paused: result.paused, ...result.reason ? { reason: result.reason } : {} }
+        };
       }
       case "resume_worker": {
         const workerId = args.worker_id;
         const message = args.message;
         const result = await ctx.workerControl.resumeWorker(workerId, message);
-        return { result };
+        return {
+          result: { resumed: result.resumed, ...result.reason ? { reason: result.reason } : {} }
+        };
       }
       case "cancel_worker": {
         const workerId = args.worker_id;
         const result = await ctx.workerControl.cancelWorker(workerId);
-        return { result };
+        return {
+          result: {
+            cancelled: result.cancelled,
+            ...result.reason ? { reason: result.reason } : {}
+          }
+        };
       }
       case "list_active_workers": {
         const workers = await ctx.workerControl.listActive();
-        return { result: { count: workers.length, workers } };
+        return {
+          result: {
+            count: workers.length,
+            workers: workers.map((w) => ({
+              status: w.status,
+              skillName: w.skillName,
+              startedAt: w.startedAt
+            }))
+          }
+        };
       }
       default:
         return null;
@@ -79256,14 +79361,20 @@ async function initServices() {
       const agentDir = join4(config2.neuraHome, "agent");
       const sessionDir = defaultSessionDir(agentDir);
       const globalSkillsDir = join4(homedir5(), ".neura", "skills");
+      const bundleDir = dirname2(fileURLToPath(import.meta.url));
+      const bundledSkillsDir = join4(bundleDir, "..", "skills");
       skillRegistry = new SkillRegistry();
       skillWatcher = new SkillWatcher({
         registry: skillRegistry,
         cwd: process.cwd(),
-        globalSkillsDir
+        globalSkillsDir,
+        bundledSkillsDir
       });
       await skillWatcher.start();
-      log29.info("skill registry loaded", { count: skillRegistry.size });
+      log29.info("skill registry loaded", {
+        count: skillRegistry.size,
+        bundledSkillsDir
+      });
       voiceFanoutBridge = new VoiceFanoutBridge({
         interjector: { interject: () => Promise.resolve() }
       });
@@ -79314,6 +79425,14 @@ async function initServices() {
             return candidates.slice(0, limit2);
           },
           getTask: (idOrTitle) => store.getWorkItem(idOrTitle),
+          listTaskComments: async (taskId, options) => {
+            return listComments(rawDb, {
+              taskId,
+              limit: options?.limit,
+              order: options?.order,
+              excludeTypes: options?.excludeTypes
+            });
+          },
           updateTask: async (idOrTitle, payload) => {
             const current = await store.getWorkItem(idOrTitle);
             if (!current) return null;
@@ -99023,6 +99142,16 @@ function attachWebSocket(httpServer2, services2) {
         return candidates.slice(0, limit2);
       },
       getTask: (idOrTitle) => resolveTask(store, idOrTitle),
+      listTaskComments: async (taskId, options) => {
+        const db = store.getRawDb?.();
+        if (!db) throw new Error("store does not expose a raw PGlite handle");
+        return listComments(db, {
+          taskId,
+          limit: options?.limit,
+          order: options?.order,
+          excludeTypes: options?.excludeTypes
+        });
+      },
       updateTask: async (idOrTitle, payload) => {
         const current = await resolveTask(store, idOrTitle);
         if (!current) return null;