@virtengine/openfleet 0.26.1 → 0.26.3

package/.env.example

@@ -1,4 +1,4 @@
-# ─── Codex Monitor — Environment Configuration ───────────────────────────────
+# ─── OpenFleet — Environment Configuration ───────────────────────────────
 # Copy this file to .env and fill in your values.
 # Or run: openfleet --setup
 # All variables are optional unless marked [REQUIRED].
@@ -109,7 +109,7 @@ TELEGRAM_MINIAPP_ENABLED=false
 # Keep Telegram command availability even when openfleet is down.
 # Sentinel can auto-restart monitor, detect crash loops, and run repair-agent.
 # Auto-start sentinel whenever openfleet starts (default: disabled)
-# CODEX_MONITOR_SENTINEL_AUTO_START=true
+# OPENFLEET_SENTINEL_AUTO_START=true
 # Auto-restart monitor when sentinel detects monitor down/crash (default: 1)
 # SENTINEL_AUTO_RESTART_MONITOR=true
 # Crash-loop threshold within rolling window (default: 3)
@@ -322,9 +322,9 @@ TELEGRAM_MINIAPP_ENABLED=false
 # Auto-assign task creator/login when creating issues (default: true)
 # GITHUB_AUTO_ASSIGN_CREATOR=true
 # Codex task scoping label policy (only matching labels are picked by openfleet)
-# CODEX_MONITOR_TASK_LABEL=openfleet
-# CODEX_MONITOR_TASK_LABELS=openfleet,codex-mointor
-# CODEX_MONITOR_ENFORCE_TASK_LABEL=true
+# OPENFLEET_TASK_LABEL=openfleet
+# OPENFLEET_TASK_LABELS=openfleet,codex-mointor
+# OPENFLEET_ENFORCE_TASK_LABEL=true
 # Optional issue fetch cap per sync/poll cycle (default: 1000)
 # GITHUB_ISSUES_LIST_LIMIT=1000
 
@@ -427,12 +427,12 @@ TELEGRAM_MINIAPP_ENABLED=false
 # PID file: .cache/openfleet.pid
 # Logs: logs/daemon.log
 # Daemon crash supervision (monitor child):
-# CODEX_MONITOR_DAEMON_RESTART_DELAY_MS=5000
-# CODEX_MONITOR_DAEMON_MAX_RESTARTS=0   # 0 = unlimited
+# OPENFLEET_DAEMON_RESTART_DELAY_MS=5000
+# OPENFLEET_DAEMON_MAX_RESTARTS=0   # 0 = unlimited
 # Consider any crash within this window as an instant startup failure (default: 15000)
-# CODEX_MONITOR_DAEMON_INSTANT_CRASH_WINDOW_MS=15000
+# OPENFLEET_DAEMON_INSTANT_CRASH_WINDOW_MS=15000
 # Stop auto-restarts after this many instant failures in a row (default: 3)
-# CODEX_MONITOR_DAEMON_MAX_INSTANT_RESTARTS=3
+# OPENFLEET_DAEMON_MAX_INSTANT_RESTARTS=3
 
 # ─── Vibe-Kanban ──────────────────────────────────────────────────────────────
 # Base URL for the Vibe-Kanban API (default: http://127.0.0.1:54089)
@@ -492,7 +492,7 @@ VK_RECOVERY_PORT=54089
 # Target branch for PR checks/merge (default: origin/main)
 # VK_TARGET_BRANCH=origin/main
 # Default upstream/base branch for openfleet tasks (overrides VK_TARGET_BRANCH)
-# CODEX_MONITOR_TASK_UPSTREAM=origin/ve/openfleet-generic
+# OPENFLEET_TASK_UPSTREAM=origin/ve/openfleet-generic
 
 # ─── Codex / AI Provider ─────────────────────────────────────────────────────
 # The Codex SDK uses OpenAI-compatible configuration that has been setup in ~/.codex/config.toml -
@@ -544,39 +544,39 @@ VK_RECOVERY_PORT=54089
 #
 # Hook profile for setup/non-interactive runs:
 #   strict | balanced | lightweight | none
-# CODEX_MONITOR_HOOK_PROFILE=strict
+# OPENFLEET_HOOK_PROFILE=strict
 #
 # Which agents should receive generated hook files (comma-separated):
 #   codex,claude,copilot
-# CODEX_MONITOR_HOOK_TARGETS=codex,claude,copilot
+# OPENFLEET_HOOK_TARGETS=codex,claude,copilot
 #
 # Set to false to skip hook scaffolding during setup.
-# CODEX_MONITOR_HOOKS_ENABLED=true
+# OPENFLEET_HOOKS_ENABLED=true
 # Set to true to overwrite existing generated hook files.
-# CODEX_MONITOR_HOOKS_OVERWRITE=false
+# OPENFLEET_HOOKS_OVERWRITE=false
 # Optional overrides for generated bridge command tokens.
 # Defaults are portable across workstations:
 #   node scripts/openfleet/agent-hook-bridge.mjs
-# CODEX_MONITOR_HOOK_NODE_BIN=node
-# CODEX_MONITOR_HOOK_BRIDGE_PATH=scripts/openfleet/agent-hook-bridge.mjs
+# OPENFLEET_HOOK_NODE_BIN=node
+# OPENFLEET_HOOK_BRIDGE_PATH=scripts/openfleet/agent-hook-bridge.mjs
 #
 # Optional per-event command overrides (separate multiple commands with ';;').
 # Use value 'none' to disable that event in generated .codex/hooks.json.
-# CODEX_MONITOR_HOOK_PREPUSH=go vet ./...;;go build ./...
-# CODEX_MONITOR_HOOK_PRECOMMIT=gofmt -l .
-# CODEX_MONITOR_HOOK_TASK_COMPLETE=echo \"task completed\"
-# CODEX_MONITOR_HOOK_SESSION_START=echo \"session start\"
-# CODEX_MONITOR_HOOK_SESSION_STOP=echo \"session stop\"
+# OPENFLEET_HOOK_PREPUSH=go vet ./...;;go build ./...
+# OPENFLEET_HOOK_PRECOMMIT=gofmt -l .
+# OPENFLEET_HOOK_TASK_COMPLETE=echo \"task completed\"
+# OPENFLEET_HOOK_SESSION_START=echo \"session start\"
+# OPENFLEET_HOOK_SESSION_STOP=echo \"session stop\"
 #
 # Built-in hook behavior inside openfleet runtime:
 #   force (default), auto, off
-# CODEX_MONITOR_HOOKS_BUILTINS_MODE=force
-# CODEX_MONITOR_HOOKS_DISABLE_PREPUSH=false
-# CODEX_MONITOR_HOOKS_DISABLE_TASK_COMPLETE=false
-# CODEX_MONITOR_HOOKS_DISABLE_HEALTH_CHECK=false
+# OPENFLEET_HOOKS_BUILTINS_MODE=force
+# OPENFLEET_HOOKS_DISABLE_PREPUSH=false
+# OPENFLEET_HOOKS_DISABLE_TASK_COMPLETE=false
+# OPENFLEET_HOOKS_DISABLE_HEALTH_CHECK=false
 
 # Force hooks to fire even for non-managed sessions (debug only):
-# CODEX_MONITOR_HOOKS_FORCE=false
+# OPENFLEET_HOOKS_FORCE=false
 
 # VE_MANAGED is auto-set by openfleet at startup. Agent hook bridge
 # scripts check for this and exit silently if not present, preventing
@@ -788,7 +788,7 @@ COPILOT_CLOUD_DISABLED=true
 
 # ─── Git Identity (optional) ─────────────────────────────────────────────────
 # Override git author for automated commits
-# VE_GIT_AUTHOR_NAME=Codex Monitor
+# VE_GIT_AUTHOR_NAME=OpenFleet
 # VE_GIT_AUTHOR_EMAIL=bot@yoursite.com
 
 # ─── Task Planner ─────────────────────────────────────────────────────────────
@@ -816,11 +816,11 @@ COPILOT_CLOUD_DISABLED=true
 #   .openfleet/agents/*.md
 # Files in that folder are loaded automatically and are intended for per-project customization.
 # You can also override any prompt path explicitly with env vars:
-# CODEX_MONITOR_PROMPT_PLANNER=.openfleet/agents/task-planner.md
-# CODEX_MONITOR_PROMPT_MONITOR_MONITOR=.openfleet/agents/monitor-monitor.md
-# CODEX_MONITOR_PROMPT_TASK_EXECUTOR=.openfleet/agents/task-executor.md
-# CODEX_MONITOR_PROMPT_REVIEWER=.openfleet/agents/reviewer.md
-# CODEX_MONITOR_PROMPT_SDK_CONFLICT_RESOLVER=.openfleet/agents/sdk-conflict-resolver.md
+# OPENFLEET_PROMPT_PLANNER=.openfleet/agents/task-planner.md
+# OPENFLEET_PROMPT_MONITOR_MONITOR=.openfleet/agents/monitor-monitor.md
+# OPENFLEET_PROMPT_TASK_EXECUTOR=.openfleet/agents/task-executor.md
+# OPENFLEET_PROMPT_REVIEWER=.openfleet/agents/reviewer.md
+# OPENFLEET_PROMPT_SDK_CONFLICT_RESOLVER=.openfleet/agents/sdk-conflict-resolver.md
 
 # ─── Dependabot / Bot PR Auto-Merge ───────────────────────────────────────────
 # Auto-merge Dependabot (and other bot) PRs after all CI checks pass.
@@ -864,7 +864,7 @@ COPILOT_CLOUD_DISABLED=true
 
 # ─── Advanced ─────────────────────────────────────────────────────────────────
 # Override openfleet config directory (where .env and config live)
-# CODEX_MONITOR_DIR=/path/to/scripts/openfleet
+# OPENFLEET_DIR=/path/to/scripts/openfleet
 # Max orchestrator restarts (0 = unlimited)
 # MAX_RESTARTS=0
 # Restart delay in milliseconds

package/agent-hook-bridge.mjs

@@ -166,7 +166,7 @@ async function run() {
   // openfleet sets VE_MANAGED=1 in all spawned agent environments.
   // If this env var is missing, we're running inside a standalone agent session
   // that just happens to have the hook files in its config — exit silently.
-  if (!process.env.VE_MANAGED && !process.env.CODEX_MONITOR_HOOKS_FORCE) {
+  if (!process.env.VE_MANAGED && !process.env.OPENFLEET_HOOKS_FORCE) {
     process.exit(0);
   }
 

package/agent-hooks.mjs

@@ -617,7 +617,7 @@ export async function executeBlockingHooks(event, context = {}) {
 export function registerBuiltinHooks(options = {}) {
   const modeRaw =
     options.mode ??
-    process.env.CODEX_MONITOR_HOOKS_BUILTINS_MODE ??
+    process.env.OPENFLEET_HOOKS_BUILTINS_MODE ??
     process.env.VE_HOOK_BUILTINS_MODE ??
     "force";
   const mode = String(modeRaw).trim().toLowerCase();
@@ -633,12 +633,12 @@ export function registerBuiltinHooks(options = {}) {
     (hook) => !hook.builtin,
   );
   const skipPrePush =
-    envFlag("CODEX_MONITOR_HOOKS_DISABLE_PREPUSH", false) ||
+    envFlag("OPENFLEET_HOOKS_DISABLE_PREPUSH", false) ||
     envFlag("VE_HOOK_DISABLE_PREPUSH", false) ||
     (mode === "auto" && hasCustomPrePush);
   const skipTaskComplete =
-    envFlag("CODEX_MONITOR_HOOKS_DISABLE_TASK_COMPLETE", false) ||
-    envFlag("CODEX_MONITOR_HOOKS_DISABLE_VALIDATION", false) ||
+    envFlag("OPENFLEET_HOOKS_DISABLE_TASK_COMPLETE", false) ||
+    envFlag("OPENFLEET_HOOKS_DISABLE_VALIDATION", false) ||
     envFlag("VE_HOOK_DISABLE_TASK_COMPLETE", false) ||
     (mode === "auto" && hasCustomTaskComplete);
 
@@ -680,7 +680,7 @@ export function registerBuiltinHooks(options = {}) {
   // ── SessionStart: worktree health check ──
   // Verifies the worktree directory exists, is a valid git repo,
   // and the expected branch is checked out. Retryable for transient git issues.
-  const skipHealthCheck = envFlag("CODEX_MONITOR_HOOKS_DISABLE_HEALTH_CHECK", false);
+  const skipHealthCheck = envFlag("OPENFLEET_HOOKS_DISABLE_HEALTH_CHECK", false);
   if (!skipHealthCheck) {
     const healthCmd = IS_WINDOWS
       ? 'powershell -NoProfile -Command "if (-not (Test-Path .git)) { if (-not (git rev-parse --git-dir 2>$null)) { Write-Error \'Not a git repository\'; exit 1 } }; git status --porcelain 2>&1 | Out-Null; if ($LASTEXITCODE -ne 0) { Write-Error \'git status failed\'; exit 1 }; Write-Host \'OK: worktree healthy\'"'

package/agent-prompts.mjs

@@ -119,7 +119,7 @@ export const AGENT_PROMPT_DEFINITIONS = Object.freeze(
   PROMPT_DEFS.map((item) =>
     Object.freeze({
       ...item,
-      envVar: `CODEX_MONITOR_PROMPT_${toEnvSuffix(item.key)}`,
+      envVar: `OPENFLEET_PROMPT_${toEnvSuffix(item.key)}`,
       defaultRelativePath: `${PROMPT_WORKSPACE_DIR}/${item.filename}`,
     }),
   ),
@@ -562,7 +562,7 @@ export function getAgentPromptDefinitions() {
 
 export function getDefaultPromptWorkspace(repoRoot) {
   const override = String(
-    process.env.CODEX_MONITOR_PROMPT_WORKSPACE || "",
+    process.env.OPENFLEET_PROMPT_WORKSPACE || "",
   ).trim();
   if (override) {
     return isAbsolute(override)
@@ -607,13 +607,13 @@ export function ensureAgentPromptWorkspace(repoRoot) {
     mkdirSync(workspaceDir, { recursive: true });
   } catch (err) {
     const fallbackRoot = resolve(
-      process.env.CODEX_MONITOR_HOME ||
+      process.env.OPENFLEET_HOME ||
         process.env.HOME ||
         process.env.USERPROFILE ||
         homedir(),
     );
     const fallbackDir = resolve(fallbackRoot, PROMPT_WORKSPACE_DIR);
-    process.env.CODEX_MONITOR_PROMPT_WORKSPACE = fallbackDir;
+    process.env.OPENFLEET_PROMPT_WORKSPACE = fallbackDir;
     workspaceDir = fallbackDir;
     mkdirSync(workspaceDir, { recursive: true });
     console.warn(

package/cli.mjs

@@ -27,6 +27,11 @@ import { fileURLToPath } from "node:url";
 import { fork, spawn } from "node:child_process";
 import os from "node:os";
 import { createDaemonCrashTracker } from "./daemon-restart-policy.mjs";
+import {
+  applyAllCompatibility,
+  detectLegacySetup,
+  migrateFromLegacy,
+} from "./compat.mjs";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const args = process.argv.slice(2);
@@ -140,9 +145,9 @@ function showHelp() {
     5. Built-in defaults
 
     Auto-update environment variables:
-      CODEX_MONITOR_SKIP_UPDATE_CHECK=1     Disable startup version check
-      CODEX_MONITOR_SKIP_AUTO_UPDATE=1      Disable background polling
-      CODEX_MONITOR_UPDATE_INTERVAL_MS=N    Override poll interval (default: 600000)
+      OPENFLEET_SKIP_UPDATE_CHECK=1     Disable startup version check
+      OPENFLEET_SKIP_AUTO_UPDATE=1      Disable background polling
+      OPENFLEET_UPDATE_INTERVAL_MS=N    Override poll interval (default: 600000)
 
     See .env.example for all environment variables.
 
@@ -199,23 +204,23 @@ const SENTINEL_SCRIPT_PATH = fileURLToPath(
   new URL("./telegram-sentinel.mjs", import.meta.url),
 );
 const IS_DAEMON_CHILD =
-  args.includes("--daemon-child") || process.env.CODEX_MONITOR_DAEMON === "1";
+  args.includes("--daemon-child") || process.env.OPENFLEET_DAEMON === "1";
 const DAEMON_RESTART_DELAY_MS = Math.max(
   1000,
-  Number(process.env.CODEX_MONITOR_DAEMON_RESTART_DELAY_MS || 5000) || 5000,
+  Number(process.env.OPENFLEET_DAEMON_RESTART_DELAY_MS || 5000) || 5000,
 );
 const DAEMON_MAX_RESTARTS = Math.max(
   0,
-  Number(process.env.CODEX_MONITOR_DAEMON_MAX_RESTARTS || 0) || 0,
+  Number(process.env.OPENFLEET_DAEMON_MAX_RESTARTS || 0) || 0,
 );
 const DAEMON_INSTANT_CRASH_WINDOW_MS = Math.max(
   1000,
-  Number(process.env.CODEX_MONITOR_DAEMON_INSTANT_CRASH_WINDOW_MS || 15000) ||
+  Number(process.env.OPENFLEET_DAEMON_INSTANT_CRASH_WINDOW_MS || 15000) ||
     15000,
 );
 const DAEMON_MAX_INSTANT_RESTARTS = Math.max(
   1,
-  Number(process.env.CODEX_MONITOR_DAEMON_MAX_INSTANT_RESTARTS || 3) || 3,
+  Number(process.env.OPENFLEET_DAEMON_MAX_INSTANT_RESTARTS || 3) || 3,
 );
 let daemonRestartCount = 0;
 const daemonCrashTracker = createDaemonCrashTracker({
@@ -283,7 +288,7 @@ async function ensureSentinelRunning(options = {}) {
     windowsHide: process.platform === "win32",
     env: {
       ...process.env,
-      CODEX_MONITOR_SENTINEL_COMPANION: "1",
+      OPENFLEET_SENTINEL_COMPANION: "1",
     },
     cwd: process.cwd(),
   });
@@ -380,8 +385,9 @@ function startDaemon() {
       detached: true,
       stdio: "ignore",
       windowsHide: process.platform === "win32",
-      env: { ...process.env, CODEX_MONITOR_DAEMON: "1" },
-      cwd: process.cwd(),
+      env: { ...process.env, OPENFLEET_DAEMON: "1" },
+      // Use home dir so spawn never inherits a deleted CWD (e.g. old git worktree)
+      cwd: os.homedir(),
     },
   );
 
@@ -456,6 +462,9 @@ function daemonStatus() {
 }
 
 async function main() {
+  // Apply legacy CODEX_MONITOR_* → OPENFLEET_* env aliases before any config ops
+  applyAllCompatibility();
+
   // Handle --help
   if (args.includes("--help") || args.includes("-h")) {
     showHelp();
@@ -510,7 +519,7 @@ async function main() {
   // Write PID file if running as daemon child
   if (
     args.includes("--daemon-child") ||
-    process.env.CODEX_MONITOR_DAEMON === "1"
+    process.env.OPENFLEET_DAEMON === "1"
   ) {
     writePidFile(process.pid);
     // Redirect console to log file on daemon child
@@ -556,15 +565,15 @@ async function main() {
 
   const sentinelRequested =
     args.includes("--sentinel") ||
-    parseBoolEnv(process.env.CODEX_MONITOR_SENTINEL_AUTO_START, false);
+    parseBoolEnv(process.env.OPENFLEET_SENTINEL_AUTO_START, false);
   if (sentinelRequested) {
     const sentinel = await ensureSentinelRunning({ quiet: false });
     if (!sentinel.ok) {
       const mode = args.includes("--sentinel")
         ? "requested by --sentinel"
-        : "requested by CODEX_MONITOR_SENTINEL_AUTO_START";
+        : "requested by OPENFLEET_SENTINEL_AUTO_START";
       const strictSentinel = parseBoolEnv(
-        process.env.CODEX_MONITOR_SENTINEL_STRICT,
+        process.env.OPENFLEET_SENTINEL_STRICT,
         false,
       );
       const prefix = strictSentinel ? "✖" : "⚠";
@@ -649,7 +658,7 @@ async function main() {
 
   // Propagate --no-auto-update to env for monitor.mjs to pick up
   if (args.includes("--no-auto-update")) {
-    process.env.CODEX_MONITOR_SKIP_AUTO_UPDATE = "1";
+    process.env.OPENFLEET_SKIP_AUTO_UPDATE = "1";
   }
 
   // Mark all child processes as openfleet managed.
@@ -661,7 +670,7 @@ async function main() {
   if (args.includes("--setup") || args.includes("setup")) {
     const configDirArg = getArgValue("--config-dir");
     if (configDirArg) {
-      process.env.CODEX_MONITOR_DIR = configDirArg;
+      process.env.OPENFLEET_DIR = configDirArg;
     }
     const { runSetup } = await import("./setup.mjs");
     await runSetup();
@@ -682,19 +691,36 @@ async function main() {
     console.log("\n  🚀 First run detected — launching setup wizard...\n");
     const configDirArg = getArgValue("--config-dir");
     if (configDirArg) {
-      process.env.CODEX_MONITOR_DIR = configDirArg;
+      process.env.OPENFLEET_DIR = configDirArg;
     }
     const { runSetup } = await import("./setup.mjs");
     await runSetup();
     console.log("\n  Setup complete! Starting openfleet...\n");
   }
 
+  // Legacy migration: if ~/codex-monitor exists with config, auto-migrate to ~/openfleet
+  const legacyInfo = detectLegacySetup();
+  if (legacyInfo.hasLegacy && !legacyInfo.alreadyMigrated) {
+    console.log(
+      `\n  📦 Detected legacy codex-monitor config at ${legacyInfo.legacyDir}`,
+    );
+    console.log(`     Auto-migrating to ${legacyInfo.newDir}...\n`);
+    const result = migrateFromLegacy(legacyInfo.legacyDir, legacyInfo.newDir);
+    if (result.migrated.length > 0) {
+      console.log(`  ✅  Migrated: ${result.migrated.join(", ")}`);
+      console.log(`\n  Config is now at ${legacyInfo.newDir}\n`);
+    }
+    for (const err of result.errors) {
+      console.log(`  ⚠️   Migration warning: ${err}`);
+    }
+  }
+
   // ── Handle --echo-logs: tail the active monitor's log instead of spawning a new instance ──
   if (args.includes("--echo-logs")) {
     // Search for the monitor PID file in common cache locations
     const candidatePidFiles = [
-      process.env.CODEX_MONITOR_DIR
-        ? resolve(process.env.CODEX_MONITOR_DIR, ".cache", "openfleet.pid")
+      process.env.OPENFLEET_DIR
+        ? resolve(process.env.OPENFLEET_DIR, ".cache", "openfleet.pid")
         : null,
       resolve(__dirname, "..", ".cache", "openfleet.pid"),
       resolve(process.cwd(), ".cache", "openfleet.pid"),
@@ -731,24 +757,40 @@ async function main() {
               `\n  Tailing logs for active openfleet (PID ${monitorPid}):\n  ${logFile}\n`,
             );
             await new Promise((res) => {
+              // Spawn tail in its own process group (detached) so that
+              // Ctrl+C in this terminal only kills the tailing session,
+              // never the running daemon.
               const tail = spawn("tail", ["-f", "-n", "200", logFile], {
-                stdio: "inherit",
+                stdio: ["ignore", "inherit", "inherit"],
+                detached: true,
               });
               tail.on("exit", res);
               process.on("SIGINT", () => {
-                tail.kill();
+                try { process.kill(-tail.pid, "SIGTERM"); } catch { tail.kill(); }
                 res();
               });
             });
             process.exit(0);
+          } else {
+            console.error(
+              `\n  No log file found for active openfleet (PID ${monitorPid}).\n  Expected: ${logFile}\n`,
+            );
+            process.exit(1);
           }
         }
-      } catch {
-        // best-effort — fall through to normal start
+      } catch (e) {
+        console.error(`\n  --echo-logs: failed to read PID file — ${e.message}\n`);
+        process.exit(1);
       }
+    } else {
+      console.error(
+        "\n  --echo-logs: no active openfleet found (PID file missing).\n  Start openfleet first with: openfleet --daemon\n",
+      );
+      process.exit(1);
     }
 
-    // No active monitor found — start normally; echoLogs will be picked up by config.mjs
+    // Should not reach here — all paths above exit
+    process.exit(0);
   }
 
   // Fork monitor as a child process — enables self-restart on source changes.