@neotx/core 0.1.0-alpha.4 → 0.1.0-alpha.6

package/dist/index.js

@@ -1207,12 +1207,16 @@ function isProcessAlive(pid) {
   try {
     process.kill(pid, 0);
     return true;
-  } catch {
+  } catch (error) {
+    if (error instanceof Error && "code" in error && error.code === "EPERM") {
+      return true;
+    }
     return false;
   }
 }
 
 // src/orchestrator/run-store.ts
+var ORPHAN_GRACE_PERIOD_MS = 3e4;
 var RunStore = class {
   runsDir;
   createdDirs = /* @__PURE__ */ new Set();
@@ -1281,7 +1285,10 @@ var RunStore = class {
     const content = await readFile4(filePath, "utf-8");
     const run = JSON.parse(content);
     if (run.status !== "running") return null;
+    if (run.pid && run.pid === process.pid) return null;
     if (run.pid && isProcessAlive(run.pid)) return null;
+    const ageMs = Date.now() - new Date(run.createdAt).getTime();
+    if (ageMs < ORPHAN_GRACE_PERIOD_MS) return null;
     run.status = "failed";
     run.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     await writeFile2(filePath, JSON.stringify(run, null, 2), "utf-8");
@@ -2599,6 +2606,7 @@ var Orchestrator = class extends NeoEventEmitter {
       workflow: input.workflow,
       repo: input.repo,
       prompt: input.prompt,
+      pid: process.pid,
       status: "running",
       steps: {},
       createdAt: activeSession.startedAt,
@@ -2786,6 +2794,7 @@ var Orchestrator = class extends NeoEventEmitter {
       workflow: input.workflow,
       repo: input.repo,
       prompt: input.prompt,
+      pid: process.pid,
       branch: taskResult.branch,
       status: taskResult.status === "success" ? "completed" : "failed",
       steps: taskResult.steps,
@@ -3605,13 +3614,16 @@ neo memory list --type fact
 neo log <type> "<message>"   # visible in TUI only
 \`\`\``;
 var HEARTBEAT_RULES = `### Heartbeat lifecycle
-1. Process incoming events (messages, run completions)
-2. Follow up on pending work (CI checks, deferred dispatches) with \`neo runs\` or \`gh pr checks\`
-3. Make decisions and dispatch agents
-4. Update memory and log decisions
-5. Yield \u2014 each heartbeat should take seconds, not minutes
+1. **Check work queue FIRST** \u2014 if you have pending tasks, work on the next one before looking for new work
+2. Process incoming events (messages, run completions)
+3. Follow up on pending work (CI checks, deferred dispatches) with \`neo runs\` or \`gh pr checks\`
+4. Make decisions and dispatch agents
+5. Update task status (\`neo memory update <id> --outcome in_progress|done|blocked\`) and log decisions
+6. Yield \u2014 each heartbeat should take seconds, not minutes
 
-After dispatching with \`neo run\`, note the runId in your focus and yield. Do NOT poll in a loop.
+**CRITICAL**: Your work queue IS your plan. Do not re-plan work that is already in the queue. When an planner agent produces tasks, create them with \`neo memory write --type task\`, then dispatch them one by one in subsequent heartbeats. Mark each task \`in_progress\` when dispatching, \`done\` when the run completes, \`blocked\` if stuck.
+
+After dispatching with \`neo run\`, mark the task \`in_progress\`, note the runId in your focus, and yield. Do NOT poll in a loop.
 Completion events arrive at future heartbeats \u2014 react then.
 If you deferred work (e.g. "CI pending"), you MUST check it at the next heartbeat.`;
 var REPORTING_RULES = `### Reporting
@@ -3782,56 +3794,71 @@ var DONE_OUTCOMES = /* @__PURE__ */ new Set(["done", "abandoned"]);
 var MAX_TASKS = 15;
 function buildWorkQueueSection(memories) {
   const tasks = memories.filter((m) => m.type === "task" && !DONE_OUTCOMES.has(m.outcome ?? ""));
-  if (tasks.length === 0) return "";
-  const doneCount = memories.filter(
-    (m) => m.type === "task" && DONE_OUTCOMES.has(m.outcome ?? "")
-  ).length;
-  const groups = [];
+  const doneCount = countDoneTasks(memories);
+  if (tasks.length === 0) {
+    if (doneCount > 0) {
+      return `Work queue (0 remaining, ${doneCount} done) \u2014 all tasks complete. Pick up new work or wait for events.`;
+    }
+    return "";
+  }
+  const groups = groupTasksByInitiative(tasks);
+  const lines = renderTaskGroups(groups);
+  if (tasks.length > MAX_TASKS) {
+    lines.push(`  ... and ${tasks.length - MAX_TASKS} more pending`);
+  }
+  const header = `Work queue (${tasks.length} remaining, ${doneCount} done) \u2014 dispatch the next eligible task:`;
+  return `${header}
+${lines.join("\n")}`;
+}
+function countDoneTasks(memories) {
+  return memories.filter((m) => m.type === "task" && DONE_OUTCOMES.has(m.outcome ?? "")).length;
+}
+function groupTasksByInitiative(tasks) {
   const initiativeMap = /* @__PURE__ */ new Map();
   const noInitiative = [];
   for (const task of tasks) {
-    const initiativeTag = task.tags.find((t) => t.startsWith("initiative:"));
-    if (initiativeTag) {
-      const initiative = initiativeTag.slice("initiative:".length);
-      const group = initiativeMap.get(initiative) ?? [];
+    const tag = task.tags.find((t) => t.startsWith("initiative:"));
+    if (tag) {
+      const key = tag.slice("initiative:".length);
+      const group = initiativeMap.get(key) ?? [];
       group.push(task);
-      initiativeMap.set(initiative, group);
+      initiativeMap.set(key, group);
     } else {
       noInitiative.push(task);
     }
   }
+  const groups = [];
   for (const [initiative, taskList] of initiativeMap) {
     groups.push({ initiative, tasks: taskList });
   }
   if (noInitiative.length > 0) {
     groups.push({ initiative: null, tasks: noInitiative });
   }
+  return groups;
+}
+function renderTaskGroups(groups) {
   const lines = [];
   let rendered = 0;
-  const remaining = tasks.length;
   for (const group of groups) {
     if (rendered >= MAX_TASKS) break;
-    if (group.initiative && initiativeMap.size > 0) {
+    if (group.initiative && groups.length > 1) {
       lines.push(`  [${group.initiative}]`);
     }
     for (const task of group.tasks) {
       if (rendered >= MAX_TASKS) break;
-      const marker = formatTaskMarker(task.outcome);
-      const severity = task.severity ? `[${task.severity}] ` : "";
-      const scopeBasename = task.scope !== "global" ? ` (${getBasename(task.scope)})` : "";
-      const runRef = task.runId ? ` [run ${task.runId.slice(0, 8)}]` : "";
-      const categoryRef = task.category ? ` \u2192 ${task.category}` : "";
-      lines.push(`  ${marker} ${severity}${task.content}${scopeBasename}${runRef}${categoryRef}`);
+      lines.push(`  ${formatTaskLine(task)}`);
       rendered++;
     }
   }
-  if (remaining > MAX_TASKS) {
-    const overflow = remaining - MAX_TASKS;
-    lines.push(`  ... and ${overflow} more pending`);
-  }
-  const header = `Work queue (${remaining} remaining, ${doneCount} done):`;
-  return `${header}
-${lines.join("\n")}`;
+  return lines;
+}
+function formatTaskLine(task) {
+  const marker = formatTaskMarker(task.outcome);
+  const severity = task.severity ? `[${task.severity}] ` : "";
+  const scope = task.scope !== "global" ? ` (${getBasename(task.scope)})` : "";
+  const run = task.runId ? ` [run ${task.runId.slice(0, 8)}]` : "";
+  const cat = task.category ? ` \u2192 ${task.category}` : "";
+  return `${marker} ${severity}${task.content}${scope}${run}${cat}`;
 }
 function formatTaskMarker(outcome) {
   switch (outcome) {
@@ -3911,16 +3938,16 @@ Heartbeat #${opts.heartbeatCount}
 ${COMMANDS}
 </commands>`);
   const contextParts = [];
-  contextParts.push(...buildContextSections(opts));
+  const workQueue = buildWorkQueueSection(opts.memories);
+  if (workQueue) {
+    contextParts.push(workQueue);
+  }
   if (opts.activeRuns.length > 0) {
     contextParts.push(`Active runs:
 ${opts.activeRuns.map((r) => `- ${r}`).join("\n")}`);
   }
+  contextParts.push(...buildContextSections(opts));
   contextParts.push(buildMemorySection(opts.memories, opts.supervisorDir));
-  const workQueue = buildWorkQueueSection(opts.memories);
-  if (workQueue) {
-    contextParts.push(workQueue);
-  }
   const recentActions = buildRecentActionsSection(opts.recentActions);
   if (recentActions) {
     contextParts.push(recentActions);
@@ -3939,7 +3966,7 @@ ${contextParts.join("\n\n")}
 ${opts.customInstructions}`);
   }
   instructionParts.push(
-    "This is a standard heartbeat. Focus on processing events and dispatching work."
+    "This is a standard heartbeat. Focus on processing events and dispatching work. If you have tasks in your work queue, dispatch the next eligible one."
   );
   sections.push(`<instructions>
 ${instructionParts.join("\n\n")}
@@ -3956,16 +3983,16 @@ Heartbeat #${opts.heartbeatCount} (CONSOLIDATION)
 ${COMMANDS}
 </commands>`);
   const contextParts = [];
-  contextParts.push(...buildContextSections(opts));
+  const workQueueConsolidation = buildWorkQueueSection(opts.memories);
+  if (workQueueConsolidation) {
+    contextParts.push(workQueueConsolidation);
+  }
   if (opts.activeRuns.length > 0) {
     contextParts.push(`Active runs:
 ${opts.activeRuns.map((r) => `- ${r}`).join("\n")}`);
   }
+  contextParts.push(...buildContextSections(opts));
   contextParts.push(buildMemorySection(opts.memories, opts.supervisorDir));
-  const workQueueConsolidation = buildWorkQueueSection(opts.memories);
-  if (workQueueConsolidation) {
-    contextParts.push(workQueueConsolidation);
-  }
   const recentActions = buildRecentActionsSection(opts.recentActions);
   if (recentActions) {
     contextParts.push(recentActions);