patchwarden 1.5.1 → 1.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "patchwarden",
-  "version": "1.5.1",
+  "version": "1.6.1",
   "description": "Secure local MCP bridge for ChatGPT and local agents, with workspace-scoped task loops, safe summaries, audits, and Direct editing.",
   "type": "module",
   "main": "dist/index.js",
@@ -12,9 +12,12 @@
   },
   "files": [
     "dist/",
+    "!dist/test/",
     "docs/",
+    "!docs/archive/",
     "!docs/optimization-proposal.md",
     "src/",
+    "!src/test/",
     "examples/",
     "scripts/",
     "!scripts/control/kill-patchwarden.ps1",
@@ -22,18 +25,14 @@
     "!.local/",
     "ui/",
     "PatchWarden.cmd",
-    "PatchWarden-Control.cmd",
-    "PatchWarden-Control-Tray.cmd",
-    "PatchWarden-Desktop.cmd",
-    "Restart-PatchWarden-Control.cmd",
-    "Stop-PatchWarden.cmd",
     "README.md",
     "README.en.md",
     "LICENSE",
     "tsconfig.json"
   ],
   "scripts": {
-    "build": "node ./node_modules/typescript/bin/tsc",
+    "build": "node scripts/build.js",
+    "check:build-output": "node scripts/checks/build-output-check.js",
     "start": "node dist/index.js",
     "start:http": "node dist/httpServer.js",
     "start:control": "node dist/controlCenter.js",
@@ -43,7 +42,7 @@
     "doctor": "node dist/doctor.js",
     "doctor:ci": "node dist/doctor.js --allow-default-config",
     "test:unit": "node scripts/checks/unit-tests.js",
-    "test": "node dist/smoke-test.js && node scripts/checks/unit-tests.js && node scripts/checks/lifecycle-smoke.js && node scripts/checks/doctor-smoke.js && node scripts/checks/tunnel-supervisor-smoke.js && node scripts/checks/watcher-supervisor-smoke.js && node scripts/checks/control-smoke.js && node scripts/checks/mcp-manifest-check.js && node scripts/checks/brand-check.js && node scripts/checks/control-center-smoke.js",
+    "test": "node scripts/checks/build-output-check.js && node dist/smoke-test.js && node scripts/checks/unit-tests.js && node scripts/checks/lifecycle-smoke.js && node scripts/checks/doctor-smoke.js && node scripts/checks/tunnel-supervisor-smoke.js && node scripts/checks/watcher-supervisor-smoke.js && node scripts/checks/control-smoke.js && node scripts/checks/mcp-manifest-check.js && node scripts/checks/brand-check.js && node scripts/checks/control-center-smoke.js",
     "test:lifecycle": "npm run build && node scripts/checks/lifecycle-smoke.js",
     "test:doctor": "npm run build && node scripts/checks/doctor-smoke.js",
     "test:tunnel-supervisor": "npm run build && node scripts/checks/tunnel-supervisor-smoke.js",
@@ -53,18 +52,36 @@
     "check:search-tool-manifest": "npm run build && node scripts/checks/mcp-manifest-check.js --profile chatgpt_search",
     "check:brand": "node scripts/checks/brand-check.js",
     "test:mcp": "npm run build && node scripts/checks/mcp-smoke.js",
+    "test:mcp:built": "node scripts/checks/mcp-smoke.js",
     "test:http-mcp": "npm run build && node scripts/checks/http-mcp-smoke.js",
+    "test:http-mcp:built": "node scripts/checks/http-mcp-smoke.js",
     "pretest": "npm run build",
     "pack:clean": "npm run build && node scripts/release/pack-clean.js",
-    "verify:package": "npm run build && node scripts/checks/package-manifest-check.js"
+    "pack:clean:built": "node scripts/release/pack-clean.js",
+    "verify:package": "npm run build && node scripts/checks/package-manifest-check.js",
+    "verify:package:built": "node scripts/checks/package-manifest-check.js",
+    "desktop:install": "npm.cmd --prefix desktop install --cache ..\\.npm-cache",
+    "desktop:test": "npm.cmd --prefix desktop test",
+    "desktop:smoke:unpacked": "npm.cmd --prefix desktop run smoke:unpacked --",
+    "desktop:stage": "npm run build && npm.cmd --prefix desktop run stage",
+    "desktop:dev": "npm run build && npm.cmd --prefix desktop run dev",
+    "desktop:package:dir": "npm run build && npm.cmd --prefix desktop run build:dir",
+    "desktop:package": "npm run build && npm.cmd --prefix desktop run build",
+    "desktop:preflight": "node scripts/release/desktop-preflight.js",
+    "desktop:preflight:release": "node scripts/release/desktop-preflight.js --require-clean"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.0.0"
+    "@modelcontextprotocol/sdk": "^1.29.0"
   },
   "devDependencies": {
     "@types/node": "^26.1.0",
     "typescript": "^6.0.3"
   },
+  "overrides": {
+    "@hono/node-server": "2.0.11",
+    "hono": "4.12.31",
+    "fast-uri": "4.1.1"
+  },
   "engines": {
     "node": ">=18.0.0"
   },

package/scripts/README.md

@@ -4,13 +4,18 @@ This directory keeps implementation scripts out of the root folder. Normal
 desktop use should start from the root entrypoints:
 
 ```powershell
-.\PatchWarden-Desktop.cmd
-.\PatchWarden-Control.cmd
-.\PatchWarden-Control-Tray.cmd --foreground
-.\Stop-PatchWarden.cmd
+.\scripts\launchers\PatchWarden-Desktop.cmd
+.\scripts\launchers\PatchWarden-Control.cmd
+.\scripts\launchers\PatchWarden-Control-Tray.cmd --foreground
+.\scripts\launchers\Stop-PatchWarden.cmd
 .\PatchWarden.cmd status all
 ```
 
+The installable Windows desktop shell is built separately with
+`npm.cmd run desktop:package`. It preserves these source/npm entrypoints and
+uses the same Control Center API rather than adding another process-management
+surface. See `docs/desktop-app.md`.
+
 ## Control Scripts
 
 - `control/manage-patchwarden.ps1`: backing implementation for `PatchWarden.cmd`.
@@ -34,11 +39,15 @@ desktop use should start from the root entrypoints:
 - `checks/mcp-manifest-check.js`: validates MCP manifest expectations.
 - `brand-check.js`: checks public brand strings.
 - `checks/package-manifest-check.js`: verifies package contents.
+- `checks/build-output-check.js`: verifies clean-output confinement and exact recursive unit-test compilation.
+- `release/desktop-preflight.js`: builds an isolated Windows directory package and writes a bounded preflight receipt.
 
 ## Release Helpers
 
-- `release/pack-clean.js`: rebuilds `release/`, `patchwarden-release.tar.gz`, and the
-  versioned `PatchWarden-v*.zip` artifact.
+- `release/pack-clean.js`: rebuilds the isolated `release/package/` staging
+  directory, `patchwarden-release.tar.gz`, and the versioned
+  `PatchWarden-v*.zip` artifact. Desktop and preflight siblings under
+  `release/` are preserved.
 
 ## Compatibility Launchers
 

package/scripts/build.js

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+import { resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import { cleanGeneratedOutput } from "./lib/clean-generated-output.js";
+
+const root = resolve(fileURLToPath(new URL("..", import.meta.url)));
+const dist = resolve(root, "dist");
+
+cleanGeneratedOutput(root, dist);
+process.chdir(root);
+await import("../node_modules/typescript/lib/tsc.js");

package/scripts/checks/brand-check.js

@@ -12,6 +12,9 @@ const allowedLegacyFiles = new Set([
   "docs/release-v0.3.0.md",
   "docs/release-v0.4.0.md",
   "docs/release-v0.6.0.md",
+  "docs/archive/releases/release-v0.6.0.md",
+  "docs/archive/releases/release-v0.6.1.md",
+  "docs/archive/releases/release-v0.6.4.md",
   "scripts/checks/brand-check.js",
   "scripts/release/pack-clean.js",
 ]);

package/scripts/checks/build-output-check.js

@@ -0,0 +1,37 @@
+#!/usr/bin/env node
+import assert from "node:assert/strict";
+import { existsSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { relative, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import { cleanGeneratedOutput } from "../lib/clean-generated-output.js";
+import { collectMatchingFiles } from "../lib/file-discovery.js";
+
+const root = resolve(fileURLToPath(new URL("../..", import.meta.url)));
+const sourceRoot = resolve(root, "src", "test", "unit");
+const compiledRoot = resolve(root, "dist", "test", "unit");
+
+const sourceTests = collectMatchingFiles(sourceRoot, (name) => name.endsWith(".test.ts"))
+  .map((path) => relative(sourceRoot, path).replace(/\\/g, "/").replace(/\.ts$/, ".js"));
+const compiledTests = collectMatchingFiles(compiledRoot, (name) => name.endsWith(".test.js"))
+  .map((path) => relative(compiledRoot, path).replace(/\\/g, "/"));
+
+assert.deepEqual(compiledTests, sourceTests, "compiled unit tests must exactly match source test paths");
+assert.ok(compiledTests.some((path) => path.includes("/")), "unit discovery must include nested tests");
+
+const fixtureRoot = mkdtempSync(resolve(tmpdir(), "patchwarden-clean-build-"));
+try {
+  const fixtureDist = resolve(fixtureRoot, "dist");
+  const outside = resolve(fixtureRoot, "keep.txt");
+  mkdirSync(fixtureDist);
+  writeFileSync(resolve(fixtureDist, "stale.js"), "stale\n", "utf8");
+  writeFileSync(outside, "keep\n", "utf8");
+  cleanGeneratedOutput(fixtureRoot, fixtureDist);
+  assert.equal(existsSync(fixtureDist), false, "clean build must remove stale dist contents");
+  assert.equal(existsSync(outside), true, "clean build must preserve files outside dist");
+  assert.throws(() => cleanGeneratedOutput(fixtureRoot, resolve(fixtureRoot, "release")), /Refusing/);
+} finally {
+  rmSync(fixtureRoot, { recursive: true, force: true });
+}
+
+console.log(`[build-output-check] OK: ${sourceTests.length} source tests match ${compiledTests.length} compiled tests.`);

package/scripts/checks/control-center-smoke.js

@@ -121,9 +121,9 @@ process.on("SIGTERM", () => {
   process.exit(143);
 });
 
-function httpGet(url) {
+function httpGet(url, headers = {}) {
   return new Promise((resolve, reject) => {
-    const req = http.get(url, (res) => {
+    const req = http.get(url, { headers }, (res) => {
       let data = "";
       res.on("data", (chunk) => (data += chunk));
       res.on("end", () => resolve({ status: res.statusCode, headers: res.headers, body: data }));
@@ -133,6 +133,34 @@ function httpGet(url) {
   });
 }
 
+async function testLoopbackHostBoundary() {
+  const name = "Control Center rejects DNS-rebinding Host headers and cannot be framed";
+  try {
+    const hostileToken = await httpGet(`${BASE_URL}/control-token.json`, {
+      Host: "patchwarden.attacker.invalid",
+    });
+    const hostilePage = await httpGet(`${BASE_URL}/`, {
+      Host: "127.0.0.1.attacker.invalid",
+    });
+    const localPage = await httpGet(`${BASE_URL}/`);
+    const problems = [];
+    if (hostileToken.status !== 421 || hostileToken.body.includes("token")) {
+      problems.push(`hostile token request returned ${hostileToken.status}: ${hostileToken.body.slice(0, 120)}`);
+    }
+    if (hostilePage.status !== 421) problems.push(`hostile page request returned ${hostilePage.status}`);
+    if (localPage.status !== 200) problems.push(`loopback page returned ${localPage.status}`);
+    if (String(localPage.headers["x-frame-options"] || "").toUpperCase() !== "DENY") {
+      problems.push("X-Frame-Options is not DENY");
+    }
+    if (!String(localPage.headers["content-security-policy"] || "").includes("frame-ancestors 'none'")) {
+      problems.push("CSP does not deny frame ancestors");
+    }
+    record(name, problems.length === 0, problems.join("; "));
+  } catch (err) {
+    record(name, false, `error: ${err.message}`);
+  }
+}
+
 function httpPost(url, headers = {}) {
   return new Promise((resolve, reject) => {
     const parsed = new URL(url);
@@ -221,6 +249,12 @@ async function testStaticFiles() {
     const root = await httpGet(`${BASE_URL}/`);
     const vendor = await httpGet(`${BASE_URL}/vendor/tailwindcss-browser.js`);
     const css = await httpGet(`${BASE_URL}/colors_and_type.css`);
+    const desktopCss = await httpGet(`${BASE_URL}/desktop.css`);
+    const desktopBridge = await httpGet(`${BASE_URL}/desktop-bridge.js`);
+    const i18n = await httpGet(`${BASE_URL}/i18n.js`);
+    const gettingStarted = await httpGet(`${BASE_URL}/pages/getting-started.html`);
+    const gettingStartedJs = await httpGet(`${BASE_URL}/getting-started.js`);
+    const settings = await httpGet(`${BASE_URL}/pages/settings.html`);
     const favicon = await httpGet(`${BASE_URL}/favicon.ico`);
 
     const checks = [];
@@ -228,7 +262,8 @@ async function testStaticFiles() {
     const rootCt = root.headers["content-type"] || "";
     if (!rootCt.includes("text/html")) checks.push(`GET / -> Content-Type ${rootCt} (expected text/html)`);
     if (!root.body.includes("setup-checklist-card")) checks.push("dashboard missing setup checklist card");
-    if (!root.body.includes("Show Core / Direct log tails")) checks.push("dashboard activity log is not collapsed behind a summary");
+    if (!root.body.includes("查看 Core / Direct 本次日志尾部")) checks.push("dashboard activity log is not collapsed behind a summary");
+    if (!root.body.includes("pw-dashboard-toolbar")) checks.push("dashboard missing stable desktop toolbar layout");
     if (!root.body.includes("evidence-pack-card")) checks.push("dashboard missing v1.5 evidence pack card");
 
     if (vendor.status !== 200) checks.push(`GET /vendor/tailwindcss-browser.js -> status ${vendor.status}`);
@@ -239,6 +274,31 @@ async function testStaticFiles() {
     const cssCt = css.headers["content-type"] || "";
     if (!cssCt.includes("text/css")) checks.push(`GET /colors_and_type.css -> Content-Type ${cssCt}`);
 
+    if (desktopCss.status !== 200 || !(desktopCss.headers["content-type"] || "").includes("text/css")) {
+      checks.push("desktop refinement stylesheet is not served as CSS");
+    }
+    if (desktopBridge.status !== 200 || !(desktopBridge.headers["content-type"] || "").includes("javascript")) {
+      checks.push("desktop bridge is not served as JavaScript");
+    }
+    if (i18n.status !== 200 || !i18n.body.includes("applyTranslations") || !i18n.body.includes('"zh-CN"') || !i18n.body.includes("en:")) {
+      checks.push("shared Chinese/English translation dictionary is unavailable");
+    }
+    if (gettingStarted.status !== 200 || (gettingStarted.body.match(/class="readiness-item"/g) || []).length !== 4 || !gettingStarted.body.includes("home.manual")) {
+      checks.push("desktop getting-started page is missing its four readiness checks or manual ChatGPT state");
+    }
+    if (gettingStartedJs.status !== 200 || !gettingStartedJs.body.includes('fetchJson("/api/status")') || !gettingStartedJs.body.includes("health_check")) {
+      checks.push("getting-started controller is missing bounded Tunnel status or health_check guidance");
+    }
+    if (settings.status !== 200 || !settings.body.includes("/settings.js")) {
+      checks.push("desktop settings page is unavailable or missing its bounded bridge");
+    }
+    for (const marker of ["detectTunnel", "chooseTunnel", "enableDirectProfile", "proxyScope", "saveRuntime", "tunnelId", "runtimeKey", "provisionTunnel", "forgetCredential", "language"]) {
+      if (!settings.body.includes(marker)) checks.push(`desktop settings missing runtime control: ${marker}`);
+    }
+    if (!desktopBridge.body.includes("patchwardenApplyTheme") || !desktopBridge.body.includes("请求超过 10 秒")) {
+      checks.push("desktop bridge is missing renderer theme propagation or bounded loading timeout");
+    }
+
     if (favicon.status !== 200) checks.push(`GET /favicon.ico -> status ${favicon.status}`);
     const faviconCt = favicon.headers["content-type"] || "";
     if (!faviconCt.includes("image/svg+xml")) checks.push(`GET /favicon.ico -> Content-Type ${faviconCt}`);
@@ -268,6 +328,9 @@ async function testPageNavigationRoutes() {
     "/pages/workspace.html",
     "/pages/audit.html",
     "/pages/task-detail.html?id=smoke",
+    "/settings.html",
+    "/pages/settings.html",
+    "/pages/getting-started.html",
   ];
 
   for (const route of routes) {
@@ -411,6 +474,13 @@ async function testTasksJson() {
     if (!Array.isArray(json.tasks)) problems.push("'tasks' is not an array");
     if (typeof json.total !== "number") problems.push("'total' is not a number");
     if (typeof json.returned !== "number") problems.push("'returned' is not a number");
+    if (!(json.nextCursor === null || typeof json.nextCursor === "string")) problems.push("'nextCursor' is neither null nor string");
+    if (!isObject(json.filters) || !isObject(json.filters.applied) || !isObject(json.filters.options)) problems.push("'filters' contract is missing");
+
+    const traversal = await httpGet(`${BASE_URL}/api/tasks/..%2Foutside`);
+    if (traversal.status !== 400) {
+      problems.push(`encoded task traversal returned ${traversal.status} (expected 400)`);
+    }
 
     if (problems.length === 0) {
       record(name, true);
@@ -823,7 +893,7 @@ async function testStaleTasksApi() {
 
 // ── Test 12: GET /api/workspace/<traversal>/status -> 400 ───────
 async function testWorkspaceRepoPathTraversal() {
-  const name = "Test 12: /api/workspace/<traversal>/status rejected with 400";
+  const name = "Test 12: workspace status rejects traversal without rejecting dotted names";
   // Use percent-encoded dots to bypass URL-parser segment normalization;
   // after decode the repoParam is "../secret" which contains ".." and is
   // rejected by the server's traversal guard.
@@ -833,7 +903,12 @@ async function testWorkspaceRepoPathTraversal() {
     if (res.status === 400) {
       const json = tryJson(res.body);
       if (json && typeof json.error === "string" && /traversal/i.test(json.error)) {
-        record(name, true);
+        const dotted = await httpGet(`${BASE_URL}/api/workspace/release..candidate/status`);
+        if (dotted.status === 404) {
+          record(name, true);
+        } else {
+          record(name, false, `valid dotted repo name returned ${dotted.status} (expected 404 for missing directory)`);
+        }
       } else {
         record(name, false, `status 400 but error field missing/invalid: ${res.body.slice(0, 200)}`);
       }
@@ -882,10 +957,17 @@ async function testDirectSessionsEmptyList() {
     const problems = [];
     if (!Array.isArray(json.sessions)) problems.push("'sessions' is not an array");
     if (typeof json.total !== "number") problems.push("'total' is not a number");
+    if (!(json.nextCursor === null || typeof json.nextCursor === "string")) problems.push("'nextCursor' is neither null nor string");
+    if (!isObject(json.filters) || !isObject(json.filters.options)) problems.push("'filters' contract is missing");
+    if (typeof json.direct_profile_enabled !== "boolean") problems.push("'direct_profile_enabled' is not a boolean");
     if (json.reason !== null && typeof json.reason !== "string") problems.push("'reason' is neither null nor string");
     if (Array.isArray(json.sessions) && json.sessions.length !== json.total) {
       problems.push(`sessions.length (${json.sessions.length}) != total (${json.total})`);
     }
+    const invalidDetail = await httpGet(`${BASE_URL}/api/direct-sessions/invalid.id`);
+    const invalidSummary = await httpGet(`${BASE_URL}/api/direct-sessions/invalid.id/summary`);
+    if (invalidDetail.status !== 400) problems.push(`invalid detail id returned ${invalidDetail.status} (expected 400)`);
+    if (invalidSummary.status !== 400) problems.push(`invalid summary id returned ${invalidSummary.status} (expected 400)`);
     if (problems.length === 0) {
       record(name, true);
     } else {
@@ -915,6 +997,8 @@ async function testLogsTailParam() {
     if (typeof json.stderr !== "string") problems.push("'stderr' is not a string");
     if (json.tail !== 300) problems.push(`'tail' is ${json.tail} (expected 300)`);
     if (json.category !== "core") problems.push(`'category' is ${json.category} (expected "core")`);
+    if (json.historical_snapshot !== true) problems.push("'historical_snapshot' is not true");
+    if (json.redacted !== true) problems.push("'redacted' is not true");
     if (problems.length === 0) {
       record(name, true);
     } else {
@@ -1440,7 +1524,7 @@ async function main() {
     process.exit(1);
   }
 
-  child = spawn("node", [serverPath], {
+  child = spawn(process.execPath, [serverPath], {
     cwd: projectRoot,
     env: {
       ...process.env,
@@ -1480,6 +1564,7 @@ async function main() {
     console.log(`[control-center-smoke] server ready at ${BASE_URL}`);
 
     await testStaticFiles();
+    await testLoopbackHostBoundary();
     await testPageNavigationRoutes();
     await testStatusJson();
     await testTasksJson();

package/scripts/checks/control-smoke.js

@@ -139,12 +139,13 @@ try {
 
   const expectedFiles = [
     "PatchWarden.cmd",
-    "PatchWarden-Control.cmd",
-    "PatchWarden-Control-Tray.cmd",
-    "PatchWarden-Desktop.cmd",
-    "Restart-PatchWarden-Control.cmd",
-    "Stop-PatchWarden.cmd",
+    "scripts/launchers/PatchWarden-Control.cmd",
+    "scripts/launchers/PatchWarden-Control-Tray.cmd",
+    "scripts/launchers/PatchWarden-Desktop.cmd",
+    "scripts/launchers/Restart-PatchWarden-Control.cmd",
+    "scripts/launchers/Stop-PatchWarden.cmd",
     "scripts/control/manage-patchwarden.ps1",
+    "scripts/control/run-background-supervisor.ps1",
     "scripts/control/stop-patchwarden.ps1",
     "scripts/launchers/Start-PatchWarden-Tunnel.cmd",
     "scripts/launchers/Start-PatchWarden-Direct-Tunnel.cmd",
@@ -158,14 +159,24 @@ try {
   if (!rootEntry.includes("manage-patchwarden.ps1")) {
     throw new Error("PatchWarden.cmd does not invoke the consolidated manager");
   }
-  const stopEntry = readFileSync(join(root, "Stop-PatchWarden.cmd"), "utf8");
-  if (!stopEntry.includes("scripts\\control\\stop-patchwarden.ps1")) {
+  const stopEntry = readFileSync(join(root, "scripts", "launchers", "Stop-PatchWarden.cmd"), "utf8");
+  if (!stopEntry.includes("control\\stop-patchwarden.ps1")) {
     throw new Error("Stop-PatchWarden.cmd does not invoke the one-click shutdown script");
   }
-  const desktopEntry = readFileSync(join(root, "PatchWarden-Desktop.cmd"), "utf8");
+  const desktopEntry = readFileSync(join(root, "scripts", "launchers", "PatchWarden-Desktop.cmd"), "utf8");
   if (!desktopEntry.includes("control-center-tray.ps1") || !desktopEntry.includes("WindowStyle Hidden")) {
     throw new Error("PatchWarden-Desktop.cmd must launch the tray hidden as the daily desktop entry");
   }
+  const managerSource = readFileSync(manager, "utf8");
+  const wrapperSource = readFileSync(join(root, "scripts", "control", "run-background-supervisor.ps1"), "utf8");
+  for (const expected of ["supervisor-status.json", "supervisor.stdout.log", "supervisor.stderr.log", "run-background-supervisor.ps1", "Write-BackgroundStartingState"]) {
+    if (!managerSource.includes(expected)) {
+      throw new Error(`background manager is missing supervisor observability: ${expected}`);
+    }
+  }
+  if (!wrapperSource.includes("1> $stdout 2> $stderr") || wrapperSource.includes("CONTROL_PLANE_API_KEY")) {
+    throw new Error("background wrapper must redirect supervisor logs without credential arguments");
+  }
   console.log("ok - control handles orphan cleanup, scoped kill, port conflicts, health fallback, and Core/Direct lifecycle actions");
 } finally {
   if (fakeTunnel?.exitCode === null) fakeTunnel.kill();

package/scripts/checks/http-mcp-smoke.js

@@ -1,9 +1,11 @@
 #!/usr/bin/env node
 import { spawn } from "node:child_process";
+import http from "node:http";
 import {
   existsSync,
   mkdirSync,
   mkdtempSync,
+  readFileSync,
   rmSync,
   writeFileSync,
 } from "node:fs";
@@ -11,7 +13,7 @@ import { tmpdir } from "node:os";
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { setTimeout as sleep } from "node:timers/promises";
-import { CHATGPT_CORE_TOOL_NAMES } from "../../dist/tools/toolCatalog.js";
+import { CHATGPT_CORE_TOOL_NAMES } from "../../dist/tools/catalog/toolCatalog.js";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const root = resolve(__dirname, "..", "..");
@@ -96,6 +98,25 @@ function toolJson(result) {
   return JSON.parse(toolText(result));
 }
 
+function requestWithHost(path, hostHeader) {
+  return new Promise((resolvePromise, rejectPromise) => {
+    const request = http.request({
+      hostname: host,
+      port,
+      path,
+      method: "GET",
+      headers: { Host: hostHeader },
+    }, (response) => {
+      let body = "";
+      response.setEncoding("utf-8");
+      response.on("data", (chunk) => { body += chunk; });
+      response.on("end", () => resolvePromise({ status: response.statusCode, body }));
+    });
+    request.on("error", rejectPromise);
+    request.end();
+  });
+}
+
 console.log("\n=== PatchWarden HTTP MCP Smoke Tests ===\n");
 
 try {
@@ -126,7 +147,7 @@ try {
   );
 
   console.log(`Starting HTTP MCP server on ${mcpUrl}...`);
-  serverProcess = spawn("node", [serverPath], {
+  serverProcess = spawn(process.execPath, [serverPath], {
     cwd: root,
     env: {
       ...process.env,
@@ -163,6 +184,13 @@ try {
     }
   });
 
+  await test("HTTP MCP rejects DNS-rebinding Host headers", async () => {
+    const response = await requestWithHost("/healthz", "patchwarden.attacker.invalid");
+    if (response.status !== 421 || !response.body.includes("Untrusted Host")) {
+      throw new Error(`Unexpected hostile Host response: ${JSON.stringify(response)}`);
+    }
+  });
+
   await test("wrong endpoint returns structured 404 guidance", async () => {
     const response = await fetch(`http://${host}:${port}/wrong-path`);
     const data = await response.json();
@@ -262,7 +290,7 @@ try {
 
   // Start server WITH owner token
   console.log("\n  Starting server with owner token...");
-  serverProcess = spawn("node", [serverPath], {
+  serverProcess = spawn(process.execPath, [serverPath], {
     cwd: root,
     env: {
       ...process.env,
@@ -278,7 +306,7 @@ try {
   // Wait for server to be ready
   for (let i = 0; i < 10; i++) {
     try {
-      const r = await fetch(`${mcpUrl}/healthz`);
+      const r = await fetch(`http://${host}:${port}/healthz`);
       if (r.status === 200) break;
     } catch {}
     await sleep(500);
@@ -328,6 +356,56 @@ try {
     }
   });
 
+  const acceptanceTaskId = "task_http_acceptance";
+  const acceptanceTaskDir = join(workspaceRoot, ".patchwarden", "tasks", acceptanceTaskId);
+  mkdirSync(acceptanceTaskDir, { recursive: true });
+  writeFileSync(join(acceptanceTaskDir, "status.json"), JSON.stringify({
+    task_id: acceptanceTaskId,
+    status: "done_by_agent",
+    acceptance_status: "pending",
+  }), "utf-8");
+
+  await test("admin acceptance requires the owner token", async () => {
+    const response = await fetch(`http://${host}:${port}/admin/tasks/${acceptanceTaskId}/accept`, {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({ notes: "reviewed" }),
+    });
+    if (response.status !== 401) throw new Error(`Expected 401, got ${response.status}`);
+  });
+
+  await test("admin acceptance writes bounded atomic evidence", async () => {
+    const secret = `ghp_${"a".repeat(24)}`;
+    const response = await fetch(`http://${host}:${port}/admin/tasks/${acceptanceTaskId}/accept`, {
+      method: "POST",
+      headers: {
+        "content-type": "application/json",
+        Authorization: `Bearer ${OWNER_TOKEN}`,
+      },
+      body: JSON.stringify({ notes: `reviewed ${secret}` }),
+    });
+    if (response.status !== 200) throw new Error(`Expected 200, got ${response.status}: ${await response.text()}`);
+    const acceptance = JSON.parse(readFileSync(join(acceptanceTaskDir, "acceptance.json"), "utf-8"));
+    const status = JSON.parse(readFileSync(join(acceptanceTaskDir, "status.json"), "utf-8"));
+    if (acceptance.status !== "accepted" || status.acceptance_status !== "accepted") {
+      throw new Error("Acceptance state was not persisted consistently");
+    }
+    if (JSON.stringify(acceptance).includes(secret)) throw new Error("Acceptance notes persisted a token");
+    if (existsSync(join(acceptanceTaskDir, "status.json.lock"))) throw new Error("Status lock was not released");
+  });
+
+  await test("admin acceptance rejects oversized request bodies", async () => {
+    const response = await fetch(`http://${host}:${port}/admin/tasks/${acceptanceTaskId}/reject`, {
+      method: "POST",
+      headers: {
+        "content-type": "application/json",
+        Authorization: `Bearer ${OWNER_TOKEN}`,
+      },
+      body: JSON.stringify({ reason: "x".repeat(70 * 1024) }),
+    });
+    if (response.status !== 413) throw new Error(`Expected 413, got ${response.status}`);
+  });
+
 } catch (error) {
   fail("HTTP MCP smoke setup", error);
 } finally {

package/scripts/checks/lifecycle-smoke.js

@@ -152,16 +152,16 @@ try {
   );
   process.env.PATCHWARDEN_CONFIG = configPath;
 
-  const { savePlan } = await import("../../dist/tools/savePlan.js");
-  const { createTask } = await import("../../dist/tools/createTask.js");
-  const { getTaskStatus } = await import("../../dist/tools/getTaskStatus.js");
-  const { cancelTask } = await import("../../dist/tools/cancelTask.js");
-  const { killTask } = await import("../../dist/tools/killTask.js");
-  const { getDiff } = await import("../../dist/tools/taskOutputs.js");
-  const { listAgents } = await import("../../dist/tools/listAgents.js");
-  const { getTaskSummary } = await import("../../dist/tools/getTaskSummary.js");
-  const { auditTask } = await import("../../dist/tools/auditTask.js");
-  const { waitForTask } = await import("../../dist/tools/waitForTask.js");
+  const { savePlan } = await import("../../dist/tools/goals/savePlan.js");
+  const { createTask } = await import("../../dist/tools/tasks/createTask.js");
+  const { getTaskStatus } = await import("../../dist/tools/tasks/getTaskStatus.js");
+  const { cancelTask } = await import("../../dist/tools/tasks/cancelTask.js");
+  const { killTask } = await import("../../dist/tools/tasks/killTask.js");
+  const { getDiff } = await import("../../dist/tools/tasks/taskOutputs.js");
+  const { listAgents } = await import("../../dist/tools/workspace/listAgents.js");
+  const { getTaskSummary } = await import("../../dist/tools/tasks/getTaskSummary.js");
+  const { auditTask } = await import("../../dist/tools/diagnostics/auditTask.js");
+  const { waitForTask } = await import("../../dist/tools/tasks/waitForTask.js");
   const { runTask } = await import("../../dist/runner/runTask.js");
   const { reloadConfig } = await import("../../dist/config.js");
 

package/scripts/checks/mcp-manifest-check.js

@@ -4,7 +4,7 @@ import { resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
-import { CHATGPT_CORE_TOOL_NAMES, CHATGPT_DIRECT_TOOL_NAMES, CHATGPT_SEARCH_TOOL_NAMES } from "../../dist/tools/toolCatalog.js";
+import { CHATGPT_CORE_TOOL_NAMES, CHATGPT_DIRECT_TOOL_NAMES, CHATGPT_SEARCH_TOOL_NAMES } from "../../dist/tools/catalog/toolCatalog.js";
 
 const root = resolve(fileURLToPath(new URL("../..", import.meta.url)));
 const jsonOnly = process.argv.includes("--json");