4runr-os 2.10.2 → 2.10.4

package/mk3-tui/src/main.rs

@@ -424,6 +424,32 @@ fn main() -> Result<()> {
                                                 format!("Fetched: {}", if snapshot.is_empty() { "—" } else { snapshot.as_str() }),
                                                 String::new(),
                                             ];
+                                            if let Some(tot) = obj.get("totals").and_then(|v| v.get("httpRequests")) {
+                                                let current = tot
+                                                    .as_u64()
+                                                    .or_else(|| tot.as_f64().map(|f| f as u64));
+                                                if let Some(c) = current {
+                                                    if let (Some(prev), Some(last_t)) = (
+                                                        app.state.portal_monitoring.last_http_for_delta,
+                                                        app.state.portal_monitoring.last_instant_for_delta,
+                                                    ) {
+                                                        let d = c.saturating_sub(prev);
+                                                        let el = last_t.elapsed().as_secs_f32().max(0.1);
+                                                        let per_min = (d as f32 / el) * 60.0;
+                                                        let pulse = if d > 0 { "  *" } else { "  --" };
+                                                        lines.push(format!(
+                                                            "LIVE: +{} HTTP since last screen refresh (~{:.0}/min){}",
+                                                            d, per_min, pulse
+                                                        ));
+                                                    } else {
+                                                        lines.push("LIVE: first sample — next refresh shows HTTP request rate (poll interval).".to_string());
+                                                    }
+                                                    app.state.portal_monitoring.last_http_for_delta = Some(c);
+                                                    app.state.portal_monitoring.last_instant_for_delta =
+                                                        Some(std::time::Instant::now());
+                                                }
+                                            }
+                                            lines.push(String::new());
                                             if let Some(arr) = obj.get("healthLines").and_then(|a| a.as_array()) {
                                                 for v in arr {
                                                     if let Some(s) = v.as_str() {
@@ -433,7 +459,7 @@ fn main() -> Result<()> {
                                                 lines.push(String::new());
                                             }
                                             lines.push(
-                                                "Prometheus /metrics (HTTP totals stay 0 until something hits this Gateway)."
+                                                "Prometheus /metrics (HTTP total includes this screen’s /health, /ready, and /metrics polls; add API/agent traffic for runs/queue/SSE)."
                                                     .to_string(),
                                             );
                                             lines.push(String::new());

package/mk3-tui/src/ui/portal_monitoring.rs

@@ -118,7 +118,12 @@ pub fn render(f: &mut Frame, state: &mut AppState) {
             }
             
             // Special formatting for different line types
-            if line_text.starts_with("✓") || line_text.starts_with("/health OK") {
+            if line_text.starts_with("LIVE:") {
+                body_lines.push(Line::from(Span::styled(
+                    line_text,
+                    Style::default().fg(NEON_GREEN).bold(),
+                )));
+            } else if line_text.starts_with("✓") || line_text.starts_with("/health OK") {
                 body_lines.push(Line::from(Span::styled(
                     line_text,
                     Style::default().fg(NEON_GREEN),

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "4runr-os",
-  "version": "2.10.2",
+  "version": "2.10.4",
   "type": "module",
-  "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.10.2: Portal Monitoring — auto-refresh, uptime/queue/memory metrics, /api/monitoring/summary; /health includes uptime+memory; TUI text-only (no decorative emoji). v2.10.1+ Docker Postgres+Redis in auto mode. See docs/4RUNR-DB-IMPLEMENTATION-PLAN.md, docs/MONITORING-IMPROVEMENTS-V1.md",
+  "description": "4Runr AI Agent OS - Secure terminal interface for AI agents. v2.10.4: TUI autostart local Redis (Docker) by default for Gateway; FOURRUNR_NO_AUTO_REDIS=1 to opt out; Portal Monitoring LIVE request-rate line; /ready messages for Redis. v2.10.3: prisma/ in package + postinstall generate. v2.10.2+ monitoring. See docs/4RUNR-DB-IMPLEMENTATION-PLAN.md, docs/MONITORING-IMPROVEMENTS-V1.md",
   "main": "dist/index.js",
   "bin": {
     "4runr": "dist/index.js",
@@ -84,6 +84,7 @@
     "mk3-tui/bin/**/*",
     "mk3-tui/binaries/**/*",
     "apps/gateway/**/*",
+    "prisma/**/*",
     "packages/shared/package.json",
     "packages/shared/dist/**/*",
     "packages/sentinel/package.json",

package/prisma/migrations/20250806234307_add_agent_model/migration.sql

@@ -0,0 +1,23 @@
+-- CreateTable
+CREATE TABLE "Agent" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "name" TEXT NOT NULL,
+    "role" TEXT NOT NULL,
+    "createdBy" TEXT NOT NULL,
+    "publicKey" TEXT NOT NULL,
+    "status" TEXT NOT NULL DEFAULT 'active',
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+-- CreateTable
+CREATE TABLE "Token" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "agentId" TEXT NOT NULL,
+    "token" TEXT NOT NULL,
+    "expiresAt" DATETIME NOT NULL,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    CONSTRAINT "Token_agentId_fkey" FOREIGN KEY ("agentId") REFERENCES "Agent" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Token_token_key" ON "Token"("token");

package/prisma/migrations/20250806234618_add_token_model/migration.sql

@@ -0,0 +1,24 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `token` on the `Token` table. All the data in the column will be lost.
+  - Added the required column `encrypted` to the `Token` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- RedefineTables
+PRAGMA defer_foreign_keys=ON;
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_Token" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "agentId" TEXT NOT NULL,
+    "encrypted" TEXT NOT NULL,
+    "expiresAt" DATETIME NOT NULL,
+    "revoked" BOOLEAN NOT NULL DEFAULT false,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    CONSTRAINT "Token_agentId_fkey" FOREIGN KEY ("agentId") REFERENCES "Agent" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+INSERT INTO "new_Token" ("agentId", "createdAt", "expiresAt", "id") SELECT "agentId", "createdAt", "expiresAt", "id" FROM "Token";
+DROP TABLE "Token";
+ALTER TABLE "new_Token" RENAME TO "Token";
+PRAGMA foreign_keys=ON;
+PRAGMA defer_foreign_keys=OFF;

package/prisma/migrations/20250807002545_add_request_log_model/migration.sql

@@ -0,0 +1,12 @@
+-- CreateTable
+CREATE TABLE "RequestLog" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "agentId" TEXT NOT NULL,
+    "tool" TEXT NOT NULL,
+    "action" TEXT NOT NULL,
+    "responseTime" INTEGER NOT NULL,
+    "statusCode" INTEGER NOT NULL,
+    "success" BOOLEAN NOT NULL,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    CONSTRAINT "RequestLog_agentId_fkey" FOREIGN KEY ("agentId") REFERENCES "Agent" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);

package/prisma/migrations/20250811200143_init/migration.sql

@@ -0,0 +1,75 @@
+-- CreateTable
+CREATE TABLE "Policy" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "name" TEXT NOT NULL,
+    "description" TEXT,
+    "agentId" TEXT,
+    "role" TEXT,
+    "spec" TEXT NOT NULL,
+    "specHash" TEXT NOT NULL,
+    "active" BOOLEAN NOT NULL DEFAULT true,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "Policy_agentId_fkey" FOREIGN KEY ("agentId") REFERENCES "Agent" ("id") ON DELETE SET NULL ON UPDATE CASCADE
+);
+
+-- CreateTable
+CREATE TABLE "PolicyLog" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "policyId" TEXT NOT NULL,
+    "agentId" TEXT NOT NULL,
+    "tool" TEXT NOT NULL,
+    "action" TEXT NOT NULL,
+    "decision" TEXT NOT NULL,
+    "reason" TEXT,
+    "requestData" TEXT,
+    "responseData" TEXT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    CONSTRAINT "PolicyLog_policyId_fkey" FOREIGN KEY ("policyId") REFERENCES "Policy" ("id") ON DELETE RESTRICT ON UPDATE CASCADE,
+    CONSTRAINT "PolicyLog_agentId_fkey" FOREIGN KEY ("agentId") REFERENCES "Agent" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateTable
+CREATE TABLE "QuotaCounter" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "policyId" TEXT NOT NULL,
+    "quotaKey" TEXT NOT NULL,
+    "current" INTEGER NOT NULL DEFAULT 0,
+    "resetAt" DATETIME NOT NULL,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "QuotaCounter_policyId_fkey" FOREIGN KEY ("policyId") REFERENCES "Policy" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateTable
+CREATE TABLE "ToolCredential" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "tool" TEXT NOT NULL,
+    "version" TEXT NOT NULL,
+    "isActive" BOOLEAN NOT NULL DEFAULT false,
+    "encryptedCredential" TEXT NOT NULL,
+    "metadata" TEXT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "activatedAt" DATETIME,
+    "deactivatedAt" DATETIME
+);
+
+-- CreateTable
+CREATE TABLE "TokenRegistry" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "tokenId" TEXT NOT NULL,
+    "agentId" TEXT NOT NULL,
+    "payloadHash" TEXT NOT NULL,
+    "issuedAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "expiresAt" DATETIME NOT NULL,
+    "isRevoked" BOOLEAN NOT NULL DEFAULT false,
+    "revokedAt" DATETIME,
+    CONSTRAINT "TokenRegistry_agentId_fkey" FOREIGN KEY ("agentId") REFERENCES "Agent" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "ToolCredential_tool_version_key" ON "ToolCredential"("tool", "version");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "TokenRegistry_tokenId_key" ON "TokenRegistry"("tokenId");

package/prisma/migrations/20250820014813_add_agent_runtime_models/migration.sql

@@ -0,0 +1,44 @@
+-- CreateTable
+CREATE TABLE "runtime_agents" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "name" TEXT NOT NULL,
+    "language" TEXT NOT NULL,
+    "sourceType" TEXT NOT NULL DEFAULT 'ZIP',
+    "sourceUri" TEXT,
+    "entrypoint" TEXT NOT NULL,
+    "env" JSONB NOT NULL,
+    "limitsCpu" REAL,
+    "limitsMemMb" INTEGER,
+    "networkMode" TEXT NOT NULL DEFAULT 'NONE',
+    "status" TEXT NOT NULL DEFAULT 'READY',
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL
+);
+
+-- CreateTable
+CREATE TABLE "runtime_runs" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "agentId" TEXT NOT NULL,
+    "status" TEXT NOT NULL DEFAULT 'QUEUED',
+    "startedAt" DATETIME,
+    "endedAt" DATETIME,
+    "exitCode" INTEGER,
+    "reason" TEXT,
+    "cpuSeconds" REAL,
+    "maxMemMb" INTEGER,
+    "logsPtr" TEXT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    CONSTRAINT "runtime_runs_agentId_fkey" FOREIGN KEY ("agentId") REFERENCES "runtime_agents" ("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+
+-- CreateTable
+CREATE TABLE "runtime_schedules" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "agentId" TEXT NOT NULL,
+    "cronExpr" TEXT NOT NULL,
+    "enabled" BOOLEAN NOT NULL DEFAULT true,
+    "lastRunAt" DATETIME,
+    "nextRunAt" DATETIME,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    CONSTRAINT "runtime_schedules_agentId_fkey" FOREIGN KEY ("agentId") REFERENCES "runtime_agents" ("id") ON DELETE CASCADE ON UPDATE CASCADE
+);

package/prisma/migrations/20250820024550_task003_monitoring/migration.sql

@@ -0,0 +1,49 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `logsPtr` on the `runtime_runs` table. All the data in the column will be lost.
+
+*/
+-- RedefineTables
+PRAGMA defer_foreign_keys=ON;
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_runtime_agents" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "name" TEXT NOT NULL,
+    "language" TEXT NOT NULL,
+    "sourceType" TEXT NOT NULL DEFAULT 'ZIP',
+    "sourceUri" TEXT,
+    "entrypoint" TEXT NOT NULL,
+    "env" JSONB NOT NULL,
+    "limitsCpu" REAL,
+    "limitsMemMb" INTEGER,
+    "networkMode" TEXT NOT NULL DEFAULT 'NONE',
+    "status" TEXT NOT NULL DEFAULT 'READY',
+    "maxRestarts" INTEGER NOT NULL DEFAULT 2,
+    "restartBackoffMs" INTEGER NOT NULL DEFAULT 5000,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL
+);
+INSERT INTO "new_runtime_agents" ("createdAt", "entrypoint", "env", "id", "language", "limitsCpu", "limitsMemMb", "name", "networkMode", "sourceType", "sourceUri", "status", "updatedAt") SELECT "createdAt", "entrypoint", "env", "id", "language", "limitsCpu", "limitsMemMb", "name", "networkMode", "sourceType", "sourceUri", "status", "updatedAt" FROM "runtime_agents";
+DROP TABLE "runtime_agents";
+ALTER TABLE "new_runtime_agents" RENAME TO "runtime_agents";
+CREATE TABLE "new_runtime_runs" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "agentId" TEXT NOT NULL,
+    "status" TEXT NOT NULL DEFAULT 'QUEUED',
+    "startedAt" DATETIME,
+    "endedAt" DATETIME,
+    "exitCode" INTEGER,
+    "reason" TEXT,
+    "cpuSeconds" REAL,
+    "maxMemMb" INTEGER,
+    "restarts" INTEGER NOT NULL DEFAULT 0,
+    "lastSampleAt" DATETIME,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    CONSTRAINT "runtime_runs_agentId_fkey" FOREIGN KEY ("agentId") REFERENCES "runtime_agents" ("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+INSERT INTO "new_runtime_runs" ("agentId", "cpuSeconds", "createdAt", "endedAt", "exitCode", "id", "maxMemMb", "reason", "startedAt", "status") SELECT "agentId", "cpuSeconds", "createdAt", "endedAt", "exitCode", "id", "maxMemMb", "reason", "startedAt", "status" FROM "runtime_runs";
+DROP TABLE "runtime_runs";
+ALTER TABLE "new_runtime_runs" RENAME TO "runtime_runs";
+PRAGMA foreign_keys=ON;
+PRAGMA defer_foreign_keys=OFF;

package/prisma/migrations/20250820160424_task005_demo_tags/migration.sql

@@ -0,0 +1,26 @@
+-- RedefineTables
+PRAGMA defer_foreign_keys=ON;
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_runtime_agents" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "name" TEXT NOT NULL,
+    "language" TEXT NOT NULL,
+    "sourceType" TEXT NOT NULL DEFAULT 'ZIP',
+    "sourceUri" TEXT,
+    "entrypoint" TEXT NOT NULL,
+    "env" JSONB NOT NULL,
+    "limitsCpu" REAL,
+    "limitsMemMb" INTEGER,
+    "networkMode" TEXT NOT NULL DEFAULT 'NONE',
+    "status" TEXT NOT NULL DEFAULT 'READY',
+    "maxRestarts" INTEGER NOT NULL DEFAULT 2,
+    "restartBackoffMs" INTEGER NOT NULL DEFAULT 5000,
+    "tags" JSONB NOT NULL DEFAULT [],
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL
+);
+INSERT INTO "new_runtime_agents" ("createdAt", "entrypoint", "env", "id", "language", "limitsCpu", "limitsMemMb", "maxRestarts", "name", "networkMode", "restartBackoffMs", "sourceType", "sourceUri", "status", "updatedAt") SELECT "createdAt", "entrypoint", "env", "id", "language", "limitsCpu", "limitsMemMb", "maxRestarts", "name", "networkMode", "restartBackoffMs", "sourceType", "sourceUri", "status", "updatedAt" FROM "runtime_agents";
+DROP TABLE "runtime_agents";
+ALTER TABLE "new_runtime_agents" RENAME TO "runtime_agents";
+PRAGMA foreign_keys=ON;
+PRAGMA defer_foreign_keys=OFF;

package/prisma/migrations/20250820162446_task006_trigger_tracking/migration.sql

@@ -0,0 +1,24 @@
+-- RedefineTables
+PRAGMA defer_foreign_keys=ON;
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_runtime_runs" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "agentId" TEXT NOT NULL,
+    "status" TEXT NOT NULL DEFAULT 'QUEUED',
+    "startedAt" DATETIME,
+    "endedAt" DATETIME,
+    "exitCode" INTEGER,
+    "reason" TEXT,
+    "cpuSeconds" REAL,
+    "maxMemMb" INTEGER,
+    "restarts" INTEGER NOT NULL DEFAULT 0,
+    "lastSampleAt" DATETIME,
+    "triggeredBy" TEXT NOT NULL DEFAULT 'MANUAL',
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    CONSTRAINT "runtime_runs_agentId_fkey" FOREIGN KEY ("agentId") REFERENCES "runtime_agents" ("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+INSERT INTO "new_runtime_runs" ("agentId", "cpuSeconds", "createdAt", "endedAt", "exitCode", "id", "lastSampleAt", "maxMemMb", "reason", "restarts", "startedAt", "status") SELECT "agentId", "cpuSeconds", "createdAt", "endedAt", "exitCode", "id", "lastSampleAt", "maxMemMb", "reason", "restarts", "startedAt", "status" FROM "runtime_runs";
+DROP TABLE "runtime_runs";
+ALTER TABLE "new_runtime_runs" RENAME TO "runtime_runs";
+PRAGMA foreign_keys=ON;
+PRAGMA defer_foreign_keys=OFF;

package/prisma/migrations/migration_lock.toml

@@ -0,0 +1,3 @@
+# Please do not edit this file manually
+# It should be added in your version-control system (e.g., Git)
+provider = "postgresql"