patchwarden 1.5.0 → 1.6.1

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");
 
@@ -175,7 +175,7 @@ try {
   await test("git diff captures tracked and untracked task changes", async () => {
     writeFileSync(join(repoPath, "preexisting-user-file.txt"), "preexisting and untouched\n", "utf-8");
     const plan = savePlan({ title: "Change capture", content: "Modify fixture files." });
-    const task = createTask({
+    const task = await createTask({
       plan_id: plan.plan_id,
       agent: "writer",
       repo_path: "repo",
@@ -231,7 +231,7 @@ try {
   });
 
   await test("inspect_only template fails when the agent changes repository files", async () => {
-    const task = createTask({
+    const task = await createTask({
       template: "inspect_only",
       goal: "Inspect the fixture without modifying files",
       agent: "writer",
@@ -249,7 +249,7 @@ try {
 
   await test("legacy test_command becomes one independent verification command", async () => {
     const plan = savePlan({ title: "Legacy verification", content: "No changes." });
-    const task = createTask({
+    const task = await createTask({
       plan_id: plan.plan_id,
       agent: "noop",
       repo_path: "repo",
@@ -267,7 +267,7 @@ try {
 
   await test("no-change task returns an explicit empty diff result", async () => {
     const plan = savePlan({ title: "No diff", content: "Do not change files." });
-    const task = createTask({ plan_id: plan.plan_id, agent: "noop", repo_path: "repo" });
+    const task = await createTask({ plan_id: plan.plan_id, agent: "noop", repo_path: "repo" });
     const result = await runTask(task.task_id);
     if (!isDoneStatus(result.status)) throw new Error(`No-op task failed: ${JSON.stringify(result)}`);
     const diff = getDiff(task.task_id);
@@ -288,7 +288,7 @@ try {
 
   await test("large diff response is truncated while diff.patch remains complete", async () => {
     const plan = savePlan({ title: "Large diff", content: "Create a large text file." });
-    const task = createTask({ plan_id: plan.plan_id, agent: "largewriter", repo_path: "repo" });
+    const task = await createTask({ plan_id: plan.plan_id, agent: "largewriter", repo_path: "repo" });
     const result = await runTask(task.task_id);
     if (!isDoneStatus(result.status)) throw new Error(`Large task failed: ${JSON.stringify(result)}`);
     const diff = getDiff(task.task_id);
@@ -300,7 +300,7 @@ try {
 
   await test("non-Git repositories return hash-only evidence with a reason", async () => {
     const plan = savePlan({ title: "Non-Git evidence", content: "Modify files in a non-Git repository." });
-    const task = createTask({ plan_id: plan.plan_id, agent: "writer", repo_path: "plain-repo" });
+    const task = await createTask({ plan_id: plan.plan_id, agent: "writer", repo_path: "plain-repo" });
     const result = await runTask(task.task_id);
     if (!isDoneStatus(result.status)) throw new Error(`Non-Git task failed: ${JSON.stringify(result)}`);
     const diff = getDiff(task.task_id);
@@ -315,7 +315,7 @@ try {
 
   await test("binary Git changes remain reviewable as a textual Git binary patch", async () => {
     const plan = savePlan({ title: "Binary evidence", content: "Create a binary fixture." });
-    const task = createTask({ plan_id: plan.plan_id, agent: "binarywriter", repo_path: "repo" });
+    const task = await createTask({ plan_id: plan.plan_id, agent: "binarywriter", repo_path: "repo" });
     const result = await runTask(task.task_id);
     if (!isDoneStatus(result.status)) throw new Error(`Binary task failed: ${JSON.stringify(result)}`);
     const diff = getDiff(task.task_id);
@@ -326,7 +326,7 @@ try {
 
   await test("artifact hygiene separates source, ignored output, runtime data, and suspicious changes", async () => {
     const plan = savePlan({ title: "Artifact hygiene", content: "Generate representative task outputs." });
-    const task = createTask({ plan_id: plan.plan_id, agent: "artifactwriter", repo_path: "repo" });
+    const task = await createTask({ plan_id: plan.plan_id, agent: "artifactwriter", repo_path: "repo" });
     const result = await runTask(task.task_id);
     if (!isDoneStatus(result.status)) throw new Error(`Artifact task failed: ${JSON.stringify(result)}`);
     const standard = getTaskSummary(task.task_id);
@@ -355,7 +355,7 @@ try {
 
   await test("deleted tracked files are identified with file stats", async () => {
     const plan = savePlan({ title: "Delete fixture", content: "Delete the designated fixture file." });
-    const task = createTask({ plan_id: plan.plan_id, agent: "deleter", repo_path: "repo" });
+    const task = await createTask({ plan_id: plan.plan_id, agent: "deleter", repo_path: "repo" });
     const result = await runTask(task.task_id);
     if (!isDoneStatus(result.status)) throw new Error(`Delete task failed: ${JSON.stringify(result)}`);
     const diff = getDiff(task.task_id);
@@ -366,7 +366,7 @@ try {
 
   await test("wait_for_task stays in the tool loop and returns terminal acceptance", async () => {
     const plan = savePlan({ title: "Wait loop", content: "Finish normally." });
-    const task = createTask({ plan_id: plan.plan_id, agent: "writer", repo_path: "repo" });
+    const task = await createTask({ plan_id: plan.plan_id, agent: "writer", repo_path: "repo" });
     const running = runTask(task.task_id);
     const waited = await waitForTask(task.task_id, 5);
     await raceWithTimeout(running, 15000, "wait_for_task loop did not terminate within 15s");
@@ -380,7 +380,7 @@ try {
 
   await test("wait_for_task explicitly requires another call when the task is not terminal", async () => {
     const plan = savePlan({ title: "Pending wait", content: "Remain queued for this check." });
-    const task = createTask({ plan_id: plan.plan_id, agent: "slow", repo_path: "repo" });
+    const task = await createTask({ plan_id: plan.plan_id, agent: "slow", repo_path: "repo" });
     const waited = await waitForTask(task.task_id, 1);
     if (waited.terminal || !waited.timed_out || !waited.continuation_required) {
       throw new Error(`Expected continuation response: ${JSON.stringify(waited)}`);
@@ -390,11 +390,17 @@ try {
 
   await test("running task summary includes heartbeat, phase, command, and elapsed time", async () => {
     const plan = savePlan({ title: "Running summary", content: "Wait." });
-    const task = createTask({ plan_id: plan.plan_id, agent: "slow", repo_path: "repo", timeout_seconds: 30 });
+    const task = await createTask({ plan_id: plan.plan_id, agent: "slow", repo_path: "repo", timeout_seconds: 30 });
     const running = runTask(task.task_id);
     await waitForRunning(getTaskStatus, task.task_id);
-    await sleep(50);
-    const summary = getTaskSummary(task.task_id);
+    // Wait for the task to transition from "preparing" to actually running a command.
+    // Async snapshot may delay the preparing phase, so poll until current_command appears.
+    let summary;
+    for (let attempt = 0; attempt < 100; attempt++) {
+      await sleep(50);
+      summary = getTaskSummary(task.task_id);
+      if (summary.current_command) break;
+    }
     if (summary.terminal || !summary.last_heartbeat_at || !summary.phase || !summary.current_command || summary.elapsed_ms < 0) {
       throw new Error(`Running summary incomplete: ${JSON.stringify(summary)}`);
     }
@@ -404,7 +410,7 @@ try {
 
   await test("verification failure produces failed_verification and structured evidence", async () => {
     const plan = savePlan({ title: "Verify failure", content: "Finish normally." });
-    const task = createTask({
+    const task = await createTask({
       plan_id: plan.plan_id,
       agent: "writer",
       repo_path: "repo",
@@ -434,7 +440,7 @@ try {
 
   await test("out-of-scope workspace changes fail the task and generate a rollback plan", async () => {
     const plan = savePlan({ title: "Scope violation", content: "Do not leave the repository." });
-    const task = createTask({
+    const task = await createTask({
       plan_id: plan.plan_id,
       agent: "scopebreaker",
       repo_path: "repo",
@@ -505,7 +511,7 @@ try {
     reloadConfig(cfg2);
 
     const plan = savePlan({ title: "Noop with external dirty", content: "Do nothing." });
-    const task = createTask({ plan_id: plan.plan_id, agent: "noop", repo_path: "repo", verify_commands: ["node --check main.js"] });
+    const task = await createTask({ plan_id: plan.plan_id, agent: "noop", repo_path: "repo", verify_commands: ["node --check main.js"] });
     const result = await runTask(task.task_id);
 
     if (!isDoneStatus(result.status)) {
@@ -590,7 +596,7 @@ try {
     reloadConfig(cfg2);
 
     const plan = savePlan({ title: "External dirty modifier", content: "Modify external tracked file." });
-    const task = createTask({ plan_id: plan.plan_id, agent: "extmod", repo_path: "repo", verify_commands: ["node --check main.js"] });
+    const task = await createTask({ plan_id: plan.plan_id, agent: "extmod", repo_path: "repo", verify_commands: ["node --check main.js"] });
     const result = await runTask(task.task_id);
 
     if (result.status !== "failed_scope_violation") {
@@ -675,7 +681,7 @@ try {
     reloadConfig(cfg2);
 
     const plan = savePlan({ title: "Clean external modifier", content: "Modify clean external tracked file." });
-    const task = createTask({ plan_id: plan.plan_id, agent: "extmod", repo_path: "repo", verify_commands: ["node --check main.js"] });
+    const task = await createTask({ plan_id: plan.plan_id, agent: "extmod", repo_path: "repo", verify_commands: ["node --check main.js"] });
     const result = await runTask(task.task_id);
 
     if (result.status !== "failed_scope_violation") {
@@ -752,7 +758,7 @@ try {
     reloadConfig(cfg2);
 
     const plan = savePlan({ title: "External rename", content: "Rename external tracked file." });
-    const task = createTask({ plan_id: plan.plan_id, agent: "extrenamer", repo_path: "repo", verify_commands: ["node --check main.js"] });
+    const task = await createTask({ plan_id: plan.plan_id, agent: "extrenamer", repo_path: "repo", verify_commands: ["node --check main.js"] });
     const result = await runTask(task.task_id);
 
     if (result.status !== "failed_scope_violation") {
@@ -794,7 +800,7 @@ try {
 
   await test("timeout terminates a long-running agent", async () => {
     const plan = savePlan({ title: "Timeout", content: "Wait." });
-    const task = createTask({ plan_id: plan.plan_id, agent: "slow", repo_path: "repo", timeout_seconds: 1 });
+    const task = await createTask({ plan_id: plan.plan_id, agent: "slow", repo_path: "repo", timeout_seconds: 1 });
     const started = Date.now();
     const result = await runTask(task.task_id);
     if (result.status !== "failed" || !result.error?.includes("timed out")) {
@@ -810,7 +816,7 @@ try {
 
   await test("cancel_task safely stops a running agent", async () => {
     const plan = savePlan({ title: "Cancel", content: "Wait." });
-    const task = createTask({ plan_id: plan.plan_id, agent: "slow", repo_path: "repo", timeout_seconds: 30 });
+    const task = await createTask({ plan_id: plan.plan_id, agent: "slow", repo_path: "repo", timeout_seconds: 30 });
     const running = runTask(task.task_id);
     await waitForRunning(getTaskStatus, task.task_id);
     const request = cancelTask(task.task_id);
@@ -823,7 +829,7 @@ try {
 
   await test("kill_task immediately stops a running agent", async () => {
     const plan = savePlan({ title: "Kill", content: "Wait." });
-    const task = createTask({ plan_id: plan.plan_id, agent: "slow", repo_path: "repo", timeout_seconds: 30 });
+    const task = await createTask({ plan_id: plan.plan_id, agent: "slow", repo_path: "repo", timeout_seconds: 30 });
     const running = runTask(task.task_id);
     await waitForRunning(getTaskStatus, task.task_id);
     const request = killTask(task.task_id);

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");

package/scripts/checks/mcp-smoke.js

@@ -54,6 +54,8 @@ try {
   }), "utf-8");
   writeFileSync(join(workspaceRoot, "hello.txt"), "hello from mcp smoke\n", "utf-8");
   writeFileSync(join(workspaceRoot, ".env"), "SECRET=blocked\n", "utf-8");
+  writeFileSync(join(workspaceRoot, "npm.cmd"), "@echo repo npm hijack executed\r\n@exit /b 99\r\n", "utf-8");
+  writeFileSync(join(workspaceRoot, "git.cmd"), "@echo repo git hijack executed\r\n@exit /b 98\r\n", "utf-8");
   writeFileSync(
     join(workspaceRoot, "package.json"),
     JSON.stringify({
@@ -117,6 +119,7 @@ try {
     "discard_worktree",
     "discover_tools",
     "explain_tool",
+    "export_goal_report",
     "export_handoff",
     "export_task_evidence_pack",
     "finalize_direct_session",
@@ -133,6 +136,7 @@ try {
     "get_task_summary",
     "get_test_log",
     "health_check",
+    "import_speckit_tasks",
     "invoke_discovered_tool",
     "kill_task",
     "list_agents",
@@ -177,7 +181,7 @@ try {
   if (!tools._meta || typeof tools._meta.tool_manifest_sha256 !== "string" || tools._meta.tool_manifest_sha256.length !== 64) {
     throw new Error(`tools/list _meta missing manifest hash: ${JSON.stringify(tools._meta || null)}`);
   }
-  if (tools._meta.tool_profile !== "full" || tools._meta.tool_count !== 64) {
+  if (tools._meta.tool_profile !== "full" || tools._meta.tool_count !== 66) {
     throw new Error(`tools/list _meta profile/count mismatch: ${JSON.stringify(tools._meta)}`);
   }
   if (typeof tools._meta.schema_epoch !== "string" || typeof tools._meta.server_version !== "string") {
@@ -318,7 +322,11 @@ try {
   );
   ok("sensitive file and path escape checks reject access");
 
-  const runner = spawnSync("node", ["dist/runner/cli.js", task.task_id], {
+  // The runner executes with the temporary workspace as cwd; use an absolute
+  // package path so the smoke test does not depend on that workspace having a
+  // copied `dist/` tree.
+  const runnerPath = resolve(root, "dist", "runner", "cli.js");
+  const runner = spawnSync("node", [runnerPath, task.task_id], {
     cwd: root,
     env: { ...process.env, PATCHWARDEN_CONFIG: configPath },
     encoding: "utf-8",
@@ -435,7 +443,9 @@ try {
   writeFileSync(join(directRepo, "package.json"), JSON.stringify({
     name: "direct-fixture",
     private: true,
-    scripts: { test: 'node -e "console.log(\'ok\')"' },
+    // Exercise the npm-script execution path without relying on a temporary
+    // script file or platform-specific quoting.
+    scripts: { test: "node --version" },
   }, null, 2), "utf-8");
 
   writeFileSync(
@@ -515,7 +525,23 @@ try {
     })).content?.[0]?.text || "{}"
   );
   if (bundleResult.status !== "passed" || bundleResult.command_count !== 1 || bundleResult.passed_commands !== 1) {
-    throw new Error(`run_direct_verification_bundle failed: ${JSON.stringify(bundleResult)}`);
+    // This repository and command are generated entirely by this smoke test,
+    // so a bounded log excerpt is safe and makes platform-only CI failures
+    // actionable without weakening the production tool's safe summary.
+    const sessionDir = join(workspaceRoot, ".patchwarden", "direct-sessions", sessionResult.session_id);
+    const verificationPath = join(sessionDir, "verification.json");
+    const logPath = join(sessionDir, "verification.log");
+    const verification = existsSync(verificationPath)
+      ? readFileSync(verificationPath, "utf-8").slice(-2000)
+      : "missing verification.json";
+    const fixtureLog = existsSync(logPath)
+      ? readFileSync(logPath, "utf-8").slice(-2000)
+      : "missing verification.log";
+    throw new Error(
+      `run_direct_verification_bundle failed: ${JSON.stringify(bundleResult)}; ` +
+      `synthetic_fixture_verification=${JSON.stringify(verification)}; ` +
+      `synthetic_fixture_log=${JSON.stringify(fixtureLog)}`
+    );
   }
   const bundleText = JSON.stringify(bundleResult).toLowerCase();
   if (bundleText.includes("stdout_tail") || bundleText.includes("stderr_tail") || bundleText.includes("verification.log")) {

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

@@ -1,15 +1,24 @@
 #!/usr/bin/env node
 import { spawnSync } from "node:child_process";
 import { readFileSync } from "node:fs";
+import { resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import {
+  buildChildEnvironment,
+  resolvePackageManagerInvocation,
+} from "../../dist/runner/processSecurity.js";
 
-const isWindows = process.platform === "win32";
-const command = isWindows ? (process.env.ComSpec || "cmd.exe") : "npm";
-const args = isWindows
-  ? ["/d", "/s", "/c", "npm.cmd pack --dry-run --json"]
-  : ["pack", "--dry-run", "--json"];
-const result = spawnSync(command, args, {
+const root = resolve(fileURLToPath(new URL("../..", import.meta.url)));
+const env = buildChildEnvironment({ cwd: root });
+const invocation = resolvePackageManagerInvocation(process.platform === "win32" ? "npm.cmd" : "npm", root, {
+  pathValue: env.PATH,
+});
+const result = spawnSync(invocation.command, [...invocation.argsPrefix, "pack", "--dry-run", "--json"], {
+  cwd: root,
   encoding: "utf8",
+  env,
   shell: false,
+  windowsHide: true,
 });
 
 if (result.status !== 0) {
@@ -35,6 +44,8 @@ const forbidden = [
   /\.dpapi$/i,
   /^docs\/optimization-proposal\.md$/i,
   /(^|\/)kill-patchwarden\.(cmd|ps1)$/i,
+  /^(?:dist|src)\/test\//i,
+  /^docs\/archive\//i,
 ];
 const leaked = files.filter((file) => forbidden.some((pattern) => pattern.test(file)));
 if (leaked.length > 0) {
@@ -44,8 +55,10 @@ if (leaked.length > 0) {
 }
 
 const required = [
+  "dist/index.js",
+  "dist/index.d.ts",
   "PatchWarden.cmd",
-  "PatchWarden-Desktop.cmd",
+  "scripts/launchers/PatchWarden-Desktop.cmd",
   "scripts/control/manage-patchwarden.ps1",
   "scripts/launchers/Start-PatchWarden-Tunnel.cmd",
   "scripts/launchers/Start-PatchWarden-Direct-Tunnel.cmd",

package/scripts/checks/unit-tests.js

@@ -1,8 +1,9 @@
 #!/usr/bin/env node
-import { existsSync, readdirSync } from "node:fs";
+import { existsSync } from "node:fs";
 import { spawnSync } from "node:child_process";
 import { resolve } from "node:path";
 import { fileURLToPath } from "node:url";
+import { collectMatchingFiles } from "../lib/file-discovery.js";
 
 const scriptDir = resolve(fileURLToPath(new URL(".", import.meta.url)));
 const root = resolve(scriptDir, "..", "..");
@@ -14,10 +15,7 @@ if (!existsSync(unitDir)) {
   process.exit(1);
 }
 
-const testFiles = readdirSync(unitDir)
-  .filter((name) => name.endsWith(".test.js"))
-  .sort()
-  .map((name) => resolve(unitDir, name));
+const testFiles = collectMatchingFiles(unitDir, (name) => name.endsWith(".test.js"));
 
 if (testFiles.length === 0) {
   console.error(`[unit-tests] No compiled unit tests found in ${unitDir}`);

package/scripts/checks/watcher-supervisor-smoke.js

@@ -60,6 +60,8 @@ async function runScenario(label, mode, maxRestarts, lifetimeMs, assertState) {
 async function runExternalScenario() {
   const fixture = createFixture("external");
   const env = fixtureEnv(fixture, "healthy", 7_000);
+  delete env.CONTROL_PLANE_API_KEY;
+  delete env.PATCHWARDEN_OWNER_TOKEN;
   const external = spawn(process.execPath, [fixture.watcherPath], {
     cwd: fixture.project,
     env: {
@@ -168,6 +170,9 @@ function fixtureEnv(fixture, mode, lifetimeMs) {
     APPDATA: fixture.appData,
     LOCALAPPDATA: fixture.localAppData,
     CONTROL_PLANE_API_KEY: "test-key",
+    PATCHWARDEN_OWNER_TOKEN: "test-owner-token",
+    PATCHWARDEN_AGENT_ENV_ALLOWLIST: "PATCHWARDEN_TEST_PROVIDER_KEY",
+    PATCHWARDEN_TEST_PROVIDER_KEY: "provider-key-canary",
     WATCHER_FIXTURE_MODE: mode,
     TUNNEL_FIXTURE_LIFETIME_MS: String(lifetimeMs),
   };
@@ -177,6 +182,9 @@ function watcherFixtureSource(attemptPath) {
   return `
 const fs=require('fs');const path=require('path');
 if(!process.env.XDG_CONFIG_HOME){console.error('watcher did not receive XDG_CONFIG_HOME');process.exit(12)}
+if(process.env.CONTROL_PLANE_API_KEY){console.error('watcher received tunnel owner credential');process.exit(13)}
+if(process.env.PATCHWARDEN_OWNER_TOKEN){console.error('watcher received HTTP owner credential');process.exit(14)}
+if(process.env.PATCHWARDEN_TEST_PROVIDER_KEY!=='provider-key-canary'){console.error('watcher did not receive allow-listed provider credential');process.exit(15)}
 let attempt=0;try{attempt=Number(fs.readFileSync(${JSON.stringify(attemptPath)},'utf8'))||0}catch{}
 attempt++;fs.writeFileSync(${JSON.stringify(attemptPath)},String(attempt));
 const cfg=JSON.parse(fs.readFileSync(process.env.PATCHWARDEN_CONFIG,'utf8'));
@@ -192,6 +200,7 @@ else setInterval(write,250);
 function tunnelFixtureSource() {
   return `
 const fs=require('fs');const path=require('path');const args=process.argv.slice(2);const command=args[0]||'';
+if(process.env.PATCHWARDEN_TEST_PROVIDER_KEY){console.error('allow-listed provider credential leaked into tunnel-client');process.exit(22)}
 const flag=(name)=>{const i=args.indexOf(name);return i>=0?args[i+1]:''};
 if(command==='init'){const profile=flag('--profile')||'patchwarden';const mcpCommand=flag('--mcp-command')||'';const yamlDir=path.join(process.env.APPDATA,'tunnel-client');const yamlPath=path.join(yamlDir,profile+'.yaml');fs.mkdirSync(yamlDir,{recursive:true});fs.writeFileSync(yamlPath,'mcp:\\n  commands:\\n    - channel: main\\n      command: \"'+mcpCommand.replace(/\\\\/g,'/')+'\"\\n\\nhealth:\\n  listen_addr: \"127.0.0.1:8080\"\\n');console.log('{}');process.exit(0)}
 if(command==='doctor'){console.log('{}');process.exit(0)}

package/scripts/control/get-patchwarden-health.ps1

@@ -6,7 +6,7 @@ $RuntimeDirectory = Join-Path $env:LOCALAPPDATA "patchwarden\runtime"
 $HealthUrlFile = Join-Path $RuntimeDirectory "tunnel-health-url.txt"
 
 $env:PATCHWARDEN_CONFIG = $ConfigPath
-$healthJson = node --input-type=module -e "Promise.all([import('./dist/tools/healthCheck.js'),import('./dist/tools/registry.js')]).then(([h,r])=>console.log(JSON.stringify(h.healthCheck(r.getToolCatalogSnapshot()))))" 2>$null
+$healthJson = node --input-type=module -e "Promise.all([import('./dist/tools/diagnostics/healthCheck.js'),import('./dist/tools/registry.js')]).then(([h,r])=>console.log(JSON.stringify(h.healthCheck(r.getToolCatalogSnapshot()))))" 2>$null
 if ($LASTEXITCODE -ne 0 -or -not $healthJson) {
   throw "Could not load PatchWarden health information. Run npm.cmd run build first."
 }