fix(odp-rs): restore 2026-07-02 data-loss fixes over stale iii-integration versions

The iii-integration merge resolved 14 conflicted files to the branch side,
which predates (2026-06-19) the odp data-loss trapdoor / DLQ / stale-consumer
fixes already on main (2026-07-02). Restore the main-side versions; keep the
branch's net-new files.

Author: 2233admin

iii/scripts/Import-IiiEnv.ps1

@@ -10,8 +10,14 @@ function Import-IiiEnv {
         $RepoRoot = Split-Path -Parent $IiiRoot
     }
 
-    $env:III_URL = if ($env:III_URL) { $env:III_URL } else { "ws://127.0.0.1:49134" }
-    $env:ODP_INGEST_URL = if ($env:ODP_INGEST_URL) { $env:ODP_INGEST_URL } else { "http://127.0.0.1:8040" }
+    $nasHost = if ($env:III_NAS_HOST) { $env:III_NAS_HOST } else { "192.168.50.130" }
+    $nasMode = $env:III_DEPLOY_MODE -eq "nas-edge"
+    if (-not $env:III_URL) {
+        $env:III_URL = if ($nasMode) { "ws://${nasHost}:49134" } else { "ws://127.0.0.1:49134" }
+    }
+    if (-not $env:ODP_INGEST_URL) {
+        $env:ODP_INGEST_URL = if ($nasMode) { "http://${nasHost}:8040" } else { "http://127.0.0.1:8040" }
+    }
     if (-not $env:DISCORD_CLI_BIN) { $env:DISCORD_CLI_BIN = "discord" }
 
     $loaded = $null
@@ -40,7 +46,38 @@ function Import-IiiEnv {
         RepoRoot = $RepoRoot
         EnvFile = $loaded
         DiscordTokenSet = [bool]$env:DISCORD_TOKEN
+        NasEdge = $nasMode
+        EngineHost = Get-IiiEngineHost
+    }
+}
+
+function Get-IiiEngineHost {
+    $nasHost = if ($env:III_NAS_HOST) { $env:III_NAS_HOST } else { "192.168.50.130" }
+    $url = $env:III_URL
+    if ($url -match '^wss?://([^:/]+)') {
+        return $matches[1]
+    }
+    if ($env:III_DEPLOY_MODE -eq "nas-edge") {
+        return $nasHost
     }
+    return "127.0.0.1"
+}
+
+function Get-IiiExe {
+    Join-Path $env:USERPROFILE ".local\iii\iii.exe"
+}
+
+function Invoke-IiiEngineTrigger {
+    param(
+        [Parameter(Mandatory)][string]$FunctionPath,
+        [string[]]$ExtraArgs = @(),
+        [int]$TimeoutMs = 30000
+    )
+    $iii = Get-IiiExe
+    if (-not (Test-Path $iii)) { throw "iii CLI not found: $iii" }
+    $engineHost = Get-IiiEngineHost
+    $triggerArgs = @("trigger", "--address", $engineHost, "--timeout-ms", $TimeoutMs, $FunctionPath) + $ExtraArgs
+    & $iii @triggerArgs
 }
 
 function Get-IiiWorkerEnvironment {
@@ -57,6 +94,7 @@ function Start-IiiPythonWorker {
     $script = Join-Path $IiiRoot "workers\$WorkerName\src\main.py"
     if (-not (Test-Path $script)) { throw "Worker script not found: $script" }
     $py = (Get-Command python -ErrorAction Stop).Source
+    $env:PYTHONPATH = $IiiRoot
     $envBlock = Get-IiiWorkerEnvironment
     $params = @{
         FilePath = $py

iii/scripts/restart-workers.ps1

@@ -1,13 +1,28 @@
 # Restart III Python workers with full env (DISCORD_TOKEN, ODP_INGEST_URL, …).
-# Usage: .\scripts\restart-workers.ps1 [-ReloadSchedules]
+# Usage:
+#   .\scripts\restart-workers.ps1              # local full stack (dev)
+#   .\scripts\restart-workers.ps1 -NasEdge     # PC edge only → NAS engine (production)
+#   .\scripts\restart-workers.ps1 -ReloadSchedules
 
-param([switch]$ReloadSchedules)
+param(
+    [switch]$ReloadSchedules,
+    [switch]$NasEdge
+)
 
 $ErrorActionPreference = "Stop"
-. (Join-Path $PSScriptRoot "Import-IiiEnv.ps1")
 
+. (Join-Path $PSScriptRoot "Import-IiiEnv.ps1")
 $ctx = Import-IiiEnv
-Write-Host "III workers restart (env: $($ctx.EnvFile))"
+
+if ($NasEdge -or $ctx.NasEdge) {
+    if (-not $NasEdge) {
+        Write-Host "III_DEPLOY_MODE=nas-edge — edge workers only (collector-discord → $($ctx.EngineHost))"
+    }
+    & (Join-Path $PSScriptRoot "start-edge-workers.ps1") @PSBoundParameters
+    return
+}
+
+Write-Host "III workers restart (local stack, env: $($ctx.EnvFile))"
 
 Stop-IiiPythonWorkers
 Start-Sleep -Seconds 2
@@ -19,12 +34,11 @@ foreach ($w in @("odp-ingest-bridge", "collector-discord", "collector-opencli",
 
 Start-Sleep -Seconds 3
 
-$IiiExe = Join-Path $env:USERPROFILE ".local\iii\iii.exe"
-& $IiiExe trigger odp.ingest::health | Out-Host
-& $IiiExe trigger discord::status | Out-Host
+Invoke-IiiEngineTrigger "odp.ingest::health" | Out-Host
+Invoke-IiiEngineTrigger "discord::status" | Out-Host
 
 if ($ReloadSchedules) {
-    & $IiiExe trigger odp.schedule::reload | Out-Host
+    Invoke-IiiEngineTrigger "odp.schedule::reload" | Out-Host
 }
 
 Write-Host "Done. Workers run on THIS machine until stop-workers.ps1 or reboot."

iii/workers/collector-opencli/Dockerfile

@@ -6,11 +6,13 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/* \
     && npm install -g @jackwener/opencli
 
-COPY workers/collector-opencli/pyproject.toml workers/collector-opencli/src ./worker/
+COPY workers/collector-opencli/pyproject.toml ./worker/
+COPY workers/collector-opencli/src ./worker/src/
 COPY lib ./lib
 RUN pip install --no-cache-dir -e ./worker
 
 ENV PYTHONUNBUFFERED=1
+ENV PYTHONPATH=/app
 ENV OPENCLI_BIN=opencli
 ENV OPENCLI_MODE=bridge
 ENV OPENCLI_DAEMON_HOST=agent-1

iii/workers/odp-ingest-bridge/Dockerfile

@@ -1,7 +1,9 @@
 FROM python:3.12-slim-bookworm
 WORKDIR /app
-COPY workers/odp-ingest-bridge/pyproject.toml workers/odp-ingest-bridge/src ./worker/
+COPY workers/odp-ingest-bridge/pyproject.toml ./worker/
+COPY workers/odp-ingest-bridge/src ./worker/src/
 COPY lib ./lib
 RUN pip install --no-cache-dir -e ./worker
 ENV PYTHONUNBUFFERED=1
+ENV PYTHONPATH=/app
 CMD ["python", "worker/src/main.py"]

iii/workers/schedule-bootstrap/Dockerfile

@@ -2,7 +2,8 @@ FROM python:3.13-slim
 WORKDIR /app
 COPY lib /app/lib
 COPY schedules /app/schedules
-COPY workers/schedule-bootstrap/pyproject.toml workers/schedule-bootstrap/src /app/workers/schedule-bootstrap/
+COPY workers/schedule-bootstrap/pyproject.toml /app/workers/schedule-bootstrap/
+COPY workers/schedule-bootstrap/src /app/workers/schedule-bootstrap/src/
 RUN pip install --no-cache-dir -e ./workers/schedule-bootstrap
 ENV DISCORD_SCHEDULES_PATH=/app/schedules/discord.yaml
 ENV OPENCLI_SCHEDULES_PATH=/app/schedules/opencli.yaml

odp-rs/Cargo.lock

@@ -5,7 +5,8 @@ COPY crates ./crates
 RUN cargo build --release -p odp-ingest
 
 FROM debian:bookworm-slim
-RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates && rm -rf /var/lib/apt/lists/*
+# curl is required for the docker-compose healthcheck (curl -f localhost:8040/health).
+RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates curl && rm -rf /var/lib/apt/lists/*
 COPY --from=builder /app/target/release/odp-ingest /usr/local/bin/odp-ingest
 EXPOSE 8040
 CMD ["odp-ingest"]

odp-rs/Dockerfile.ingest

@@ -5,6 +5,10 @@ COPY crates ./crates
 RUN cargo build --release -p odp-store
 
 FROM debian:bookworm-slim
-RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates && rm -rf /var/lib/apt/lists/*
+# procps provides pgrep, used by the docker-compose healthcheck below: odp-store
+# has no HTTP/TCP listener (it's a pure Redis-stream consumer loop), so the best
+# available liveness probe is "is the process still running" rather than a
+# network check.
+RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates procps && rm -rf /var/lib/apt/lists/*
 COPY --from=builder /app/target/release/odp-store /usr/local/bin/odp-store
 CMD ["odp-store"]