patchwarden 1.5.1 → 1.6.2

package/scripts/control/start-patchwarden-tunnel.ps1

@@ -3,7 +3,10 @@
   [string]$Profile = "patchwarden",
   [ValidateSet("chatgpt_core", "chatgpt_direct")]
   [string]$ToolProfile = "chatgpt_core",
-  [string]$ProxyUrl = $(if ($env:HTTPS_PROXY) { $env:HTTPS_PROXY } else { "http://127.0.0.1:7892" }),
+  [ValidateSet("", "environment", "none", "manual")]
+  [string]$ProxyMode = "",
+  [AllowEmptyString()]
+  [string]$ProxyUrl = "",
   [string]$TunnelClientExe = $(if ($env:TUNNEL_CLIENT_EXE) { $env:TUNNEL_CLIENT_EXE } else { $env:PATCHWARDEN_TUNNEL_CLIENT_EXE }),
   [string]$OpencodeBin = $env:OPENCODE_BIN_DIR,
   [string]$ConfigPath = $env:PATCHWARDEN_CONFIG,
@@ -22,6 +25,47 @@
 
 $ErrorActionPreference = "Stop"
 
+if ([string]::IsNullOrWhiteSpace($ProxyMode)) {
+  $ProxyMode = if ($ToolProfile -eq "chatgpt_direct" -and $env:PATCHWARDEN_DIRECT_PROXY_MODE) {
+    $env:PATCHWARDEN_DIRECT_PROXY_MODE
+  } elseif ($env:PATCHWARDEN_TUNNEL_PROXY_MODE) {
+    $env:PATCHWARDEN_TUNNEL_PROXY_MODE
+  } else {
+    "environment"
+  }
+}
+if ([string]::IsNullOrWhiteSpace($ProxyUrl)) {
+  $ProxyUrl = if ($ToolProfile -eq "chatgpt_direct" -and $env:PATCHWARDEN_DIRECT_PROXY_URL) {
+    $env:PATCHWARDEN_DIRECT_PROXY_URL
+  } else {
+    $env:PATCHWARDEN_TUNNEL_PROXY_URL
+  }
+}
+
+$script:UseProxyArgument = $false
+switch ($ProxyMode) {
+  "manual" {
+    if ([string]::IsNullOrWhiteSpace($ProxyUrl)) { throw "Manual proxy mode requires ProxyUrl." }
+    $proxyUri = $null
+    if (-not [Uri]::TryCreate($ProxyUrl, [UriKind]::Absolute, [ref]$proxyUri) -or $proxyUri.Scheme -notin @("http", "https", "socks5")) {
+      throw "ProxyUrl must use http, https, or socks5."
+    }
+    if (-not [string]::IsNullOrEmpty($proxyUri.UserInfo)) { throw "ProxyUrl must not contain credentials." }
+    $env:HTTP_PROXY = $ProxyUrl
+    $env:HTTPS_PROXY = $ProxyUrl
+    $env:ALL_PROXY = $ProxyUrl
+    $script:UseProxyArgument = $true
+  }
+  "none" {
+    Remove-Item Env:HTTP_PROXY, Env:HTTPS_PROXY, Env:ALL_PROXY -ErrorAction SilentlyContinue
+  }
+  "environment" {
+    $script:UseProxyArgument = -not [string]::IsNullOrWhiteSpace($env:HTTPS_PROXY)
+  }
+  default { throw "Unsupported proxy mode: $ProxyMode" }
+}
+$env:NO_PROXY = "localhost,127.0.0.1,::1"
+
 if ([string]::IsNullOrWhiteSpace($HealthListenAddr)) {
   if ($Profile -eq "patchwarden-direct" -or $ToolProfile -eq "chatgpt_direct") {
     $HealthListenAddr = "127.0.0.1:8081"
@@ -36,6 +80,15 @@ if (-not $ConfigPath) {
 }
 $McpLauncherName = if ($ToolProfile -eq "chatgpt_direct") { "patchwarden-mcp-direct.cmd" } else { "patchwarden-mcp-stdio.cmd" }
 $McpStdioLauncher = Join-Path $ProjectRoot "scripts\mcp\$McpLauncherName"
+$McpEntryPath = Join-Path $ProjectRoot "dist\index.js"
+$WatcherEntryPath = Join-Path $ProjectRoot "dist\runner\watch.js"
+$RuntimeBuildLayout = if (Test-Path -LiteralPath (Join-Path $ProjectRoot ".git")) {
+  "git_worktree"
+} elseif ($ProjectRoot -match '(?i)[\\/]resources[\\/]core$') {
+  "desktop_packaged_core"
+} else {
+  "standalone_build"
+}
 $McpStdioLauncherForTunnel = $McpStdioLauncher -replace "\\", "/"
 $OpencodeConfigHome = Join-Path $env:LOCALAPPDATA "patchwarden\opencode-config"
 $ProfilePath = Join-Path $env:APPDATA "tunnel-client\$Profile.yaml"
@@ -58,12 +111,35 @@ $script:WatcherManaged = $false
 $script:WatcherRestartAttempts = 0
 $script:WatcherHealthySince = $null
 $script:WatcherRestartExhausted = $false
-$DefaultTunnelClientPath = "D:\ai_agent\tunnel-client-v0.0.9--context-conduit-topaz-windows-amd64\tunnel-client.exe"
-
 if ($ToolProfile -eq "chatgpt_direct") {
   $SkipWatcher = $true
 }
 
+$script:AgentEnvironmentNames = @(
+  ([string]$env:PATCHWARDEN_AGENT_ENV_ALLOWLIST -split ';') |
+    Where-Object { $_ -match '^[A-Za-z_][A-Za-z0-9_]*$' } |
+    Select-Object -Unique
+)
+
+function Suspend-AgentProviderEnvironment {
+  $saved = @{}
+  foreach ($name in $script:AgentEnvironmentNames) {
+    $item = Get-Item -LiteralPath "Env:$name" -ErrorAction SilentlyContinue
+    if ($null -ne $item) {
+      $saved[$name] = [string]$item.Value
+      Remove-Item -LiteralPath "Env:$name" -ErrorAction SilentlyContinue
+    }
+  }
+  return $saved
+}
+
+function Restore-AgentProviderEnvironment {
+  param([hashtable]$Saved)
+  foreach ($name in $Saved.Keys) {
+    Set-Item -LiteralPath "Env:$name" -Value $Saved[$name]
+  }
+}
+
 function Assert-File {
   param([string]$Path, [string]$Name)
   if (-not (Test-Path -LiteralPath $Path)) {
@@ -176,6 +252,14 @@ function Get-LastDiagnosticLine {
   return $Fallback
 }
 
+function Get-MaskedTunnelId {
+  param([string]$Value)
+  if ([string]::IsNullOrWhiteSpace($Value)) { return $null }
+  $trimmed = $Value.Trim()
+  if ($trimmed.Length -le 8) { return "***" }
+  return "$($trimmed.Substring(0, 4))***$($trimmed.Substring($trimmed.Length - 4))"
+}
+
 function Write-TunnelStatus {
   param(
     [string]$Status,
@@ -196,6 +280,8 @@ function Write-TunnelStatus {
     status = $Status
     reason_code = $ReasonCode
     ready = $Ready
+    profile = $Profile
+    tunnel_id_masked = Get-MaskedTunnelId -Value $TunnelId
     attempt = $Attempt
     pid = $ProcessId
     checked_at = (Get-Date).ToUniversalTime().ToString("o")
@@ -214,6 +300,12 @@ function Write-TunnelStatus {
     tool_manifest_sha256 = if ($script:ToolManifest) { $script:ToolManifest.tool_manifest_sha256 } else { $null }
     tools_ready = [bool]($script:ToolManifest -and $script:ToolManifest.ok)
     core_tools_ready = [bool]($ToolProfile -eq "chatgpt_core" -and $script:ToolManifest -and $script:ToolManifest.ok)
+    project_root = $ProjectRoot
+    config_path = $ConfigPath
+    mcp_entry_path = $McpEntryPath
+    watcher_entry_path = $WatcherEntryPath
+    validator_module_path = (Join-Path $ProjectRoot "dist\assessments\assessmentStore.js")
+    runtime_build_layout = $RuntimeBuildLayout
   }
   $temporary = "$StatusFile.tmp"
   $payload | ConvertTo-Json -Depth 4 | Set-Content -LiteralPath $temporary -Encoding UTF8
@@ -230,9 +322,17 @@ function Get-DiagnosticCode {
 }
 
 function Invoke-TunnelDoctor {
-  $output = (& $TunnelClientExe doctor --profile $Profile --explain --json --http-proxy env:HTTPS_PROXY 2>&1 | Out-String)
+  $doctorArguments = @("doctor", "--profile", $Profile, "--explain", "--json")
+  if ($script:UseProxyArgument) { $doctorArguments += @("--http-proxy", "env:HTTPS_PROXY") }
+  $savedAgentEnvironment = Suspend-AgentProviderEnvironment
+  try {
+    $output = (& $TunnelClientExe @doctorArguments 2>&1 | Out-String)
+    $exitCode = $LASTEXITCODE
+  } finally {
+    Restore-AgentProviderEnvironment -Saved $savedAgentEnvironment
+  }
   return [pscustomobject]@{
-    ExitCode = $LASTEXITCODE
+    ExitCode = $exitCode
     Output = $output
     ReasonCode = Get-DiagnosticCode $output
   }
@@ -269,6 +369,30 @@ function Get-WatcherHeartbeatState {
   }
 }
 
+function Repair-StaleWatcherLock {
+  $settings = Get-WatcherSettings
+  $lockPath = Join-Path (Split-Path -Parent $settings.HeartbeatPath) "watcher.lock"
+  if (-not (Test-Path -LiteralPath $lockPath)) { return "not_present" }
+  try {
+    $lock = Get-Content -LiteralPath $lockPath -Raw -Encoding UTF8 | ConvertFrom-Json
+    $lockPid = [int]$lock.pid
+    if ($lockPid -le 0) { return "unverified" }
+    $candidate = Get-CimInstance Win32_Process -Filter "ProcessId = $lockPid" -ErrorAction Stop
+    if ($candidate) {
+      $normalizedCommand = ([string]$candidate.CommandLine).Replace("/", "\")
+      $normalizedExpected = ([System.IO.Path]::GetFullPath($WatcherEntryPath)).Replace("/", "\")
+      $isExpectedWatcher = [string]$candidate.Name -ieq "node.exe" -and
+        $normalizedCommand.IndexOf($normalizedExpected, [StringComparison]::OrdinalIgnoreCase) -ge 0
+      if ($isExpectedWatcher) { return "expected_watcher_alive" }
+    }
+    Remove-Item -LiteralPath $lockPath -Force -ErrorAction Stop
+    Write-Host "[watch] Removed stale watcher lock after PID identity verification."
+    return "removed"
+  } catch {
+    return "unverified"
+  }
+}
+
 function Write-WatcherStatus {
   param([string]$Status, [string]$LastError = $null)
   New-Item -ItemType Directory -Force -Path $RuntimeDirectory | Out-Null
@@ -281,6 +405,11 @@ function Write-WatcherStatus {
     restart_attempts = $script:WatcherRestartAttempts
     checked_at = (Get-Date).ToUniversalTime().ToString("o")
     last_error = if ($LastError) { ($LastError -replace '[\r\n]+', ' ').Substring(0, [Math]::Min(500, ($LastError -replace '[\r\n]+', ' ').Length)) } else { $null }
+    project_root = $ProjectRoot
+    config_path = $ConfigPath
+    watcher_entry_path = $WatcherEntryPath
+    validator_module_path = (Join-Path $ProjectRoot "dist\assessments\assessmentStore.js")
+    runtime_build_layout = $RuntimeBuildLayout
   }
   $temporary = "$WatcherStatusFile.tmp"
   $payload | ConvertTo-Json -Depth 4 | Set-Content -LiteralPath $temporary -Encoding UTF8
@@ -304,21 +433,30 @@ function Start-OwnedWatcherProcess {
   $script:WatcherHealthySince = $null
   $previousWatcherInstanceId = $env:PATCHWARDEN_WATCHER_INSTANCE_ID
   $previousWatcherLauncherPid = $env:PATCHWARDEN_WATCHER_LAUNCHER_PID
+  $previousToolProfile = $env:PATCHWARDEN_TOOL_PROFILE
   $previousXdgConfigHome = $env:XDG_CONFIG_HOME
   $previousPath = $env:PATH
+  $previousControlPlaneApiKey = $env:CONTROL_PLANE_API_KEY
+  $previousOwnerToken = $env:PATCHWARDEN_OWNER_TOKEN
   try {
     $env:PATCHWARDEN_WATCHER_INSTANCE_ID = $script:WatcherInstanceId
     $env:PATCHWARDEN_WATCHER_LAUNCHER_PID = [string]$PID
+    $env:PATCHWARDEN_TOOL_PROFILE = $ToolProfile
     $env:XDG_CONFIG_HOME = $OpencodeConfigHome
     if ($OpencodeBin) { $env:PATH = "$OpencodeBin;$env:PATH" }
+    Remove-Item Env:CONTROL_PLANE_API_KEY -ErrorAction SilentlyContinue
+    Remove-Item Env:PATCHWARDEN_OWNER_TOKEN -ErrorAction SilentlyContinue
     $script:WatcherProcess = Start-Process -FilePath $node `
-      -ArgumentList @((Join-Path $ProjectRoot "dist\runner\watch.js")) `
+      -ArgumentList @($WatcherEntryPath) `
       -WorkingDirectory $ProjectRoot -PassThru -WindowStyle Hidden `
       -RedirectStandardOutput $stdout -RedirectStandardError $stderr
   } finally {
     if ($null -eq $previousWatcherInstanceId) { Remove-Item Env:PATCHWARDEN_WATCHER_INSTANCE_ID -ErrorAction SilentlyContinue } else { $env:PATCHWARDEN_WATCHER_INSTANCE_ID = $previousWatcherInstanceId }
     if ($null -eq $previousWatcherLauncherPid) { Remove-Item Env:PATCHWARDEN_WATCHER_LAUNCHER_PID -ErrorAction SilentlyContinue } else { $env:PATCHWARDEN_WATCHER_LAUNCHER_PID = $previousWatcherLauncherPid }
+    if ($null -eq $previousToolProfile) { Remove-Item Env:PATCHWARDEN_TOOL_PROFILE -ErrorAction SilentlyContinue } else { $env:PATCHWARDEN_TOOL_PROFILE = $previousToolProfile }
     if ($null -eq $previousXdgConfigHome) { Remove-Item Env:XDG_CONFIG_HOME -ErrorAction SilentlyContinue } else { $env:XDG_CONFIG_HOME = $previousXdgConfigHome }
+    if ($null -eq $previousControlPlaneApiKey) { Remove-Item Env:CONTROL_PLANE_API_KEY -ErrorAction SilentlyContinue } else { $env:CONTROL_PLANE_API_KEY = $previousControlPlaneApiKey }
+    if ($null -eq $previousOwnerToken) { Remove-Item Env:PATCHWARDEN_OWNER_TOKEN -ErrorAction SilentlyContinue } else { $env:PATCHWARDEN_OWNER_TOKEN = $previousOwnerToken }
     $env:PATH = $previousPath
   }
   Write-WatcherStatus -Status "starting"
@@ -333,6 +471,13 @@ function Start-PatchWardenWatcher {
     Write-Host "[watch] Existing watcher heartbeat is fresh; it remains external and will not be managed."
     return
   }
+  $lockRepair = Repair-StaleWatcherLock
+  if ($lockRepair -eq "expected_watcher_alive" -or $lockRepair -eq "unverified") {
+    $script:WatcherManaged = $false
+    Write-WatcherStatus -Status "external_stale" -LastError "A stale watcher lock could not be safely retired."
+    Write-Host "[watch] Stale watcher lock retained because process ownership could not be disproved."
+    return
+  }
   Start-OwnedWatcherProcess
 }
 
@@ -368,7 +513,12 @@ function Invoke-WatcherSupervisorTick {
 
 function Get-TunnelHealth {
   if (-not (Test-Path -LiteralPath $HealthUrlFile) -or -not (Test-Path -LiteralPath $PidFile)) { return $null }
-  $output = (& $TunnelClientExe health --json --url-file $HealthUrlFile --pid-file $PidFile 2>&1 | Out-String)
+  $savedAgentEnvironment = Suspend-AgentProviderEnvironment
+  try {
+    $output = (& $TunnelClientExe health --json --url-file $HealthUrlFile --pid-file $PidFile 2>&1 | Out-String)
+  } finally {
+    Restore-AgentProviderEnvironment -Saved $savedAgentEnvironment
+  }
   try { return $output | ConvertFrom-Json } catch { return $null }
 }
 
@@ -505,8 +655,7 @@ if (-not $TunnelClientExe) {
 
 # Search common installation locations
 $commonPaths = @(
-  $DefaultTunnelClientPath
-  Join-Path $env:LOCALAPPDATA "patchwarden\tunnel-client.exe"
+  Join-Path $env:LOCALAPPDATA "PatchWarden\tunnel-client.exe"
   Join-Path $env:APPDATA "tunnel-client\tunnel-client.exe"
   Join-Path $env:USERPROFILE "tunnel-client\tunnel-client.exe"
 )
@@ -525,11 +674,8 @@ if (-not $TunnelClientExe) {
   Write-Host "[input] tunnel-client.exe not found on PATH or common locations." -ForegroundColor Yellow
   Write-Host "        Please provide the full path."
   Write-Host ""
-  Write-Host "        To search for it manually, try one of these commands:" -ForegroundColor Cyan
-  Write-Host "          Get-ChildItem -Path `$env:LOCALAPPDATA -Recurse -Filter tunnel-client.exe -ErrorAction SilentlyContinue" -ForegroundColor Gray
-  Write-Host "          Get-ChildItem -Path `$env:APPDATA -Recurse -Filter tunnel-client.exe -ErrorAction SilentlyContinue" -ForegroundColor Gray
-  Write-Host "          Get-ChildItem -Path C:\ -Recurse -Filter tunnel-client.exe -ErrorAction SilentlyContinue" -ForegroundColor Gray
-  Write-Host "        Or download it from: https://platform.openai.com/docs/guides/mcp-connector" -ForegroundColor Cyan
+  Write-Host "        Desktop users can open Settings -> MCP and tunnel -> Auto detect / Choose file." -ForegroundColor Cyan
+  Write-Host "        The desktop guide explains trusted downloads and SHA256 verification." -ForegroundColor Cyan
   Write-Host ""
   $TunnelClientExe = Read-Host "Path to tunnel-client.exe"
 }
@@ -556,7 +702,7 @@ if (-not $TunnelId -and (Test-Path -LiteralPath $ProfilePath)) {
     $profileContent = Get-Content -LiteralPath $ProfilePath -Raw -Encoding UTF8
     if ($profileContent -match 'tunnel_id:\s*"([^"]+)"') {
       $TunnelId = $matches[1]
-      Write-Host "[detect] Tunnel ID read from profile $Profile`: $TunnelId" -ForegroundColor Green
+      Write-Host "[detect] Tunnel ID read from profile $Profile." -ForegroundColor Green
     }
   } catch {
     Write-Host "[warn] Could not read Tunnel ID from $ProfilePath`: $($_.Exception.Message)" -ForegroundColor Yellow
@@ -580,8 +726,15 @@ if (-not (Test-Path -LiteralPath (Join-Path $ProjectRoot "dist\index.js"))) {
 New-Item -ItemType Directory -Force -Path $RuntimeDirectory | Out-Null
 $env:PATCHWARDEN_CONFIG = $ConfigPath
 Write-Host "[manifest] Verifying the exact $ToolProfile stdio MCP tool catalog..."
-$manifestOutput = (& node (Join-Path $ProjectRoot "scripts\checks\mcp-manifest-check.js") --profile $ToolProfile --json 2>&1 | Out-String).Trim()
-if ($LASTEXITCODE -ne 0) {
+$previousErrorActionPreference = $ErrorActionPreference
+try {
+  $ErrorActionPreference = "Continue"
+  $manifestOutput = (& node (Join-Path $ProjectRoot "scripts\checks\mcp-manifest-check.js") --profile $ToolProfile --json 2>&1 | Out-String).Trim()
+  $manifestExitCode = $LASTEXITCODE
+} finally {
+  $ErrorActionPreference = $previousErrorActionPreference
+}
+if ($manifestExitCode -ne 0) {
   Write-TunnelStatus -Status "stopped" -ReasonCode "tool_manifest_check_failed" -LastError "The tunnel MCP tool manifest preflight failed."
   throw "Tool manifest preflight failed: $manifestOutput"
 }
@@ -601,10 +754,6 @@ Write-Host "[config] health listen addr: $HealthListenAddr"
 Set-SecretEnvIfMissing
 
 $env:PATCHWARDEN_CONFIG = $ConfigPath
-$env:HTTP_PROXY = $ProxyUrl
-$env:HTTPS_PROXY = $ProxyUrl
-$env:ALL_PROXY = $ProxyUrl
-$env:NO_PROXY = "localhost,127.0.0.1,::1"
 
 $profileNeedsInit = $true
 if (Test-Path -LiteralPath $ProfilePath) {
@@ -614,12 +763,17 @@ if (Test-Path -LiteralPath $ProfilePath) {
 
 if ($profileNeedsInit) {
   Write-Host "[init] Creating tunnel-client profile: $Profile"
-  & $TunnelClientExe init `
-    --sample sample_mcp_stdio_local `
-    --profile $Profile `
-    --tunnel-id $TunnelId `
-    --mcp-command $McpStdioLauncherForTunnel `
-    --force
+  $savedAgentEnvironment = Suspend-AgentProviderEnvironment
+  try {
+    & $TunnelClientExe init `
+      --sample sample_mcp_stdio_local `
+      --profile $Profile `
+      --tunnel-id $TunnelId `
+      --mcp-command $McpStdioLauncherForTunnel `
+      --force
+  } finally {
+    Restore-AgentProviderEnvironment -Saved $savedAgentEnvironment
+  }
   Set-ProfileHealthListenAddr -ProfilePath $ProfilePath -HealthListenAddr $HealthListenAddr
 } else {
   Set-ProfileHealthListenAddr -ProfilePath $ProfilePath -HealthListenAddr $HealthListenAddr
@@ -628,7 +782,7 @@ if ($profileNeedsInit) {
 $env:PATCHWARDEN_TUNNEL_STATUS_FILE = $StatusFile
 if (-not $SkipWatcher) { Start-PatchWardenWatcher }
 
-Write-Host "[doctor] Checking tunnel-client profile through the configured proxy..."
+Write-Host "[doctor] Checking tunnel-client profile (proxy mode: $ProxyMode)..."
 $preflightAttempt = 0
 $preflightMaxRetries = 3
 $doctor = Invoke-TunnelDoctor
@@ -665,8 +819,7 @@ Write-Host "[run-config] health url file: $HealthUrlFile"
 Write-Host "[run-config] pid file: $PidFile"
 Write-Host "[run-config] stdout log: $StdoutLogFile"
 Write-Host "[run-config] stderr log: $StderrLogFile"
-Write-Host "[run-config] HTTPS_PROXY: $env:HTTPS_PROXY"
-Write-Host "[run-config] HTTP_PROXY: $env:HTTP_PROXY"
+Write-Host "[run-config] proxy mode: $ProxyMode"
 Write-Host "[run-config] CONTROL_PLANE_API_KEY: $(if ($env:CONTROL_PLANE_API_KEY) { 'set' } else { 'missing' })"
 Write-Host "[run-config] cwd: $ProjectRoot"
 Write-Host ""
@@ -681,18 +834,23 @@ try {
     Write-TunnelStatus -Status "starting" -ReasonCode $null -Ready $false -Attempt $attempt
     $runArguments = @(
       "run", "--profile", $Profile,
-      "--http-proxy", "env:HTTPS_PROXY",
       "--health.url-file", $HealthUrlFile,
       "--pid.file", $PidFile,
       "--log.format", "json"
     )
+    if ($script:UseProxyArgument) { $runArguments += @("--http-proxy", "env:HTTPS_PROXY") }
     if ($openUi) { $runArguments += "--open-web-ui"; $openUi = $false }
     $argumentLine = ($runArguments | ForEach-Object { Quote-ProcessArgument $_ }) -join " "
     Write-Host "[run-config] command: tunnel-client $($runArguments -join ' ')"
     $redirectedCommand = '""' + $TunnelClientExe + '" ' + $argumentLine + ' 1>"' + $StdoutLogFile + '" 2>"' + $StderrLogFile + '""'
     $processArgumentLine = '/d /s /c ' + $redirectedCommand
-    $script:TunnelProcess = Start-Process -FilePath $env:ComSpec -ArgumentList $processArgumentLine `
-      -WorkingDirectory $ProjectRoot -PassThru -WindowStyle Hidden
+    $savedAgentEnvironment = Suspend-AgentProviderEnvironment
+    try {
+      $script:TunnelProcess = Start-Process -FilePath $env:ComSpec -ArgumentList $processArgumentLine `
+        -WorkingDirectory $ProjectRoot -PassThru -WindowStyle Hidden
+    } finally {
+      Restore-AgentProviderEnvironment -Saved $savedAgentEnvironment
+    }
     Write-TunnelStatus -Status "connecting" -ReasonCode $null -Ready $false -Attempt $attempt -ProcessId $script:TunnelProcess.Id
     Write-Host "[run] supervised command PID $($script:TunnelProcess.Id), attempt $attempt"
 

package/scripts/e2e/demo-runtime.mjs

@@ -0,0 +1,153 @@
+#!/usr/bin/env node
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { join, resolve } from "node:path";
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
+
+const runtimeRoot = resolve(process.env.PATCHWARDEN_RUNTIME_ROOT || join(import.meta.dirname, "..", "..", "release", "desktop", "win-unpacked", "resources", "core"));
+const configPath = resolve(process.env.PATCHWARDEN_CONFIG || join(process.env.LOCALAPPDATA || "", "PatchWarden", "patchwarden.config.json"));
+const fixture = resolve(process.env.PATCHWARDEN_DEMO_FIXTURE || join(process.env.PATCHWARDEN_WORKSPACE || "D:/ai_agent/patchwarden_program", "patchwarden-demo-fixture"));
+const evidencePath = resolve(process.env.PATCHWARDEN_DEMO_EVIDENCE || join(process.env.PATCHWARDEN_WORKSPACE || "D:/ai_agent/patchwarden_program", ".patchwarden", "demo-runtime-evidence.json"));
+const mode = process.argv[2] || "core-prepare";
+const profile = mode === "direct" ? "chatgpt_direct" : "chatgpt_core";
+
+function decode(result) {
+  if (result?.isError) {
+    const message = result.content?.find((item) => item.type === "text")?.text || "MCP tool error";
+    throw new Error(message);
+  }
+  const text = result?.content?.find((item) => item.type === "text")?.text;
+  if (typeof text !== "string") return result;
+  try { return JSON.parse(text); } catch { return { text }; }
+}
+
+async function connect() {
+  const transport = new StdioClientTransport({
+    command: process.execPath,
+    args: [join(runtimeRoot, "dist", "index.js")],
+    cwd: runtimeRoot,
+    env: {
+      ...process.env,
+      PATCHWARDEN_CONFIG: configPath,
+      PATCHWARDEN_TOOL_PROFILE: profile,
+    },
+    stderr: "pipe",
+  });
+  const client = new Client({ name: "patchwarden-demo-e2e", version: "1.0.0" }, { capabilities: {} });
+  await client.connect(transport);
+  return client;
+}
+
+async function call(client, name, args = {}) {
+  return decode(await client.callTool({ name, arguments: args }));
+}
+
+async function waitForTask(client, taskId) {
+  for (;;) {
+    const result = await call(client, "wait_for_task", { task_id: taskId, wait_seconds: 30 });
+    if (!result?.continuation_required) return result;
+  }
+}
+
+function saveEvidence(value) {
+  mkdirSync(resolve(evidencePath, ".."), { recursive: true });
+  writeFileSync(evidencePath, JSON.stringify(value, null, 2), "utf8");
+}
+
+function loadEvidence() {
+  return JSON.parse(readFileSync(evidencePath, "utf8"));
+}
+
+async function runCorePrepare(client) {
+  const health = await call(client, "health_check", { detail: "self_diagnostic" });
+  const agents = await call(client, "list_agents");
+  const ordinary = await call(client, "create_task", {
+    template: "inspect_only",
+    goal: "Read the Demo fixture README and package.json, run the configured tests, and return a short verification summary. Do not modify files.",
+    repo_path: "patchwarden-demo-fixture",
+    agent: "codex",
+    verify_commands: ["npm test", "npm run lint"],
+    timeout_seconds: 180,
+  });
+  const ordinarySummary = await waitForTask(client, ordinary.task_id);
+  const ordinaryAudit = await call(client, "audit_task", { task_id: ordinary.task_id });
+  const assessmentArgs = {
+    execution_mode: "assess_only",
+    template: "inspect_only",
+    goal: "Read the Demo fixture README and package.json, run npm test and npm run lint, and return a short verification summary. Do not modify files.",
+    repo_path: "patchwarden-demo-fixture",
+    agent: "codex",
+    verify_commands: ["npm test", "npm run lint"],
+    timeout_seconds: 180,
+  };
+  const assessmentBeforeRestart = await call(client, "create_task", assessmentArgs);
+  const assessmentPolicyChange = await call(client, "create_task", assessmentArgs);
+  saveEvidence({
+    created_at: new Date().toISOString(),
+    profile,
+    runtime_root: runtimeRoot,
+    config_path: configPath,
+    fixture,
+    health,
+    agents,
+    ordinary_task_id: ordinary.task_id,
+    ordinary_summary: ordinarySummary,
+    ordinary_audit: ordinaryAudit,
+    assessment_before_restart: assessmentBeforeRestart,
+    assessment_policy_change: assessmentPolicyChange,
+  });
+  console.log(JSON.stringify({ ordinary_task_id: ordinary.task_id, assessment_before_restart: assessmentBeforeRestart, assessment_policy_change: assessmentPolicyChange }, null, 2));
+}
+
+async function runCoreExecute(client) {
+  const evidence = loadEvidence();
+  const first = evidence.assessment_before_restart;
+  const second = evidence.assessment_policy_change;
+  const execute = await call(client, "create_task", { execution_mode: "execute", assessment_id: first.assessment_id });
+  const summary = await waitForTask(client, execute.task_id);
+  const audit = await call(client, "audit_task", { task_id: execute.task_id });
+  const policyDir = join(fixture, ".patchwarden");
+  mkdirSync(policyDir, { recursive: true });
+  writeFileSync(join(policyDir, "project-policy.json"), JSON.stringify({ allowed_commands: ["node --check main.js"] }, null, 2), "utf8");
+  let stale = null;
+  try {
+    stale = await call(client, "create_task", { execution_mode: "execute", assessment_id: second.assessment_id });
+  } catch (error) {
+    stale = { error: error instanceof Error ? error.message : String(error) };
+  }
+  saveEvidence({ ...evidence, execute_task_id: execute.task_id, execute_summary: summary, execute_audit: audit, stale_after_policy_change: stale });
+  console.log(JSON.stringify({ execute_task_id: execute.task_id, execute_summary: summary, execute_audit: audit, stale_after_policy_change: stale }, null, 2));
+}
+
+async function runDirect(client) {
+  const health = await call(client, "health_check", { detail: "self_diagnostic" });
+  const session = await call(client, "create_direct_session", { repo_path: "patchwarden-demo-fixture", title: "PatchWarden Demo Direct verification" });
+  const file = await call(client, "read_workspace_file", { session_id: session.session_id, path: "main.js" });
+  const verification = await call(client, "run_direct_verification_bundle", {
+    session_id: session.session_id,
+    commands: ["npm test", "npm run lint", "node --check main.js"],
+    timeout_seconds: 120,
+  });
+  const finalized = await call(client, "finalize_direct_session", { session_id: session.session_id });
+  const audit = await call(client, "audit_session", { session_id: session.session_id });
+  saveEvidence({ direct_health: health, direct_session_id: session.session_id, direct_file: { sha256: file.sha256, bytes: file.bytes }, direct_verification: verification, direct_finalized: finalized, direct_audit: audit });
+  console.log(JSON.stringify({ direct_session_id: session.session_id, direct_verification: verification, direct_audit: audit }, null, 2));
+}
+
+async function runStatus(client) {
+  const health = await call(client, "health_check", { detail: "self_diagnostic" });
+  const agents = await call(client, "list_agents");
+  const tasks = await call(client, "list_tasks", { active_only: true, limit: 50 });
+  console.log(JSON.stringify({ health, agents, active_tasks: tasks }, null, 2));
+}
+
+const client = await connect();
+try {
+  if (mode === "core-prepare") await runCorePrepare(client);
+  else if (mode === "core-execute") await runCoreExecute(client);
+  else if (mode === "direct") await runDirect(client);
+  else if (mode === "status") await runStatus(client);
+  else throw new Error(`Unsupported demo mode: ${mode}`);
+} finally {
+  await client.close();
+}

package/{PatchWarden-Control-Tray.cmd → scripts/launchers/PatchWarden-Control-Tray.cmd}

@@ -1,11 +1,11 @@
 @echo off
 setlocal
-cd /d "%~dp0"
+cd /d "%~dp0..\.."
 if /i "%~1"=="--foreground" (
-  powershell.exe -NoProfile -ExecutionPolicy Bypass -File "%~dp0scripts\control\control-center-tray.ps1" %*
+  powershell.exe -NoProfile -ExecutionPolicy Bypass -File "%~dp0..\control\control-center-tray.ps1" %*
   set EXITCODE=%ERRORLEVEL%
   endlocal & exit /b %EXITCODE%
 )
 
-start "" powershell.exe -NoProfile -ExecutionPolicy Bypass -WindowStyle Hidden -File "%~dp0scripts\control\control-center-tray.ps1" %*
+start "" powershell.exe -NoProfile -ExecutionPolicy Bypass -WindowStyle Hidden -File "%~dp0..\control\control-center-tray.ps1" %*
 endlocal & exit /b 0

package/scripts/launchers/PatchWarden-Control.cmd

@@ -0,0 +1,6 @@
+@echo off
+setlocal
+cd /d "%~dp0..\.."
+powershell -ExecutionPolicy Bypass -NoProfile -File "%~dp0..\control\start-control-center.ps1" %*
+set EXITCODE=%ERRORLEVEL%
+endlocal & exit /b %EXITCODE%

package/{PatchWarden-Desktop.cmd → scripts/launchers/PatchWarden-Desktop.cmd}

@@ -1,5 +1,5 @@
 @echo off
 setlocal
-cd /d "%~dp0"
-start "" powershell.exe -NoProfile -ExecutionPolicy Bypass -WindowStyle Hidden -File "%~dp0scripts\control\control-center-tray.ps1" %*
+cd /d "%~dp0..\.."
+start "" powershell.exe -NoProfile -ExecutionPolicy Bypass -WindowStyle Hidden -File "%~dp0..\control\control-center-tray.ps1" %*
 endlocal & exit /b 0

package/scripts/launchers/Restart-PatchWarden-Control.cmd

@@ -0,0 +1,6 @@
+@echo off
+setlocal
+cd /d "%~dp0..\.."
+powershell -ExecutionPolicy Bypass -NoProfile -File "%~dp0..\control\restart-control-center.ps1" %*
+set EXITCODE=%ERRORLEVEL%
+endlocal & exit /b %EXITCODE%

package/{Stop-PatchWarden.cmd → scripts/launchers/Stop-PatchWarden.cmd}

@@ -1,7 +1,7 @@
 @echo off
 setlocal
-cd /d "%~dp0"
-powershell -ExecutionPolicy Bypass -NoProfile -File "%~dp0scripts\control\stop-patchwarden.ps1" %*
+cd /d "%~dp0..\.."
+powershell -ExecutionPolicy Bypass -NoProfile -File "%~dp0..\control\stop-patchwarden.ps1" %*
 set EXITCODE=%ERRORLEVEL%
 if not "%EXITCODE%"=="0" (
   echo.

package/scripts/lib/clean-generated-output.js

@@ -0,0 +1,11 @@
+import { rmSync } from "node:fs";
+import { basename, dirname, resolve } from "node:path";
+
+export function cleanGeneratedOutput(projectRoot, outputPath) {
+  const root = resolve(projectRoot);
+  const output = resolve(outputPath);
+  if (dirname(output) !== root || basename(output).toLowerCase() !== "dist") {
+    throw new Error(`Refusing to clean non-dist output: ${output}`);
+  }
+  rmSync(output, { recursive: true, force: true });
+}

package/scripts/lib/file-discovery.js

@@ -0,0 +1,12 @@
+import { readdirSync } from "node:fs";
+import { resolve } from "node:path";
+
+export function collectMatchingFiles(directory, predicate) {
+  return readdirSync(directory, { withFileTypes: true })
+    .sort((left, right) => left.name.localeCompare(right.name))
+    .flatMap((entry) => {
+      const path = resolve(directory, entry.name);
+      if (entry.isDirectory()) return collectMatchingFiles(path, predicate);
+      return entry.isFile() && predicate(entry.name, path) ? [path] : [];
+    });
+}