patchwarden 0.4.0 → 0.6.1

package/src/watcherStatus.ts

@@ -1,4 +1,4 @@
-import { existsSync, readFileSync } from "node:fs";
+import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { getConfig, getTasksDir, type PatchWardenConfig } from "./config.js";
 
@@ -24,6 +24,7 @@ export interface WatcherStatusSnapshot {
   instance_id: string | null;
   launcher_pid: number | null;
   reason: string | null;
+  activity: string | null;
 }
 
 export function getWatcherHeartbeatPath(config: PatchWardenConfig = getConfig()): string {
@@ -37,6 +38,22 @@ export function readWatcherStatus(
   const staleAfterSeconds = config.watcherStaleSeconds;
   const heartbeatPath = getWatcherHeartbeatPath(config);
   if (!existsSync(heartbeatPath)) {
+    // Even if watcher heartbeat is missing, check if a task is actively running
+    const taskFallback = checkRunningTaskHeartbeat(config, nowMs, staleAfterSeconds);
+    if (taskFallback) {
+      return {
+        status: "healthy",
+        available: true,
+        stale_after_seconds: staleAfterSeconds,
+        last_heartbeat_at: taskFallback.heartbeat_at,
+        heartbeat_age_seconds: taskFallback.age_seconds,
+        heartbeat_pid: null,
+        instance_id: null,
+        launcher_pid: null,
+        reason: null,
+        activity: taskFallback.activity,
+      };
+    }
     return {
       status: "missing",
       available: false,
@@ -47,6 +64,7 @@ export function readWatcherStatus(
       instance_id: null,
       launcher_pid: null,
       reason: "Watcher heartbeat has not been observed. Start or restart the PatchWarden watcher.",
+      activity: null,
     };
   }
 
@@ -58,16 +76,47 @@ export function readWatcherStatus(
     const ageMs = Math.max(0, nowMs - heartbeatMs);
     const ageSeconds = Math.round(ageMs / 1000);
     const healthy = ageMs < staleAfterSeconds * 1000;
+    if (healthy) {
+      return {
+        status: "healthy",
+        available: true,
+        stale_after_seconds: staleAfterSeconds,
+        last_heartbeat_at: String(data.last_heartbeat_at),
+        heartbeat_age_seconds: ageSeconds,
+        heartbeat_pid: Number.isInteger(Number(data.pid)) ? Number(data.pid) : null,
+        instance_id: typeof data.instance_id === "string" ? data.instance_id : null,
+        launcher_pid: Number.isInteger(Number(data.launcher_pid)) ? Number(data.launcher_pid) : null,
+        reason: null,
+        activity: null,
+      };
+    }
+    // Watcher heartbeat is stale — check if a task is actively running
+    const taskFallback = checkRunningTaskHeartbeat(config, nowMs, staleAfterSeconds);
+    if (taskFallback) {
+      return {
+        status: "healthy",
+        available: true,
+        stale_after_seconds: staleAfterSeconds,
+        last_heartbeat_at: taskFallback.heartbeat_at,
+        heartbeat_age_seconds: taskFallback.age_seconds,
+        heartbeat_pid: Number.isInteger(Number(data.pid)) ? Number(data.pid) : null,
+        instance_id: typeof data.instance_id === "string" ? data.instance_id : null,
+        launcher_pid: Number.isInteger(Number(data.launcher_pid)) ? Number(data.launcher_pid) : null,
+        reason: null,
+        activity: taskFallback.activity,
+      };
+    }
     return {
-      status: healthy ? "healthy" : "stale",
-      available: healthy,
+      status: "stale",
+      available: false,
       stale_after_seconds: staleAfterSeconds,
       last_heartbeat_at: String(data.last_heartbeat_at),
       heartbeat_age_seconds: ageSeconds,
       heartbeat_pid: Number.isInteger(Number(data.pid)) ? Number(data.pid) : null,
       instance_id: typeof data.instance_id === "string" ? data.instance_id : null,
       launcher_pid: Number.isInteger(Number(data.launcher_pid)) ? Number(data.launcher_pid) : null,
-      reason: healthy ? null : "Watcher heartbeat is stale. Restart the PatchWarden watcher.",
+      reason: "Watcher heartbeat is stale. Restart the PatchWarden watcher.",
+      activity: null,
     };
   } catch {
     return {
@@ -80,10 +129,58 @@ export function readWatcherStatus(
       instance_id: null,
       launcher_pid: null,
       reason: "Watcher heartbeat file is unreadable.",
+      activity: null,
     };
   }
 }
 
+interface TaskHeartbeatFallback {
+  heartbeat_at: string;
+  age_seconds: number;
+  activity: string;
+}
+
+function checkRunningTaskHeartbeat(
+  config: PatchWardenConfig,
+  nowMs: number,
+  staleAfterSeconds: number
+): TaskHeartbeatFallback | null {
+  const tasksDir = getTasksDir(config);
+  if (!existsSync(tasksDir)) return null;
+  let entries;
+  try {
+    entries = readdirSync(tasksDir, { withFileTypes: true });
+  } catch {
+    return null;
+  }
+  for (const entry of entries) {
+    if (!entry.isDirectory()) continue;
+    const taskDir = join(tasksDir, entry.name);
+    const statusFile = join(taskDir, "status.json");
+    const runtimeFile = join(taskDir, "runtime.json");
+    if (!existsSync(statusFile) || !existsSync(runtimeFile)) continue;
+    try {
+      const status = JSON.parse(readFileSync(statusFile, "utf-8"));
+      if (status.status !== "running") continue;
+      const runtime = JSON.parse(readFileSync(runtimeFile, "utf-8"));
+      const heartbeatAt = String(runtime.last_heartbeat_at || "");
+      const heartbeatMs = Date.parse(heartbeatAt);
+      if (!Number.isFinite(heartbeatMs)) continue;
+      const ageMs = Math.max(0, nowMs - heartbeatMs);
+      if (ageMs < staleAfterSeconds * 1000) {
+        return {
+          heartbeat_at: heartbeatAt,
+          age_seconds: Math.round(ageMs / 1000),
+          activity: `watcher busy executing task ${entry.name}`,
+        };
+      }
+    } catch {
+      continue;
+    }
+  }
+  return null;
+}
+
 export function derivePendingReason(
   task: { status?: string; phase?: string },
   watcher: WatcherStatusSnapshot

package/tsconfig.json

@@ -1,17 +1,18 @@
-{
-  "compilerOptions": {
-    "target": "ES2022",
-    "module": "ES2022",
-    "moduleResolution": "node",
-    "outDir": "dist",
-    "rootDir": "src",
-    "strict": true,
-    "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true,
-    "resolveJsonModule": true,
-    "declaration": true,
-    "skipLibCheck": true
-  },
-  "include": ["src/**/*.ts"],
-  "exclude": ["node_modules", "dist"]
-}
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "types": ["node"],
+    "outDir": "dist",
+    "rootDir": "src",
+    "strict": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "resolveJsonModule": true,
+    "declaration": true,
+    "skipLibCheck": true
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["node_modules", "dist"]
+}

package/Check-PatchWarden-Health.cmd

@@ -1,6 +0,0 @@
-@echo off
-setlocal
-cd /d "%~dp0"
-powershell.exe -NoProfile -ExecutionPolicy Bypass -File "%~dp0scripts\get-patchwarden-health.ps1"
-echo.
-pause

package/Reset-PatchWarden-Tunnel-Key.cmd

@@ -1,6 +0,0 @@
-@echo off
-setlocal
-cd /d "%~dp0"
-powershell.exe -NoProfile -ExecutionPolicy Bypass -File "%~dp0scripts\start-patchwarden-tunnel.ps1" -ForgetSavedApiKey
-echo.
-pause

package/Restart-PatchWarden.cmd

@@ -1,19 +0,0 @@
-@echo off
-setlocal
-cd /d "%~dp0"
-echo.
-echo ========================================
-echo  PatchWarden One-Click Restart
-echo ========================================
-echo.
-echo This will:
-echo   1. Stop only processes owned by the current PatchWarden launcher
-echo   2. Rebuild the project
-echo   3. Start a fresh tunnel launcher window
-echo.
-echo Close this window to cancel, or
-pause
-powershell.exe -NoProfile -ExecutionPolicy Bypass -File "%~dp0scripts\restart-patchwarden.ps1"
-echo.
-echo Restart script finished.
-pause

package/Start-PatchWarden-Tunnel.cmd

@@ -1,7 +0,0 @@
-@echo off
-setlocal
-cd /d "%~dp0"
-powershell.exe -NoProfile -ExecutionPolicy Bypass -File "%~dp0scripts\start-patchwarden-tunnel.ps1"
-echo.
-echo PatchWarden tunnel launcher exited.
-pause

package/docs/release-v0.3.0.md

@@ -1,43 +0,0 @@
-# Safe-Bifrost v0.3.0
-
-Safe-Bifrost v0.3.0 makes ChatGPT-managed local agent work easier to monitor,
-verify, and accept without weakening the workspace and command boundaries.
-
-## Highlights
-
-- Adds `wait_for_task` so ChatGPT can stay in the tool loop until a task is
-  terminal, plus `get_task_summary` for one-call acceptance evidence.
-- Requires an explicit existing repository directory and supports both
-  workspace-relative and absolute `repo_path` values.
-- Adds independent multi-command `verify_commands` while keeping
-  `test_command` compatibility.
-- Generates structured `result.json`, `verify.json`, readable `verify.log`,
-  and a complete `diff.patch` for every terminal task.
-- Adds task-scoped file statistics, clear large/no-diff responses, and avoids
-  including unchanged pre-existing workspace files in task diff evidence.
-- Detects changes outside `resolved_repo_path`, marks the task
-  `failed_scope_violation`, invalidates verification acceptance, and creates a
-  review-only `rollback_scope_violation_plan.md`.
-- Allows ordinary long build/test/release plans while blocking explicit
-  credential theft, destructive disk deletion, and malicious persistence.
-- Redacts secret-like values in ordinary task artifacts instead of rejecting
-  the entire read.
-- Expands `doctor`, stdio/HTTP MCP smoke tests, lifecycle coverage, packaging
-  checks, and ChatGPT workflow documentation.
-
-## Compatibility note
-
-`create_task` now requires `repo_path`. Existing clients that omitted it must
-pass an existing directory under `workspaceRoot`. `test_command` remains
-supported and is converted into a one-entry verification list.
-
-## Verification
-
-- `npm test`: 63 security tests, 14 lifecycle tests, and doctor smoke passed
-- `npm run test:mcp`: passed
-- `npm run test:http-mcp`: 11 passed
-- `npm run doctor`: 47 OK, 0 WARN, 0 FAIL
-- `npm run pack:clean`: passed
-- `npm run verify:package`: passed
-
-Tracked in [issue #1](https://github.com/jiezeng2004-design/safe-bifrost/issues/1).

package/docs/release-v0.4.0.md

@@ -1,74 +0,0 @@
-# PatchWarden v0.4.0
-
-PatchWarden v0.4.0 hardens the ChatGPT-to-local-agent task loop without
-weakening workspace, command, or sensitive-file boundaries.
-
-This release also completes the project rename from Safe-Bifrost to
-PatchWarden. The npm package is now `patchwarden`; the old package is retained
-only to point existing users to the new name.
-
-## Highlights
-
-- Adds supervised Windows tunnel recovery with local readiness probes,
-  structured failure categories, capped retry backoff, and redacted runtime
-  state under `%LOCALAPPDATA%\patchwarden\runtime`.
-- Adds `Check-PatchWarden-Health.cmd` for diagnostics when the MCP tunnel itself
-  is unreachable.
-- Expands `health_check` with workspace, tasks directory, watcher, agent, tunnel,
-  and last-error evidence; local HTTP `/healthz` and `/readyz` are also available.
-- Lets `create_task` use exactly one of a saved `plan_id`, persisted
-  `inline_plan`, or a guarded task template.
-- Adds `inspect_only`, `feature_small`, `fix_tests`, `release_check`, and safe
-  review-only `rollback_scope_violation` templates.
-- Enforces no-change templates with `failed_policy_violation`.
-- Adds deterministic failure guidance through `failure_reason`,
-  `failed_command`, `suggested_next_action`, and `safe_followup_prompt`.
-- Adds standalone `file-stats.json` while preserving complete `diff.patch`,
-  `changed-files.json`, and the v0.3.0 acceptance contract.
-- Adds deterministic `full` and `chatgpt_core` tool profiles. Tunnel stdio uses
-  an exact 16-tool core manifest while ordinary local launches remain on the
-  22-tool full profile.
-- Adds schema-inclusive tool manifest hashing, `schema_epoch`, server version,
-  and a real MCP stdio preflight before tunnel startup.
-- Adds structured `create_task.next_tool_call`, preferred
-  `wait_for_task(timeout_seconds)`, legacy `wait_seconds` compatibility, and a
-  complete terminal summary in the wait response.
-- Adds recursive redaction for structured result/verification summaries and
-  concise verification counts/headlines such as `166 passed`.
-- Adds explicit `get_diff.patch_mode` values for textual, no-change, and
-  hash-only evidence, including a reason when a textual patch is unavailable.
-- Enhances the local health report with process source/version evidence and
-  mixed-version warnings without automatically ending any process.
-- Adds first-class watcher stale/missing evidence, structured pending artifact
-  responses, and controlled recovery for launcher-owned watcher processes.
-- Reports stale client catalogs as `tool_catalog_mismatch` with the active
-  profile, schema epoch, manifest hash, and Connector refresh guidance.
-- Fixes a plan-guard bypass where generic security wording could suppress a
-  later credential-access instruction. Every dangerous occurrence is now
-  evaluated independently and only directly negated actions are allowed.
-
-## Compatibility
-
-The MCP tool names and `save_plan` -> `create_task` workflow remain stable, but
-the product rename is intentionally breaking: old CLI names, `SAFE_BIFROST_*`
-variables, `safe-bifrost.config.json`, `.safe-bifrost/`, and legacy AppData
-paths are not loaded. Follow the migration guide before replacing an existing
-installation. `repo_path`, configured agent validation, and exact
-verification-command allowlists remain mandatory.
-
-## Verification
-
-Run the following from Windows PowerShell:
-
-```powershell
-npm.cmd test
-npm.cmd run test:mcp
-npm.cmd run test:http-mcp
-npm.cmd run doctor
-npm.cmd run check:tool-manifest
-npm.cmd run check:brand
-npm.cmd run test:tunnel-supervisor
-npm.cmd run test:watcher-supervisor
-npm.cmd run pack:clean
-npm.cmd run verify:package
-```