jules-orchestrator-kit 0.22.5 → 0.22.6

package/bin/agentctl.mjs

@@ -7,13 +7,14 @@ import { loadConfig, resolveRoot, detectStack } from "../src/config.mjs";
 import { gate, dispatch, run, isTaskFile } from "../src/engine.mjs";
 import { acquireLock, releaseLock, lockStatus, checkDailyBudget, getQueueDir, ensureDir } from "../src/state.mjs";
 import { worktreePrune } from "../src/git.mjs";
+import { reapOrphanedIntents } from "../src/journal.mjs";
 
 const args = process.argv.slice(2);
 const command = args[0];
 
 function printHelp() {
   console.log(`
-🚀 agentctl v0.22.5 — Universal Agent Orchestrator & Safety Gatekeeper
+🚀 agentctl v0.22.6 — Universal Agent Orchestrator & Safety Gatekeeper
 
 Usage: agentctl <command> [options]
 
@@ -43,11 +44,12 @@ async function main() {
   }
 
   if (command === "version" || command === "--version" || command === "-v") {
-    console.log("agentctl v0.22.5");
+    console.log("agentctl v0.22.6");
     process.exit(0);
   }
 
   const root = resolveRoot();
+  reapOrphanedIntents(root);
   const config = loadConfig(root);
 
   switch (command) {
@@ -223,7 +225,7 @@ async function main() {
     }
 
     case "doctor": {
-      console.log(`\n🔍 agentctl System Diagnostics (v0.22.5)`);
+      console.log(`\n🔍 agentctl System Diagnostics (v0.22.6)`);
       console.log(`--------------------------------------------------`);
       console.log(`  Project Root     : ${root}`);
       console.log(`  Config File      : ${config._file || "None (Using defaults)"}`);

package/index.mjs

@@ -50,6 +50,7 @@ export { checkAssetIntegrity } from "./src/asset_integrity.mjs";
 export { classifyRiskTier, RISK_TIERS } from "./src/risk.mjs";
 export { checkRulesBudget } from "./src/rules_budget.mjs";
 export { DagExecutor, DagCycleError } from "./src/dag-engine.mjs";
+export { journalIntent, journalDone, reapOrphanedIntents } from "./src/journal.mjs";
 
 // Legacy SDK shims for backward compatibility
 export { resolveProjectCommands, resolveWorkspaceExecutionBoundary } from "./scripts/command-resolver.mjs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jules-orchestrator-kit",
-  "version": "0.22.5",
+  "version": "0.22.6",
   "description": "Orchestration kit for running Google Jules autonomous agents.",
   "repository": {
     "type": "git",

package/src/git.mjs

@@ -1,5 +1,6 @@
 import { execFileSync } from "node:child_process";
 import { sep } from "node:path";
+import { journalIntent, journalDone } from "./journal.mjs";
 
 export class GateError extends Error {
   constructor(message, opts = {}) {
@@ -174,8 +175,28 @@ export function showFromOrigin(root = process.cwd(), base = "main", filePath = "
   }
 }
 
+export function createBranch(root = process.cwd(), branch = "") {
+  const opId = journalIntent(root, { type: "create_branch", branch, targetPath: "" });
+  try {
+    const res = git(["branch", branch], { cwd: root });
+    journalDone(root, opId);
+    return res;
+  } catch (err) {
+    journalDone(root, opId);
+    throw err;
+  }
+}
+
 export function worktreeAdd(root = process.cwd(), branch = "agent/task", targetDir = "") {
-  return git(["worktree", "add", targetDir, "-b", branch], { cwd: root });
+  const opId = journalIntent(root, { type: "worktree_add", targetPath: targetDir, branch });
+  try {
+    const res = git(["worktree", "add", targetDir, "-b", branch], { cwd: root });
+    journalDone(root, opId);
+    return res;
+  } catch (err) {
+    journalDone(root, opId);
+    throw err;
+  }
 }
 
 export function worktreeRemove(root = process.cwd(), targetDir = "") {

package/src/journal.mjs

@@ -0,0 +1,176 @@
+import { openSync, writeSync, fsyncSync, closeSync, existsSync, readFileSync, unlinkSync, readdirSync } from "node:fs";
+import { join } from "node:path";
+import { randomUUID } from "node:crypto";
+import { getStateDir, getProcessStartTime, isPidAlive, getLockDir } from "./state.mjs";
+import { worktreeRemove, worktreePrune } from "./git.mjs";
+
+/**
+ * Appends an intent record to .agent/state/journal.jsonl before a mutating operation.
+ * @param {string} root - Project root directory
+ * @param {Object|string} op - Operation payload or name
+ * @returns {string} opId - Unique operation identifier
+ */
+export function journalIntent(root, op) {
+  const stateDir = getStateDir(root);
+  const journalPath = join(stateDir, "journal.jsonl");
+
+  const opObj = typeof op === "string" ? { type: op } : op || {};
+  const opId = opObj.opId || `op-${randomUUID()}`;
+  const pid = process.pid;
+  const processStartTime = getProcessStartTime(pid);
+
+  const record = {
+    opId,
+    event: "intent",
+    type: opObj.type || opObj.operation || "unknown",
+    targetPath: opObj.targetPath || opObj.targetDir || opObj.path || "",
+    pid,
+    processStartTime,
+    timestamp: new Date().toISOString(),
+    ...opObj,
+  };
+
+  const fd = openSync(journalPath, "a");
+  try {
+    writeSync(fd, JSON.stringify(record) + "\n", "utf-8");
+    fsyncSync(fd);
+  } finally {
+    closeSync(fd);
+  }
+
+  return opId;
+}
+
+/**
+ * Appends a journal_done record to .agent/state/journal.jsonl upon operation completion.
+ * @param {string} root - Project root directory
+ * @param {string} opId - Operation identifier returned by journalIntent
+ * @returns {string|null} opId
+ */
+export function journalDone(root, opId) {
+  if (!opId) return null;
+  const stateDir = getStateDir(root);
+  const journalPath = join(stateDir, "journal.jsonl");
+
+  const record = {
+    opId,
+    event: "journal_done",
+    timestamp: new Date().toISOString(),
+  };
+
+  const fd = openSync(journalPath, "a");
+  try {
+    writeSync(fd, JSON.stringify(record) + "\n", "utf-8");
+    fsyncSync(fd);
+  } finally {
+    closeSync(fd);
+  }
+
+  return opId;
+}
+
+/**
+ * Scans .agent/state/journal.jsonl for uncompleted intents belonging to dead PIDs,
+ * prunes orphaned worktrees, removes stale lock files, and marks intents reaped.
+ * Idempotent: Subsequent calls result in 0 additional reaps.
+ * @param {string} root - Project root directory
+ * @returns {{ reapedCount: number, reaped: Array<Object> }}
+ */
+export function reapOrphanedIntents(root) {
+  const stateDir = getStateDir(root);
+  const journalPath = join(stateDir, "journal.jsonl");
+
+  if (!existsSync(journalPath)) {
+    return { reapedCount: 0, reaped: [] };
+  }
+
+  let lines = [];
+  try {
+    const raw = readFileSync(journalPath, "utf-8");
+    lines = raw.split("\n").filter(Boolean);
+  } catch (_) {
+    return { reapedCount: 0, reaped: [] };
+  }
+
+  const intents = new Map();
+  const finishedOpIds = new Set();
+
+  for (const line of lines) {
+    try {
+      const entry = JSON.parse(line);
+      if (!entry || !entry.opId) continue;
+      if (entry.event === "intent") {
+        intents.set(entry.opId, entry);
+      } else if (entry.event === "journal_done" || entry.event === "journal_reaped") {
+        finishedOpIds.add(entry.opId);
+      }
+    } catch (_) {
+      // Ignore corrupted or partial lines
+    }
+  }
+
+  const reaped = [];
+
+  for (const [opId, intent] of intents.entries()) {
+    if (finishedOpIds.has(opId)) {
+      continue;
+    }
+
+    const alive = isPidAlive(intent.pid, intent.processStartTime);
+    if (!alive) {
+      // Owner PID is dead or recycled -> reap orphaned intent
+      if (intent.targetPath) {
+        try {
+          worktreeRemove(root, intent.targetPath);
+        } catch (_) {}
+        try {
+          worktreePrune(root);
+        } catch (_) {}
+      }
+
+      // Clean up stale lock files associated with this PID or targetPath
+      try {
+        const lockDir = getLockDir(root);
+        if (existsSync(lockDir)) {
+          const lockFiles = readdirSync(lockDir);
+          for (const file of lockFiles) {
+            if (file.endsWith(".json")) {
+              const lockPath = join(lockDir, file);
+              try {
+                const lockContent = JSON.parse(readFileSync(lockPath, "utf-8"));
+                if (
+                  lockContent.pid === intent.pid ||
+                  (intent.targetPath && Array.isArray(lockContent.files) && lockContent.files.includes(intent.targetPath))
+                ) {
+                  unlinkSync(lockPath);
+                }
+              } catch (_) {}
+            }
+          }
+        }
+      } catch (_) {}
+
+      // Record journal_reaped to guarantee idempotency
+      const reapedRecord = {
+        opId,
+        event: "journal_reaped",
+        reapedAt: new Date().toISOString(),
+        pid: intent.pid,
+      };
+
+      try {
+        const fd = openSync(journalPath, "a");
+        try {
+          writeSync(fd, JSON.stringify(reapedRecord) + "\n", "utf-8");
+          fsyncSync(fd);
+        } finally {
+          closeSync(fd);
+        }
+      } catch (_) {}
+
+      reaped.push(intent);
+    }
+  }
+
+  return { reapedCount: reaped.length, reaped };
+}

package/src/mcp.mjs

@@ -3,10 +3,11 @@ import { loadConfig, resolveRoot, detectStack } from "./config.mjs";
 import { gate, dispatch } from "./engine.mjs";
 import { classifyRiskTier } from "./risk.mjs";
 import { checkDailyBudget, lockStatus } from "./state.mjs";
+import { reapOrphanedIntents } from "./journal.mjs";
 
 export const MCP_SERVER_INFO = {
   name: "jules-orchestrator-kit",
-  version: "0.20.0",
+  version: "0.22.6",
 };
 
 export const MAX_MCP_FRAME_SIZE = 4 * 1024 * 1024; // 4 MB memory safety ceiling
@@ -352,6 +353,8 @@ export function writeMcpFrame(targetOutput, data) {
 }
 
 export function startMcpServer(input = process.stdin, output = process.stdout, opts = {}) {
+  const root = opts.root || resolveRoot();
+  reapOrphanedIntents(root);
   isolateMcpStdout(process.stdout, opts);
   if (output && output !== process.stdout) {
     isolateMcpStdout(output, opts);