mixdog 0.9.21 → 0.9.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mixdog",
-  "version": "0.9.21",
+  "version": "0.9.22",
   "private": false,
   "type": "module",
   "description": "Standalone mixdog coding-agent CLI/TUI workspace.",

package/scripts/build-runtime-windows.ps1

@@ -1,242 +1,242 @@
-# build-runtime-windows.ps1 — Build PostgreSQL 16 + pgvector runtime on Windows.
-# Uses windows-2022 GHA runner's preinstalled PostgreSQL 16 (consistent
-# pg_config + postgres.exe from same package) — avoids EDB zip's split-version
-# packaging bug that linked pgvector against PG 14 ABI.
-# Builds pgvector from source via MSVC/nmake, then assembles a self-contained
-# runtime tree (bin + lib + share at root). Final smoke: initdb + CREATE
-# EXTENSION vector + distance query.
-# Produces: dist\mixdog-runtime-win32-x64-pg{pgver}-pgvector{vecver}.tar.gz
-
-$ErrorActionPreference = 'Stop'
-
-$PG_VERSION       = '16.4'
-$PGVECTOR_VERSION = '0.8.2'
-$TARGET_OS        = $env:TARGET_OS   ?? 'win32'
-$TARGET_ARCH      = $env:TARGET_ARCH ?? 'x64'
-
-# Auto-detect highest preinstalled PG ≥ 16 OR install via chocolatey.
-$PgInstallRoot = 'C:\Program Files\PostgreSQL'
-
-function Find-PgRoot {
-    if (-not (Test-Path $PgInstallRoot)) { return $null }
-    $cands = Get-ChildItem $PgInstallRoot -Directory -ErrorAction SilentlyContinue |
-        Where-Object { $_.Name -match '^(\d+)' } |
-        Sort-Object { [int]([regex]::Match($_.Name, '^(\d+)').Groups[1].Value) } -Descending
-    foreach ($c in $cands) {
-        $major = [int]([regex]::Match($c.Name, '^(\d+)').Groups[1].Value)
-        if ($major -ge 16 -and (Test-Path "$($c.FullName)\bin\pg_config.exe")) {
-            return $c.FullName
-        }
-    }
-    return $null
-}
-
-$PgRoot = Find-PgRoot
-if (-not $PgRoot) {
-    Write-Host "==> No preinstalled PG ≥ 16 found. Installing via chocolatey..."
-    if (Test-Path $PgInstallRoot) {
-        Write-Host "Existing PG dirs (none usable):"
-        Get-ChildItem $PgInstallRoot -Directory -ErrorAction SilentlyContinue | Select-Object Name
-    }
-    choco install postgresql16 --version=16.4.0 --params '/Password:postgres' -y --no-progress 2>&1 | Out-Host
-    if ($LASTEXITCODE -ne 0) { Write-Error "choco install postgresql16 failed (exit $LASTEXITCODE)"; exit 1 }
-    $PgRoot = Find-PgRoot
-    if (-not $PgRoot) {
-        Write-Error "ASSERT FAILED: chocolatey install completed but PG ≥ 16 still not found under $PgInstallRoot"
-        Get-ChildItem $PgInstallRoot -Directory -ErrorAction SilentlyContinue | Select-Object Name
-        exit 1
-    }
-}
-
-$ScriptDir  = Split-Path -Parent $MyInvocation.MyCommand.Path
-$RootDir    = (Resolve-Path "$ScriptDir\..").Path
-$BuildDir   = "$RootDir\build\runtime-win32-$TARGET_ARCH"
-$DistDir    = "$RootDir\dist"
-$RuntimeDir = "$BuildDir\runtime"
-
-$PgBin    = "$PgRoot\bin"
-$PgConfig = "$PgBin\pg_config.exe"
-
-$OutputName = "mixdog-runtime-${TARGET_OS}-${TARGET_ARCH}-pg${PG_VERSION}-pgvector${PGVECTOR_VERSION}.tar.gz"
-
-Write-Host "==> Using preinstalled PG: $PgRoot"
-& $PgConfig --version
-$RealVersion = (& $PgConfig --version) -replace 'PostgreSQL ', ''
-Write-Host "  pg_config reports version: $RealVersion"
-
-if (Test-Path $RuntimeDir) { Remove-Item -Recurse -Force $RuntimeDir }
-New-Item -ItemType Directory -Force -Path $BuildDir, $DistDir,
-  "$RuntimeDir\bin", "$RuntimeDir\lib", "$RuntimeDir\share" | Out-Null
-
-Write-Host "==> Cloning pgvector $PGVECTOR_VERSION"
-$PgVectorDir = "$BuildDir\pgvector"
-$VectorDllBuilt = "$PgVectorDir\vector.dll"
-
-if (Test-Path $VectorDllBuilt) {
-    Write-Host "  Cache hit: vector.dll already built at $VectorDllBuilt"
-} else {
-    if (Test-Path $PgVectorDir) { Remove-Item -Recurse -Force $PgVectorDir }
-    git clone --branch "v$PGVECTOR_VERSION" --depth 1 `
-        https://github.com/pgvector/pgvector.git $PgVectorDir
-
-    Write-Host "==> Building pgvector (MSVC/nmake against system PG 16)"
-    Push-Location $PgVectorDir
-    try {
-        $VsWhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
-        $VcVarsAll = & $VsWhere -latest -find 'VC\Auxiliary\Build\vcvarsall.bat' 2>$null | Select-Object -First 1
-        if (-not $VcVarsAll) {
-            Write-Error "vswhere could not locate vcvarsall.bat — Visual Studio Build Tools required."
-            exit 1
-        }
-        # CRITICAL: prepend $PgRoot\bin to PATH so any bare `pg_config` call
-        # inside Makefile.win resolves to PG 16 — runner has PG 14/15
-        # preinstalled and would otherwise win the PATH lookup, producing
-        # PG14-ABI vector.dll that fails to load in our PG 16 postgres.exe.
-        # Set in PowerShell so cmd /c inherits; setting inside the cmd batch
-        # via %PATH% loses vcvarsall's additions due to parse-time expansion.
-        $env:PATH = "$PgRoot\bin;$env:PATH"
-        $env:PGROOT = $PgRoot
-        $BuildCmd = "`"$VcVarsAll`" amd64 && nmake /F Makefile.win PG_CONFIG=`"$PgConfig`""
-        cmd /c $BuildCmd
-        if ($LASTEXITCODE -ne 0) {
-            Write-Error "pgvector nmake build failed (exit $LASTEXITCODE)"
-            exit 1
-        }
-    } finally {
-        Pop-Location
-    }
-}
-
-Write-Host "==> Assembling runtime layout — copy bin (.exe + .dll), lib, share from $PgRoot"
-# Copy ALL .exe + .dll from PG bin so postgres.exe + libpq.dll + libcrypto/libssl/
-# libintl/libiconv/icu*/libxml2/libxslt/libwinpthread/libecpg/libpgtypes etc. all
-# ship together. PG 16 install layout puts these all in bin\.
-Copy-Item "$PgBin\*.exe","$PgBin\*.dll" "$RuntimeDir\bin\" -Force
-
-# lib\: PG extension modules (incl. contrib like pgcrypto.dll). vector.dll
-# placed here below — PG looks for $libdir/<ext>.dll which resolves to lib\.
-Copy-Item -Recurse -Force "$PgRoot\lib\*"   "$RuntimeDir\lib\"   -ErrorAction SilentlyContinue
-# share\: extension SQL/control, locale, timezone data, conf samples.
-Copy-Item -Recurse -Force "$PgRoot\share\*" "$RuntimeDir\share\" -ErrorAction SilentlyContinue
-
-Write-Host "==> Manually staging pgvector artifacts (avoid pg_config-derived install paths)"
-$RuntimeExtDir = "$RuntimeDir\share\extension"
-New-Item -ItemType Directory -Force -Path $RuntimeExtDir | Out-Null
-Copy-Item "$PgVectorDir\vector.dll"        "$RuntimeDir\lib\"  -Force
-Copy-Item "$PgVectorDir\vector.control"    $RuntimeExtDir      -Force
-Copy-Item "$PgVectorDir\sql\vector--*.sql" $RuntimeExtDir      -Force
-
-Write-Host "==> Asserting runtime layout"
-$VectorControl = "$RuntimeDir\share\extension\vector.control"
-if (-not (Test-Path $VectorControl)) { Write-Error "ASSERT FAILED: $VectorControl not found"; exit 1 }
-$VectorSql = "$RuntimeDir\share\extension\vector--$PGVECTOR_VERSION.sql"
-if (-not (Test-Path $VectorSql))     { Write-Error "ASSERT FAILED: $VectorSql not found"; exit 1 }
-if (-not (Test-Path "$RuntimeDir\lib\vector.dll")) {
-    Write-Error "ASSERT FAILED: vector.dll not found in lib\"
-    exit 1
-}
-Write-Host "  PASS runtime layout"
-
-# Licenses
-if (Test-Path "$PgRoot\doc\postgresql\COPYRIGHT") {
-    Copy-Item "$PgRoot\doc\postgresql\COPYRIGHT" "$RuntimeDir\LICENSE.postgresql" -Force
-} elseif (Test-Path "$PgRoot\doc\COPYRIGHT") {
-    Copy-Item "$PgRoot\doc\COPYRIGHT" "$RuntimeDir\LICENSE.postgresql" -Force
-}
-if (Test-Path "$PgVectorDir\LICENSE") {
-    Copy-Item "$PgVectorDir\LICENSE" "$RuntimeDir\LICENSE.pgvector" -Force
-}
-
-Write-Host "==> Self-contained smoke test (initdb + CREATE EXTENSION vector + distance query)"
-& "$RuntimeDir\bin\postgres.exe" --version
-if ($LASTEXITCODE -ne 0) { Write-Error "FAIL: postgres.exe --version exit $LASTEXITCODE"; exit 1 }
-
-$SmokeData = "$BuildDir\smoke-pgdata"
-$SmokeLog  = "$BuildDir\smoke-pg.log"
-$SmokePort = 55899
-if (Test-Path $SmokeData) { Remove-Item -Recurse -Force $SmokeData }
-
-& "$RuntimeDir\bin\initdb.exe" -D $SmokeData --username=postgres --auth-local=trust --no-locale -E UTF8 | Out-Null
-if ($LASTEXITCODE -ne 0) { Write-Error "FAIL: initdb"; exit 1 }
-
-& "$RuntimeDir\bin\pg_ctl.exe" -D $SmokeData -o "-p $SmokePort -h 127.0.0.1" -l $SmokeLog -w start
-if ($LASTEXITCODE -ne 0) { Write-Error "FAIL: pg_ctl start (see $SmokeLog)"; Get-Content $SmokeLog | Select-Object -Last 30; exit 1 }
-
-try {
-    & "$RuntimeDir\bin\psql.exe" -h 127.0.0.1 -p $SmokePort -U postgres -d postgres -c "CREATE EXTENSION vector;" | Out-Null
-    if ($LASTEXITCODE -ne 0) { throw "CREATE EXTENSION vector failed" }
-    $ExtV = & "$RuntimeDir\bin\psql.exe" -h 127.0.0.1 -p $SmokePort -U postgres -d postgres -tAc "SELECT extversion FROM pg_extension WHERE extname='vector';"
-    $Dist = & "$RuntimeDir\bin\psql.exe" -h 127.0.0.1 -p $SmokePort -U postgres -d postgres -tAc "SELECT '[1,2,3]'::vector <-> '[1,2,4]'::vector;"
-    Write-Host "  vector extension version: $ExtV"
-    Write-Host "  distance query result:    $Dist"
-    if ($ExtV.Trim() -ne $PGVECTOR_VERSION) {
-        Write-Error "FAIL: extversion='$ExtV' expected='$PGVECTOR_VERSION'"
-        exit 1
-    }
-    Write-Host "  PASS smoke (extension load + vector distance)"
-}
-finally {
-    & "$RuntimeDir\bin\pg_ctl.exe" -D $SmokeData -m fast stop 2>$null | Out-Null
-    Remove-Item -Recurse -Force $SmokeData -ErrorAction SilentlyContinue
-}
-
-Write-Host "==> Creating tarball: $OutputName"
-$DistDirFwd    = $DistDir.Replace('\', '/')
-$RuntimeDirFwd = $RuntimeDir.Replace('\', '/')
-& tar -czf "$DistDirFwd/$OutputName" -C "$RuntimeDirFwd" .
-if ($LASTEXITCODE -ne 0) { Write-Error "tar failed (exit $LASTEXITCODE)"; exit 1 }
-
-Write-Host "==> Generating sha256 sidecar"
-Push-Location $DistDir
-$Hash = (Get-FileHash -Algorithm SHA256 $OutputName).Hash.ToLower()
-"$Hash  $OutputName" | Out-File -Encoding ascii "${OutputName}.sha256"
-Pop-Location
-
-# ---------------------------------------------------------------------------
-# Phase A: Re-smoke from EXTRACTED tarball with hostile env (cleared PATH,
-# only system32). Catches false-pass where the build host has VC redist /
-# preinstalled DLLs that the tarball might be missing.
-# ---------------------------------------------------------------------------
-Write-Host "==> Re-smoke from extracted tarball (hostile env)"
-$ExtractDir = "$BuildDir\extract-smoke"
-if (Test-Path $ExtractDir) { Remove-Item -Recurse -Force $ExtractDir }
-New-Item -ItemType Directory -Force -Path $ExtractDir | Out-Null
-& tar -xzf "$DistDirFwd/$OutputName" -C ($ExtractDir.Replace('\','/'))
-if ($LASTEXITCODE -ne 0) { Write-Error "extract failed"; exit 1 }
-
-$ExtractData = "$ExtractDir\extract-pgdata"
-$ExtractLog  = "$ExtractDir\extract-pg.log"
-$ExtractPort = 55898
-
-# Snapshot current env, then strip to minimal Windows PATH (no PG14/15/16
-# preinstalled bin, no chocolatey, no MSVC tools).
-$SavedPath  = $env:PATH
-$SavedPgRoot = $env:PGROOT
-$env:PATH   = "$env:SystemRoot\System32;$env:SystemRoot"
-$env:PGROOT = $null
-$env:PGDATA = $null
-
-try {
-    & "$ExtractDir\bin\postgres.exe" --version
-    if ($LASTEXITCODE -ne 0) { throw "FAIL: postgres --version under hostile env" }
-    & "$ExtractDir\bin\initdb.exe" -D $ExtractData --username=postgres --auth-local=trust --no-locale -E UTF8 | Out-Null
-    if ($LASTEXITCODE -ne 0) { throw "FAIL: initdb under hostile env" }
-    & "$ExtractDir\bin\pg_ctl.exe" -D $ExtractData -o "-p $ExtractPort -h 127.0.0.1" -l $ExtractLog -w start
-    if ($LASTEXITCODE -ne 0) { Get-Content $ExtractLog | Select-Object -Last 30; throw "FAIL: pg_ctl start under hostile env" }
-    try {
-        & "$ExtractDir\bin\psql.exe" -h 127.0.0.1 -p $ExtractPort -U postgres -d postgres -c "CREATE EXTENSION vector;" | Out-Null
-        if ($LASTEXITCODE -ne 0) { throw "FAIL: CREATE EXTENSION vector under hostile env" }
-        $ExtV2 = & "$ExtractDir\bin\psql.exe" -h 127.0.0.1 -p $ExtractPort -U postgres -d postgres -tAc "SELECT extversion FROM pg_extension WHERE extname='vector';"
-        if ($ExtV2.Trim() -ne $PGVECTOR_VERSION) { throw "FAIL: extracted-smoke extversion='$ExtV2'" }
-        Write-Host "  PASS extracted-tarball smoke (hostile env)"
-    } finally {
-        & "$ExtractDir\bin\pg_ctl.exe" -D $ExtractData -m fast stop 2>$null | Out-Null
-    }
-} finally {
-    $env:PATH   = $SavedPath
-    $env:PGROOT = $SavedPgRoot
-    Remove-Item -Recurse -Force $ExtractDir -ErrorAction SilentlyContinue
-}
-
-Write-Host "==> Done: $DistDir\$OutputName"
-Get-Item "$DistDir\$OutputName" | Select-Object Name, Length
+# build-runtime-windows.ps1 — Build PostgreSQL 16 + pgvector runtime on Windows.
+# Uses windows-2022 GHA runner's preinstalled PostgreSQL 16 (consistent
+# pg_config + postgres.exe from same package) — avoids EDB zip's split-version
+# packaging bug that linked pgvector against PG 14 ABI.
+# Builds pgvector from source via MSVC/nmake, then assembles a self-contained
+# runtime tree (bin + lib + share at root). Final smoke: initdb + CREATE
+# EXTENSION vector + distance query.
+# Produces: dist\mixdog-runtime-win32-x64-pg{pgver}-pgvector{vecver}.tar.gz
+
+$ErrorActionPreference = 'Stop'
+
+$PG_VERSION       = '16.4'
+$PGVECTOR_VERSION = '0.8.2'
+$TARGET_OS        = $env:TARGET_OS   ?? 'win32'
+$TARGET_ARCH      = $env:TARGET_ARCH ?? 'x64'
+
+# Auto-detect highest preinstalled PG ≥ 16 OR install via chocolatey.
+$PgInstallRoot = 'C:\Program Files\PostgreSQL'
+
+function Find-PgRoot {
+    if (-not (Test-Path $PgInstallRoot)) { return $null }
+    $cands = Get-ChildItem $PgInstallRoot -Directory -ErrorAction SilentlyContinue |
+        Where-Object { $_.Name -match '^(\d+)' } |
+        Sort-Object { [int]([regex]::Match($_.Name, '^(\d+)').Groups[1].Value) } -Descending
+    foreach ($c in $cands) {
+        $major = [int]([regex]::Match($c.Name, '^(\d+)').Groups[1].Value)
+        if ($major -ge 16 -and (Test-Path "$($c.FullName)\bin\pg_config.exe")) {
+            return $c.FullName
+        }
+    }
+    return $null
+}
+
+$PgRoot = Find-PgRoot
+if (-not $PgRoot) {
+    Write-Host "==> No preinstalled PG ≥ 16 found. Installing via chocolatey..."
+    if (Test-Path $PgInstallRoot) {
+        Write-Host "Existing PG dirs (none usable):"
+        Get-ChildItem $PgInstallRoot -Directory -ErrorAction SilentlyContinue | Select-Object Name
+    }
+    choco install postgresql16 --version=16.4.0 --params '/Password:postgres' -y --no-progress 2>&1 | Out-Host
+    if ($LASTEXITCODE -ne 0) { Write-Error "choco install postgresql16 failed (exit $LASTEXITCODE)"; exit 1 }
+    $PgRoot = Find-PgRoot
+    if (-not $PgRoot) {
+        Write-Error "ASSERT FAILED: chocolatey install completed but PG ≥ 16 still not found under $PgInstallRoot"
+        Get-ChildItem $PgInstallRoot -Directory -ErrorAction SilentlyContinue | Select-Object Name
+        exit 1
+    }
+}
+
+$ScriptDir  = Split-Path -Parent $MyInvocation.MyCommand.Path
+$RootDir    = (Resolve-Path "$ScriptDir\..").Path
+$BuildDir   = "$RootDir\build\runtime-win32-$TARGET_ARCH"
+$DistDir    = "$RootDir\dist"
+$RuntimeDir = "$BuildDir\runtime"
+
+$PgBin    = "$PgRoot\bin"
+$PgConfig = "$PgBin\pg_config.exe"
+
+$OutputName = "mixdog-runtime-${TARGET_OS}-${TARGET_ARCH}-pg${PG_VERSION}-pgvector${PGVECTOR_VERSION}.tar.gz"
+
+Write-Host "==> Using preinstalled PG: $PgRoot"
+& $PgConfig --version
+$RealVersion = (& $PgConfig --version) -replace 'PostgreSQL ', ''
+Write-Host "  pg_config reports version: $RealVersion"
+
+if (Test-Path $RuntimeDir) { Remove-Item -Recurse -Force $RuntimeDir }
+New-Item -ItemType Directory -Force -Path $BuildDir, $DistDir,
+  "$RuntimeDir\bin", "$RuntimeDir\lib", "$RuntimeDir\share" | Out-Null
+
+Write-Host "==> Cloning pgvector $PGVECTOR_VERSION"
+$PgVectorDir = "$BuildDir\pgvector"
+$VectorDllBuilt = "$PgVectorDir\vector.dll"
+
+if (Test-Path $VectorDllBuilt) {
+    Write-Host "  Cache hit: vector.dll already built at $VectorDllBuilt"
+} else {
+    if (Test-Path $PgVectorDir) { Remove-Item -Recurse -Force $PgVectorDir }
+    git clone --branch "v$PGVECTOR_VERSION" --depth 1 `
+        https://github.com/pgvector/pgvector.git $PgVectorDir
+
+    Write-Host "==> Building pgvector (MSVC/nmake against system PG 16)"
+    Push-Location $PgVectorDir
+    try {
+        $VsWhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
+        $VcVarsAll = & $VsWhere -latest -find 'VC\Auxiliary\Build\vcvarsall.bat' 2>$null | Select-Object -First 1
+        if (-not $VcVarsAll) {
+            Write-Error "vswhere could not locate vcvarsall.bat — Visual Studio Build Tools required."
+            exit 1
+        }
+        # CRITICAL: prepend $PgRoot\bin to PATH so any bare `pg_config` call
+        # inside Makefile.win resolves to PG 16 — runner has PG 14/15
+        # preinstalled and would otherwise win the PATH lookup, producing
+        # PG14-ABI vector.dll that fails to load in our PG 16 postgres.exe.
+        # Set in PowerShell so cmd /c inherits; setting inside the cmd batch
+        # via %PATH% loses vcvarsall's additions due to parse-time expansion.
+        $env:PATH = "$PgRoot\bin;$env:PATH"
+        $env:PGROOT = $PgRoot
+        $BuildCmd = "`"$VcVarsAll`" amd64 && nmake /F Makefile.win PG_CONFIG=`"$PgConfig`""
+        cmd /c $BuildCmd
+        if ($LASTEXITCODE -ne 0) {
+            Write-Error "pgvector nmake build failed (exit $LASTEXITCODE)"
+            exit 1
+        }
+    } finally {
+        Pop-Location
+    }
+}
+
+Write-Host "==> Assembling runtime layout — copy bin (.exe + .dll), lib, share from $PgRoot"
+# Copy ALL .exe + .dll from PG bin so postgres.exe + libpq.dll + libcrypto/libssl/
+# libintl/libiconv/icu*/libxml2/libxslt/libwinpthread/libecpg/libpgtypes etc. all
+# ship together. PG 16 install layout puts these all in bin\.
+Copy-Item "$PgBin\*.exe","$PgBin\*.dll" "$RuntimeDir\bin\" -Force
+
+# lib\: PG extension modules (incl. contrib like pgcrypto.dll). vector.dll
+# placed here below — PG looks for $libdir/<ext>.dll which resolves to lib\.
+Copy-Item -Recurse -Force "$PgRoot\lib\*"   "$RuntimeDir\lib\"   -ErrorAction SilentlyContinue
+# share\: extension SQL/control, locale, timezone data, conf samples.
+Copy-Item -Recurse -Force "$PgRoot\share\*" "$RuntimeDir\share\" -ErrorAction SilentlyContinue
+
+Write-Host "==> Manually staging pgvector artifacts (avoid pg_config-derived install paths)"
+$RuntimeExtDir = "$RuntimeDir\share\extension"
+New-Item -ItemType Directory -Force -Path $RuntimeExtDir | Out-Null
+Copy-Item "$PgVectorDir\vector.dll"        "$RuntimeDir\lib\"  -Force
+Copy-Item "$PgVectorDir\vector.control"    $RuntimeExtDir      -Force
+Copy-Item "$PgVectorDir\sql\vector--*.sql" $RuntimeExtDir      -Force
+
+Write-Host "==> Asserting runtime layout"
+$VectorControl = "$RuntimeDir\share\extension\vector.control"
+if (-not (Test-Path $VectorControl)) { Write-Error "ASSERT FAILED: $VectorControl not found"; exit 1 }
+$VectorSql = "$RuntimeDir\share\extension\vector--$PGVECTOR_VERSION.sql"
+if (-not (Test-Path $VectorSql))     { Write-Error "ASSERT FAILED: $VectorSql not found"; exit 1 }
+if (-not (Test-Path "$RuntimeDir\lib\vector.dll")) {
+    Write-Error "ASSERT FAILED: vector.dll not found in lib\"
+    exit 1
+}
+Write-Host "  PASS runtime layout"
+
+# Licenses
+if (Test-Path "$PgRoot\doc\postgresql\COPYRIGHT") {
+    Copy-Item "$PgRoot\doc\postgresql\COPYRIGHT" "$RuntimeDir\LICENSE.postgresql" -Force
+} elseif (Test-Path "$PgRoot\doc\COPYRIGHT") {
+    Copy-Item "$PgRoot\doc\COPYRIGHT" "$RuntimeDir\LICENSE.postgresql" -Force
+}
+if (Test-Path "$PgVectorDir\LICENSE") {
+    Copy-Item "$PgVectorDir\LICENSE" "$RuntimeDir\LICENSE.pgvector" -Force
+}
+
+Write-Host "==> Self-contained smoke test (initdb + CREATE EXTENSION vector + distance query)"
+& "$RuntimeDir\bin\postgres.exe" --version
+if ($LASTEXITCODE -ne 0) { Write-Error "FAIL: postgres.exe --version exit $LASTEXITCODE"; exit 1 }
+
+$SmokeData = "$BuildDir\smoke-pgdata"
+$SmokeLog  = "$BuildDir\smoke-pg.log"
+$SmokePort = 55899
+if (Test-Path $SmokeData) { Remove-Item -Recurse -Force $SmokeData }
+
+& "$RuntimeDir\bin\initdb.exe" -D $SmokeData --username=postgres --auth-local=trust --no-locale -E UTF8 | Out-Null
+if ($LASTEXITCODE -ne 0) { Write-Error "FAIL: initdb"; exit 1 }
+
+& "$RuntimeDir\bin\pg_ctl.exe" -D $SmokeData -o "-p $SmokePort -h 127.0.0.1" -l $SmokeLog -w start
+if ($LASTEXITCODE -ne 0) { Write-Error "FAIL: pg_ctl start (see $SmokeLog)"; Get-Content $SmokeLog | Select-Object -Last 30; exit 1 }
+
+try {
+    & "$RuntimeDir\bin\psql.exe" -h 127.0.0.1 -p $SmokePort -U postgres -d postgres -c "CREATE EXTENSION vector;" | Out-Null
+    if ($LASTEXITCODE -ne 0) { throw "CREATE EXTENSION vector failed" }
+    $ExtV = & "$RuntimeDir\bin\psql.exe" -h 127.0.0.1 -p $SmokePort -U postgres -d postgres -tAc "SELECT extversion FROM pg_extension WHERE extname='vector';"
+    $Dist = & "$RuntimeDir\bin\psql.exe" -h 127.0.0.1 -p $SmokePort -U postgres -d postgres -tAc "SELECT '[1,2,3]'::vector <-> '[1,2,4]'::vector;"
+    Write-Host "  vector extension version: $ExtV"
+    Write-Host "  distance query result:    $Dist"
+    if ($ExtV.Trim() -ne $PGVECTOR_VERSION) {
+        Write-Error "FAIL: extversion='$ExtV' expected='$PGVECTOR_VERSION'"
+        exit 1
+    }
+    Write-Host "  PASS smoke (extension load + vector distance)"
+}
+finally {
+    & "$RuntimeDir\bin\pg_ctl.exe" -D $SmokeData -m fast stop 2>$null | Out-Null
+    Remove-Item -Recurse -Force $SmokeData -ErrorAction SilentlyContinue
+}
+
+Write-Host "==> Creating tarball: $OutputName"
+$DistDirFwd    = $DistDir.Replace('\', '/')
+$RuntimeDirFwd = $RuntimeDir.Replace('\', '/')
+& tar -czf "$DistDirFwd/$OutputName" -C "$RuntimeDirFwd" .
+if ($LASTEXITCODE -ne 0) { Write-Error "tar failed (exit $LASTEXITCODE)"; exit 1 }
+
+Write-Host "==> Generating sha256 sidecar"
+Push-Location $DistDir
+$Hash = (Get-FileHash -Algorithm SHA256 $OutputName).Hash.ToLower()
+"$Hash  $OutputName" | Out-File -Encoding ascii "${OutputName}.sha256"
+Pop-Location
+
+# ---------------------------------------------------------------------------
+# Phase A: Re-smoke from EXTRACTED tarball with hostile env (cleared PATH,
+# only system32). Catches false-pass where the build host has VC redist /
+# preinstalled DLLs that the tarball might be missing.
+# ---------------------------------------------------------------------------
+Write-Host "==> Re-smoke from extracted tarball (hostile env)"
+$ExtractDir = "$BuildDir\extract-smoke"
+if (Test-Path $ExtractDir) { Remove-Item -Recurse -Force $ExtractDir }
+New-Item -ItemType Directory -Force -Path $ExtractDir | Out-Null
+& tar -xzf "$DistDirFwd/$OutputName" -C ($ExtractDir.Replace('\','/'))
+if ($LASTEXITCODE -ne 0) { Write-Error "extract failed"; exit 1 }
+
+$ExtractData = "$ExtractDir\extract-pgdata"
+$ExtractLog  = "$ExtractDir\extract-pg.log"
+$ExtractPort = 55898
+
+# Snapshot current env, then strip to minimal Windows PATH (no PG14/15/16
+# preinstalled bin, no chocolatey, no MSVC tools).
+$SavedPath  = $env:PATH
+$SavedPgRoot = $env:PGROOT
+$env:PATH   = "$env:SystemRoot\System32;$env:SystemRoot"
+$env:PGROOT = $null
+$env:PGDATA = $null
+
+try {
+    & "$ExtractDir\bin\postgres.exe" --version
+    if ($LASTEXITCODE -ne 0) { throw "FAIL: postgres --version under hostile env" }
+    & "$ExtractDir\bin\initdb.exe" -D $ExtractData --username=postgres --auth-local=trust --no-locale -E UTF8 | Out-Null
+    if ($LASTEXITCODE -ne 0) { throw "FAIL: initdb under hostile env" }
+    & "$ExtractDir\bin\pg_ctl.exe" -D $ExtractData -o "-p $ExtractPort -h 127.0.0.1" -l $ExtractLog -w start
+    if ($LASTEXITCODE -ne 0) { Get-Content $ExtractLog | Select-Object -Last 30; throw "FAIL: pg_ctl start under hostile env" }
+    try {
+        & "$ExtractDir\bin\psql.exe" -h 127.0.0.1 -p $ExtractPort -U postgres -d postgres -c "CREATE EXTENSION vector;" | Out-Null
+        if ($LASTEXITCODE -ne 0) { throw "FAIL: CREATE EXTENSION vector under hostile env" }
+        $ExtV2 = & "$ExtractDir\bin\psql.exe" -h 127.0.0.1 -p $ExtractPort -U postgres -d postgres -tAc "SELECT extversion FROM pg_extension WHERE extname='vector';"
+        if ($ExtV2.Trim() -ne $PGVECTOR_VERSION) { throw "FAIL: extracted-smoke extversion='$ExtV2'" }
+        Write-Host "  PASS extracted-tarball smoke (hostile env)"
+    } finally {
+        & "$ExtractDir\bin\pg_ctl.exe" -D $ExtractData -m fast stop 2>$null | Out-Null
+    }
+} finally {
+    $env:PATH   = $SavedPath
+    $env:PGROOT = $SavedPgRoot
+    Remove-Item -Recurse -Force $ExtractDir -ErrorAction SilentlyContinue
+}
+
+Write-Host "==> Done: $DistDir\$OutputName"
+Get-Item "$DistDir\$OutputName" | Select-Object Name, Length

package/scripts/recall-usecase-cases.json

@@ -15,4 +15,4 @@
   { "id": "uc5-yesterday", "label": "UC5 calendar yesterday", "args": { "period": "yesterday", "limit": 10 }, "expect": "browse" },
   { "id": "uc5-thisweek", "label": "UC5 calendar this_week", "args": { "period": "this_week", "limit": 10 }, "expect": "browse" },
   { "id": "uc6-category", "label": "UC6 category decision 7d", "args": { "period": "7d", "category": "decision", "limit": 10 }, "expect": "browse" }
-]
+]

package/scripts/smoke-runtime-negative.ps1

@@ -1,106 +1,106 @@
-# smoke-runtime-negative.ps1 — Negative-path tests against released win32-x64
-# runtime tarball. Validates: download, sha256, corrupt-tarball, fresh-extract
-# boot, double-init refusal, hostile-env survival.
-#
-# Env: TAG / OS / ARCH / RUNTIME_RELEASE_REPOSITORY (default tribgames/mixdog)
-
-$ErrorActionPreference = 'Stop'
-
-$Tag         = if ($env:TAG)                { $env:TAG }  else { 'runtime-v0.4.0' }
-$Os          = if ($env:OS)                 { $env:OS }   else { 'win32' }
-$Arch        = if ($env:ARCH)               { $env:ARCH } else { 'x64' }
-$ReleaseRepo = if ($env:RUNTIME_RELEASE_REPOSITORY) { $env:RUNTIME_RELEASE_REPOSITORY } else { 'tribgames/mixdog' }
-$PgVer       = '16.4'
-$PgvectorVer = '0.8.2'
-
-$Asset = "mixdog-runtime-${Os}-${Arch}-pg${PgVer}-pgvector${PgvectorVer}.tar.gz"
-$Url   = "https://github.com/${ReleaseRepo}/releases/download/${Tag}/${Asset}"
-
-$Work = New-Item -ItemType Directory -Force -Path "$env:TEMP\smoke-$([guid]::NewGuid().ToString('N'))" | Select-Object -ExpandProperty FullName
-
-try {
-    Write-Host "==> Negative-path smoke for ${Os}-${Arch} from $Url"
-
-    Write-Host "==> Test 1: HEAD reaches release asset"
-    $resp = Invoke-WebRequest -Uri $Url -Method Head -UseBasicParsing -ErrorAction Stop
-    Write-Host "  HTTP $($resp.StatusCode)"
-
-    Write-Host "==> Test 2: full download + sha256"
-    $TarPath = Join-Path $Work $Asset
-    Invoke-WebRequest -Uri $Url -OutFile $TarPath -UseBasicParsing
-    $sha = (Get-FileHash -Algorithm SHA256 $TarPath).Hash.ToLower()
-    Write-Host "  sha256=$sha"
-
-    Write-Host "==> Test 3: corrupt tarball — flip a byte and ensure tar errors"
-    $CorruptPath = "$Work\corrupt.tar.gz"
-    Copy-Item $TarPath $CorruptPath
-    $bytes = [byte[]]::new(1); $rand = [System.Random]::new(); $rand.NextBytes($bytes)
-    $stream = [System.IO.File]::OpenWrite($CorruptPath)
-    $stream.Position = 102400
-    $stream.Write($bytes, 0, 1)
-    $stream.Close()
-    $CorruptDir = "$Work\corrupt"
-    New-Item -ItemType Directory -Force -Path $CorruptDir | Out-Null
-    $TarProc = Start-Process -FilePath tar -ArgumentList @('-xzf', $CorruptPath, '-C', $CorruptDir.Replace('\','/')) -Wait:$false -PassThru -WindowStyle Hidden
-    if (-not $TarProc.WaitForExit(15000)) {
-        Stop-Process -Id $TarProc.Id -Force -ErrorAction SilentlyContinue
-        Write-Host "  PASS: corrupted tarball extraction timed out and was stopped"
-    } elseif ($TarProc.ExitCode -eq 0) {
-        Write-Host "  WARN: corrupted tarball extracted without error (tar gzip recovery)"
-    } else {
-        Write-Host "  PASS: corrupted tarball rejected by tar (exit $($TarProc.ExitCode))"
-    }
-
-    Write-Host "==> Test 4: fresh-extract boot (extension load + distance query)"
-    $FreshDir = "$Work\fresh"
-    New-Item -ItemType Directory -Force -Path $FreshDir | Out-Null
-    & tar -xzf $TarPath -C ($FreshDir.Replace('\','/'))
-    if ($LASTEXITCODE -ne 0) { throw "fresh extract failed" }
-
-    $PgBin   = "$FreshDir\bin"
-    $Data    = "$FreshDir\pgdata"
-    $Log     = "$FreshDir\pg.log"
-    $Port    = 55897
-
-    # Hostile env: minimal PATH (System32 only), no PGROOT/PGDATA
-    $SavedPath = $env:PATH
-    $SavedPgRoot = $env:PGROOT
-    $env:PATH   = "$env:SystemRoot\System32;$env:SystemRoot"
-    $env:PGROOT = $null
-    $env:PGDATA = $null
-
-    try {
-        & "$PgBin\postgres.exe" --version
-        if ($LASTEXITCODE -ne 0) { throw "FAIL: postgres --version" }
-        & "$PgBin\initdb.exe" -D $Data --username=postgres --auth-local=trust --no-locale -E UTF8 | Out-Null
-        if ($LASTEXITCODE -ne 0) { throw "FAIL: initdb" }
-        & "$PgBin\pg_ctl.exe" -D $Data -o "-p $Port -h 127.0.0.1" -l $Log -w start
-        if ($LASTEXITCODE -ne 0) { Get-Content $Log | Select-Object -Last 30; throw "FAIL: pg_ctl start" }
-
-        try {
-            & "$PgBin\psql.exe" -h 127.0.0.1 -p $Port -U postgres -d postgres -c "CREATE EXTENSION vector;" | Out-Null
-            if ($LASTEXITCODE -ne 0) { throw "FAIL: CREATE EXTENSION" }
-            $ExtV = & "$PgBin\psql.exe" -h 127.0.0.1 -p $Port -U postgres -d postgres -tAc "SELECT extversion FROM pg_extension WHERE extname='vector';"
-            if ($ExtV.Trim() -ne $PgvectorVer) { throw "FAIL: extversion='$ExtV' expected='$PgvectorVer'" }
-            Write-Host "  PASS: fresh-extract boot + vector extension"
-        } finally {
-            & "$PgBin\pg_ctl.exe" -D $Data -m fast stop 2>$null | Out-Null
-        }
-
-        Write-Host "==> Test 5: second initdb on initialized dir refused"
-        $rc = (Start-Process -FilePath "$PgBin\initdb.exe" -ArgumentList "-D",$Data,"-U","postgres" -Wait -PassThru -NoNewWindow).ExitCode
-        if ($rc -eq 0) {
-            Write-Host "  WARN: second initdb succeeded (unexpected)"
-        } else {
-            Write-Host "  PASS: second initdb refused (exit $rc)"
-        }
-    } finally {
-        $env:PATH   = $SavedPath
-        $env:PGROOT = $SavedPgRoot
-    }
-
-    Write-Host "==> All negative-path smokes: PASS"
-}
-finally {
-    Remove-Item -Recurse -Force $Work -ErrorAction SilentlyContinue
-}
+# smoke-runtime-negative.ps1 — Negative-path tests against released win32-x64
+# runtime tarball. Validates: download, sha256, corrupt-tarball, fresh-extract
+# boot, double-init refusal, hostile-env survival.
+#
+# Env: TAG / OS / ARCH / RUNTIME_RELEASE_REPOSITORY (default tribgames/mixdog)
+
+$ErrorActionPreference = 'Stop'
+
+$Tag         = if ($env:TAG)                { $env:TAG }  else { 'runtime-v0.4.0' }
+$Os          = if ($env:OS)                 { $env:OS }   else { 'win32' }
+$Arch        = if ($env:ARCH)               { $env:ARCH } else { 'x64' }
+$ReleaseRepo = if ($env:RUNTIME_RELEASE_REPOSITORY) { $env:RUNTIME_RELEASE_REPOSITORY } else { 'tribgames/mixdog' }
+$PgVer       = '16.4'
+$PgvectorVer = '0.8.2'
+
+$Asset = "mixdog-runtime-${Os}-${Arch}-pg${PgVer}-pgvector${PgvectorVer}.tar.gz"
+$Url   = "https://github.com/${ReleaseRepo}/releases/download/${Tag}/${Asset}"
+
+$Work = New-Item -ItemType Directory -Force -Path "$env:TEMP\smoke-$([guid]::NewGuid().ToString('N'))" | Select-Object -ExpandProperty FullName
+
+try {
+    Write-Host "==> Negative-path smoke for ${Os}-${Arch} from $Url"
+
+    Write-Host "==> Test 1: HEAD reaches release asset"
+    $resp = Invoke-WebRequest -Uri $Url -Method Head -UseBasicParsing -ErrorAction Stop
+    Write-Host "  HTTP $($resp.StatusCode)"
+
+    Write-Host "==> Test 2: full download + sha256"
+    $TarPath = Join-Path $Work $Asset
+    Invoke-WebRequest -Uri $Url -OutFile $TarPath -UseBasicParsing
+    $sha = (Get-FileHash -Algorithm SHA256 $TarPath).Hash.ToLower()
+    Write-Host "  sha256=$sha"
+
+    Write-Host "==> Test 3: corrupt tarball — flip a byte and ensure tar errors"
+    $CorruptPath = "$Work\corrupt.tar.gz"
+    Copy-Item $TarPath $CorruptPath
+    $bytes = [byte[]]::new(1); $rand = [System.Random]::new(); $rand.NextBytes($bytes)
+    $stream = [System.IO.File]::OpenWrite($CorruptPath)
+    $stream.Position = 102400
+    $stream.Write($bytes, 0, 1)
+    $stream.Close()
+    $CorruptDir = "$Work\corrupt"
+    New-Item -ItemType Directory -Force -Path $CorruptDir | Out-Null
+    $TarProc = Start-Process -FilePath tar -ArgumentList @('-xzf', $CorruptPath, '-C', $CorruptDir.Replace('\','/')) -Wait:$false -PassThru -WindowStyle Hidden
+    if (-not $TarProc.WaitForExit(15000)) {
+        Stop-Process -Id $TarProc.Id -Force -ErrorAction SilentlyContinue
+        Write-Host "  PASS: corrupted tarball extraction timed out and was stopped"
+    } elseif ($TarProc.ExitCode -eq 0) {
+        Write-Host "  WARN: corrupted tarball extracted without error (tar gzip recovery)"
+    } else {
+        Write-Host "  PASS: corrupted tarball rejected by tar (exit $($TarProc.ExitCode))"
+    }
+
+    Write-Host "==> Test 4: fresh-extract boot (extension load + distance query)"
+    $FreshDir = "$Work\fresh"
+    New-Item -ItemType Directory -Force -Path $FreshDir | Out-Null
+    & tar -xzf $TarPath -C ($FreshDir.Replace('\','/'))
+    if ($LASTEXITCODE -ne 0) { throw "fresh extract failed" }
+
+    $PgBin   = "$FreshDir\bin"
+    $Data    = "$FreshDir\pgdata"
+    $Log     = "$FreshDir\pg.log"
+    $Port    = 55897
+
+    # Hostile env: minimal PATH (System32 only), no PGROOT/PGDATA
+    $SavedPath = $env:PATH
+    $SavedPgRoot = $env:PGROOT
+    $env:PATH   = "$env:SystemRoot\System32;$env:SystemRoot"
+    $env:PGROOT = $null
+    $env:PGDATA = $null
+
+    try {
+        & "$PgBin\postgres.exe" --version
+        if ($LASTEXITCODE -ne 0) { throw "FAIL: postgres --version" }
+        & "$PgBin\initdb.exe" -D $Data --username=postgres --auth-local=trust --no-locale -E UTF8 | Out-Null
+        if ($LASTEXITCODE -ne 0) { throw "FAIL: initdb" }
+        & "$PgBin\pg_ctl.exe" -D $Data -o "-p $Port -h 127.0.0.1" -l $Log -w start
+        if ($LASTEXITCODE -ne 0) { Get-Content $Log | Select-Object -Last 30; throw "FAIL: pg_ctl start" }
+
+        try {
+            & "$PgBin\psql.exe" -h 127.0.0.1 -p $Port -U postgres -d postgres -c "CREATE EXTENSION vector;" | Out-Null
+            if ($LASTEXITCODE -ne 0) { throw "FAIL: CREATE EXTENSION" }
+            $ExtV = & "$PgBin\psql.exe" -h 127.0.0.1 -p $Port -U postgres -d postgres -tAc "SELECT extversion FROM pg_extension WHERE extname='vector';"
+            if ($ExtV.Trim() -ne $PgvectorVer) { throw "FAIL: extversion='$ExtV' expected='$PgvectorVer'" }
+            Write-Host "  PASS: fresh-extract boot + vector extension"
+        } finally {
+            & "$PgBin\pg_ctl.exe" -D $Data -m fast stop 2>$null | Out-Null
+        }
+
+        Write-Host "==> Test 5: second initdb on initialized dir refused"
+        $rc = (Start-Process -FilePath "$PgBin\initdb.exe" -ArgumentList "-D",$Data,"-U","postgres" -Wait -PassThru -NoNewWindow).ExitCode
+        if ($rc -eq 0) {
+            Write-Host "  WARN: second initdb succeeded (unexpected)"
+        } else {
+            Write-Host "  PASS: second initdb refused (exit $rc)"
+        }
+    } finally {
+        $env:PATH   = $SavedPath
+        $env:PGROOT = $SavedPgRoot
+    }
+
+    Write-Host "==> All negative-path smokes: PASS"
+}
+finally {
+    Remove-Item -Recurse -Force $Work -ErrorAction SilentlyContinue
+}

package/scripts/tool-efficiency-diag.mjs

@@ -88,4 +88,4 @@ for (const target of ['heavy-worker', 'worker']) {
   console.log(`  single-call batches: ${batch1}/${batchTot} (${pct(batch1, batchTot)}%)`);
   console.log(`  content greps with -C/-A/-B: ${grepContentWithCtx}/${grepContent} (${pct(grepContentWithCtx, grepContent)}%)  grep->read follow-ups: ${grepThenRead}`);
   console.log(`  same-path re-reads >=3x: ${rereads}`);
-}
+}

package/src/rules/lead/02-channels.md

@@ -1,3 +1,3 @@
-# Channels
-
-- Channel features are handled by the runtime.
+# Channels
+
+- Channel features are handled by the runtime.

package/src/runtime/agent/orchestrator/tools/bash-session.mjs

@@ -40,7 +40,7 @@ import { spawn } from 'node:child_process';
 import * as nodeUtil from 'node:util';
 import { existsSync } from 'node:fs';
 import { randomUUID } from 'node:crypto';
-import { invalidateBuiltinResultCache, analyzeShellCommandEffects, preflightShellLargeFileProbe } from './builtin.mjs';
+import { invalidateBuiltinResultCache, analyzeShellCommandEffects } from './builtin.mjs';
 import { markCodeGraphDirtyPaths, drainCodeGraphCache } from './code-graph-state.mjs';
 import { maybeRewriteWmicProcessCommand } from './shell-policy.mjs';
 import { _maybeEncodePowerShellCommand } from './shell-command.mjs';
@@ -51,13 +51,15 @@ import { startChildGuardian } from '../../../shared/child-guardian.mjs';
 
 globalThis.__mixdogBashSessionRuntimeLoaded = true;
 
-// Default 600 s (10 min), max 1800 s. Aligned with the one-shot bash tool's
-// 600 s default (builtin/bash-tool.mjs); the persistent shell carries
-// longer-running pipelines (build/test/install) than one-shot calls, so a
-// 120 s default left those workflows timing out at 2 min. Per-call `timeout`
-// still overrides, capped at MAX_TIMEOUT_MS.
-const DEFAULT_TIMEOUT_MS = 600_000;
-const MAX_TIMEOUT_MS = 1_800_000;
+// Claude Code parity (refs/claude-code src/utils/timeouts.ts): default 120 s
+// (2 min), max 600 s (10 min), BASH_DEFAULT_TIMEOUT_MS / BASH_MAX_TIMEOUT_MS
+// env overrides (max floored at default). Matches the one-shot bash tool
+// (builtin/bash-tool.mjs); per-call `timeout` still overrides, capped at
+// MAX_TIMEOUT_MS.
+const _envDefaultTimeout = parseInt(process.env.BASH_DEFAULT_TIMEOUT_MS ?? '', 10);
+const DEFAULT_TIMEOUT_MS = _envDefaultTimeout > 0 ? _envDefaultTimeout : 120_000;
+const _envMaxTimeout = parseInt(process.env.BASH_MAX_TIMEOUT_MS ?? '', 10);
+const MAX_TIMEOUT_MS = Math.max(_envMaxTimeout > 0 ? _envMaxTimeout : 600_000, DEFAULT_TIMEOUT_MS);
 const IDLE_TIMEOUT_MS = 5 * 60_000;
 const MAX_SESSIONS = 10;
 const STDERR_DRAIN_MS = 25;
@@ -643,8 +645,6 @@ async function bash_session(args, cwd = process.cwd(), opts = {}) {
         }
         return requestedCwd;
     })();
-    const largeProbe = await preflightShellLargeFileProbe(command, baseCwd);
-    if (largeProbe) return `Error: ${largeProbe.message}`;
     const rawTimeout = typeof args?.timeout === 'number' ? args.timeout : DEFAULT_TIMEOUT_MS;
     const timeoutMs = rawTimeout;
     const effectiveTimeout = Math.min(Math.max(timeoutMs, 1), wmicRewrite?.timeoutMs || MAX_TIMEOUT_MS);

package/src/runtime/agent/orchestrator/tools/builtin/bash-tool.mjs

@@ -21,7 +21,6 @@ import {
 import {
     analyzeShellCommandEffects,
     foregroundLongCommandHint,
-    preflightShellLargeFileProbe,
 } from './shell-analysis.mjs';
 import {
     cancelBackgroundTask,
@@ -201,8 +200,6 @@ export async function executeBashTool(args, workDir, options = {}) {
         return _execPolicyBlock;
     }
 
-    const largeProbe = await preflightShellLargeFileProbe(command, bashWorkDir);
-    if (largeProbe) return `Error: ${largeProbe.message}`;
     let shellEffects;
     try {
         shellEffects = await analyzeShellCommandEffects(command, bashWorkDir);
@@ -211,9 +208,14 @@ export async function executeBashTool(args, workDir, options = {}) {
     }
     // Keep foreground commands on a long tool-owned timeout. The MCP dispatch
     // layer must not add a shorter fallback ceiling when timeout is omitted.
-    const DEFAULT_BASH_TIMEOUT_MS = 600_000;
-    const DEFAULT_BACKGROUND_BASH_TIMEOUT_MS = 600_000;
-    const MAX_BASH_TIMEOUT_MS = 1_800_000;
+    // Claude Code parity (refs/claude-code src/utils/timeouts.ts): default
+    // 120 s (2 min), max 600 s (10 min); BASH_DEFAULT_TIMEOUT_MS /
+    // BASH_MAX_TIMEOUT_MS env overrides, max floored at default.
+    const _envDefaultTimeout = parseInt(process.env.BASH_DEFAULT_TIMEOUT_MS ?? '', 10);
+    const DEFAULT_BASH_TIMEOUT_MS = _envDefaultTimeout > 0 ? _envDefaultTimeout : 120_000;
+    const DEFAULT_BACKGROUND_BASH_TIMEOUT_MS = DEFAULT_BASH_TIMEOUT_MS;
+    const _envMaxTimeout = parseInt(process.env.BASH_MAX_TIMEOUT_MS ?? '', 10);
+    const MAX_BASH_TIMEOUT_MS = Math.max(_envMaxTimeout > 0 ? _envMaxTimeout : 600_000, DEFAULT_BASH_TIMEOUT_MS);
     const defaultTimeoutMs = runInBackground
         ? DEFAULT_BACKGROUND_BASH_TIMEOUT_MS
         : DEFAULT_BASH_TIMEOUT_MS;

package/src/runtime/agent/orchestrator/tools/builtin/builtin-tools.mjs

@@ -12,6 +12,19 @@ import {
     executionModeSchemaDescription,
 } from '../../../../shared/background-tasks.mjs';
 
+// Shell timeout envelope surfaced in the tool schema. Mirrors Claude Code:
+// default 120 s / max 600 s, BASH_DEFAULT_TIMEOUT_MS / BASH_MAX_TIMEOUT_MS
+// env overrides, max floored at default. Keep in sync with
+// builtin/bash-tool.mjs and bash-session.mjs.
+function _shellDefaultTimeoutMs() {
+    const parsed = parseInt(process.env.BASH_DEFAULT_TIMEOUT_MS ?? '', 10);
+    return parsed > 0 ? parsed : 120_000;
+}
+function _shellMaxTimeoutMs() {
+    const parsed = parseInt(process.env.BASH_MAX_TIMEOUT_MS ?? '', 10);
+    return Math.max(parsed > 0 ? parsed : 600_000, _shellDefaultTimeoutMs());
+}
+
 export const BUILTIN_TOOLS = [
     {
         name: 'read',
@@ -59,7 +72,7 @@ export const BUILTIN_TOOLS = [
             properties: {
                 command: { type: 'string', description: 'Command.' },
                 cwd: { type: 'string', description: 'Working directory. Persists across shell calls in a session — omit to reuse the previous command\'s directory (e.g. after cd); pass an absolute path to change it.' },
-                timeout: { type: 'number', description: 'Timeout ms.' },
+                timeout: { type: 'number', description: `Timeout ms. Default ${_shellDefaultTimeoutMs()} (${_shellDefaultTimeoutMs() / 60000} min); long-running commands may raise it up to ${_shellMaxTimeoutMs()} (${_shellMaxTimeoutMs() / 60000} min).` },
                 merge_stderr: { type: 'boolean', description: 'Merge stderr.' },
                 mode: { type: 'string', enum: ['sync', 'async'], description: executionModeSchemaDescription('sync') },
                 shell: { type: 'string', enum: ['bash', 'powershell'], description: 'Force shell. Windows defaults to PowerShell; bash = Git Bash/POSIX.' },

package/src/runtime/agent/orchestrator/tools/patch/orchestrator.mjs

@@ -25,7 +25,7 @@ import {
 } from './paths.mjs';
 import { ensureNativePatchBinaryAvailable } from './native-server.mjs';
 import { assertPathReachable } from '../builtin/fs-reachability.mjs';
-import { dispatchNativePatch } from './dispatch.mjs';
+import { dispatchNativePatch, dispatchJsPatchEntries } from './dispatch.mjs';
 import { normalizeOutputPath } from '../builtin.mjs';
 import {
   planV4ARenameSections,
@@ -242,17 +242,12 @@ async function apply_patch(args, cwd, options = {}) {
     }
     const insideEntries = entries.filter((entry) => !isResolvedPathOutsideBase(entry.fullPath, basePath));
     const outsideEntries = entries.filter((entry) => isResolvedPathOutsideBase(entry.fullPath, basePath));
-    if (outsideEntries.length > 0) {
-      const rels = outsideEntries.map((e) => normalizeOutputPath(e.fullPath || e.displayPath || '(unknown)')).join(', ');
-      return wrapPatchMutationOutput(
-        `Error: apply_patch target resolves outside base path (../ or absolute not allowed): ${rels}`,
-        mutationPlan,
-        { backend: 'native-patch' },
-      );
-    }
     const parsedInside = (parsed || []).filter(
       (entry) => !isResolvedPathOutsideBase(parsedEntryResolvedPath(entry, basePath), basePath),
     );
+    const backend = outsideEntries.length > 0
+      ? (insideEntries.length > 0 ? 'native+js-patch' : 'js-patch')
+      : 'native-patch';
     const resultParts = [];
     if (insideEntries.length > 0) {
       const nativePatchStr = rewriteHeaderPaths(renderParsedUnifiedPatch(parsedInside), headerRewrites);
@@ -268,11 +263,26 @@ async function apply_patch(args, cwd, options = {}) {
         parsed: parsedInside,
       });
       if (isPatchErrorText(nativeResult)) {
-        if (resultParts.length > 0) return wrapPatchMutationOutput(nativeResult, mutationPlan, { backend: 'native-patch' });
-        return wrapPatchMutationOutput(nativeResult, mutationPlan, { backend: 'native-patch' });
+        return wrapPatchMutationOutput(nativeResult, mutationPlan, { backend });
       }
       resultParts.push(nativeResult);
     }
+    if (outsideEntries.length > 0) {
+      // Out-of-base targets are applied via the JS dispatcher (no base-path
+      // confinement); write permission is enforced at the hook layer.
+      const jsResult = await dispatchJsPatchEntries({
+        rows: outsideEntries,
+        parsed,
+        basePath,
+        dryRun,
+        fuzzy,
+        readStateScope,
+      });
+      if (isPatchErrorText(jsResult)) {
+        return wrapPatchMutationOutput(jsResult, mutationPlan, { backend });
+      }
+      resultParts.push(jsResult);
+    }
     let combined = resultParts.join('\n');
     const renameLines = formatV4ARenameSuccessLines(v4aRenameResults);
     if (renameLines.length > 0 && !isPatchErrorText(combined)) {
@@ -287,9 +297,9 @@ async function apply_patch(args, cwd, options = {}) {
         `hunk-level rejected (rejectPartial=false, V4A): ${rejectedV4AHunks.length}`,
         ...rejectedV4AHunks.map((r) => `  REJECT ${r.file || '(unknown)'} — ${String(r.reason || '').split(';')[0].trim()}`),
       ];
-      return wrapPatchMutationOutput(`${combined}\n${tail.join('\n')}`, mutationPlan, { backend: 'native-patch' });
+      return wrapPatchMutationOutput(`${combined}\n${tail.join('\n')}`, mutationPlan, { backend });
     }
-    return wrapPatchMutationOutput(combined, mutationPlan, { backend: 'native-patch' });
+    return wrapPatchMutationOutput(combined, mutationPlan, { backend });
   }));
 }
 

package/src/runtime/shared/atomic-file.mjs

@@ -278,8 +278,24 @@ function _reclaimGuardMatchesToken(guardPath, token) {
   }
 }
 
-function _unlinkReclaimGuardIfPidMatches(guardPath, pid) {
-  if (_readLockOwnerPid(guardPath) !== pid) return false;
+function _readGuardContent(guardPath) {
+  try { return readFileSync(guardPath, 'utf8'); } catch { return null; }
+}
+
+function _parseStampPid(raw) {
+  if (raw === null) return null;
+  const tok = String(raw).trim().split(/\s+/)[0];
+  const pid = Number.parseInt(tok, 10);
+  return Number.isFinite(pid) && pid > 0 ? pid : null;
+}
+
+// Unlink the guard only if its FULL content (pid ts token) is still the
+// exact content the stale/dead decision was made against. A regenerated
+// guard — even one whose pid was recycled to the same value (same-pid
+// ABA) — carries a fresh ts+token and therefore never matches, so a
+// fresh guard is never removed by a stale decision.
+function _unlinkReclaimGuardIfContentMatches(guardPath, content) {
+  if (_readGuardContent(guardPath) !== content) return false;
   try { unlinkSync(guardPath); return true; } catch { return false; }
 }
 
@@ -289,10 +305,12 @@ function _unlinkUnreadableStaleReclaimGuard(guardPath, staleMs) {
 }
 
 function _tryClearStaleReclaimGuard(guardPath, staleMs) {
-  const guardPid = _readLockOwnerPid(guardPath);
+  const guardContent = _readGuardContent(guardPath);
+  const guardPid = _parseStampPid(guardContent);
   if (guardPid !== null) {
-    // Re-read the guard immediately before unlinking so a regenerated
-    // guard with a different owner is not removed by a stale decision.
+    // Re-read the guard's full content immediately before unlinking so a
+    // regenerated guard (different owner OR same-pid ABA) is not removed
+    // by a stale decision.
     // This is still not a serialized primitive: correctness comes from
     // the lockPath owner-token reverify before unlinking lockPath, not
     // from making guard cleanup itself authoritative.
@@ -304,7 +322,7 @@ function _tryClearStaleReclaimGuard(guardPath, staleMs) {
     let guardStale = false;
     try { guardStale = Date.now() - statSync(guardPath).mtimeMs > staleMs; } catch {}
     if (_pidIsDead(guardPid) || guardStale) {
-      _unlinkReclaimGuardIfPidMatches(guardPath, guardPid);
+      _unlinkReclaimGuardIfContentMatches(guardPath, guardContent);
     }
     return;
   }

package/src/tui/dist/index.mjs

@@ -13927,8 +13927,21 @@ function _reclaimGuardMatchesToken(guardPath, token) {
     return false;
   }
 }
-function _unlinkReclaimGuardIfPidMatches(guardPath, pid) {
-  if (_readLockOwnerPid(guardPath) !== pid) return false;
+function _readGuardContent(guardPath) {
+  try {
+    return readFileSync2(guardPath, "utf8");
+  } catch {
+    return null;
+  }
+}
+function _parseStampPid(raw) {
+  if (raw === null) return null;
+  const tok = String(raw).trim().split(/\s+/)[0];
+  const pid = Number.parseInt(tok, 10);
+  return Number.isFinite(pid) && pid > 0 ? pid : null;
+}
+function _unlinkReclaimGuardIfContentMatches(guardPath, content) {
+  if (_readGuardContent(guardPath) !== content) return false;
   try {
     unlinkSync2(guardPath);
     return true;
@@ -13946,7 +13959,8 @@ function _unlinkUnreadableStaleReclaimGuard(guardPath, staleMs) {
   }
 }
 function _tryClearStaleReclaimGuard(guardPath, staleMs) {
-  const guardPid = _readLockOwnerPid(guardPath);
+  const guardContent = _readGuardContent(guardPath);
+  const guardPid = _parseStampPid(guardContent);
   if (guardPid !== null) {
     let guardStale = false;
     try {
@@ -13954,7 +13968,7 @@ function _tryClearStaleReclaimGuard(guardPath, staleMs) {
     } catch {
     }
     if (_pidIsDead(guardPid) || guardStale) {
-      _unlinkReclaimGuardIfPidMatches(guardPath, guardPid);
+      _unlinkReclaimGuardIfContentMatches(guardPath, guardContent);
     }
     return;
   }