@gmickel/gno 1.17.0 → 1.19.0

package/src/serve/jobs.ts

@@ -1,13 +1,8 @@
-/**
- * Background job tracker for API write operations.
- * Simple in-memory tracking with global mutex (one job at a time).
- *
- * @module src/serve/jobs
- */
+/** REST-compatible facade over the resident JobManager. */
 
+import type { JobManager, JobRecord } from "../core/job-manager";
 import type { SyncResult } from "../ingestion";
 
-// Job expiration: 1 hour
 const JOB_EXPIRATION_MS = 60 * 60 * 1000;
 
 export type JobType = "add" | "sync" | "embed";
@@ -42,44 +37,60 @@ export interface StartJobError {
 
 export type StartJobResult = StartJobSuccess | StartJobError;
 
-// Global state - only one job can run at a time
+// Standalone fallback retained for unit fixtures that do not construct a resident.
 let activeJobId: string | null = null;
 const jobs = new Map<string, JobStatus>();
 
-/**
- * Clean up expired jobs to prevent memory leaks.
- * Called on every job access.
- * Only expires completed/failed jobs - running jobs are never expired.
- */
+const fromResidentRecord = (record: JobRecord): JobStatus => ({
+  id: record.id,
+  type: record.type as JobType,
+  status: record.status,
+  createdAt: record.startedAt,
+  progress: record.progress,
+  result: record.result,
+  error: record.error,
+});
+
 function cleanupExpiredJobs(now = Date.now()): void {
   for (const [id, job] of jobs) {
-    // Never expire running jobs - only completed/failed
-    if (job.status === "running") {
-      continue;
-    }
-    if (now - job.createdAt > JOB_EXPIRATION_MS) {
+    if (job.status !== "running" && now - job.createdAt > JOB_EXPIRATION_MS) {
       jobs.delete(id);
     }
   }
 }
 
-/**
- * Start a background job.
- * Returns immediately with jobId; caller polls /api/jobs/:id for status.
- * Use updateJobProgress() to update progress during execution.
- *
- * @param type - Job type identifier
- * @param fn - Async function to run in background
- * @returns Job ID on success, or 409 error if job already running
- */
 export function startJob(
   type: JobType,
   fn: () => Promise<SyncResult>
-): StartJobResult {
-  // Cleanup expired jobs first
-  cleanupExpiredJobs();
+): StartJobResult;
+export function startJob(
+  type: JobType,
+  fn: () => Promise<SyncResult>,
+  manager: JobManager
+): Promise<StartJobResult>;
+export function startJob(
+  type: JobType,
+  fn: () => Promise<SyncResult>,
+  manager: JobManager | undefined
+): StartJobResult | Promise<StartJobResult>;
+export function startJob(
+  type: JobType,
+  fn: () => Promise<SyncResult>,
+  manager?: JobManager
+): StartJobResult | Promise<StartJobResult> {
+  if (manager) {
+    return manager.startJob(type, fn).then(
+      (jobId) => ({ ok: true, jobId }),
+      (error: unknown) => ({
+        ok: false,
+        error: error instanceof Error ? error.message : String(error),
+        status: 409,
+        activeJobId: manager.getActiveJob()?.id ?? "",
+      })
+    );
+  }
 
-  // Check if a job is already running
+  cleanupExpiredJobs();
   if (activeJobId) {
     return {
       ok: false,
@@ -88,21 +99,14 @@ export function startJob(
       activeJobId,
     };
   }
-
   const jobId = crypto.randomUUID();
   activeJobId = jobId;
-
-  const jobStatus: JobStatus = {
+  jobs.set(jobId, {
     id: jobId,
     type,
     status: "running",
     createdAt: Date.now(),
-  };
-  jobs.set(jobId, jobStatus);
-
-  // Run in background (don't await)
-  // Wrap with Promise.resolve().then() to catch sync throws from fn()
-  // Without this, a sync throw would leave activeJobId set forever (deadlock)
+  });
   Promise.resolve()
     .then(fn)
     .then((result) => {
@@ -112,73 +116,67 @@ export function startJob(
         job.result = result;
       }
     })
-    .catch((e) => {
+    .catch((error: unknown) => {
       const job = jobs.get(jobId);
       if (job) {
         job.status = "failed";
-        job.error = e instanceof Error ? e.message : String(e);
+        job.error = error instanceof Error ? error.message : String(error);
       }
     })
     .finally(() => {
       activeJobId = null;
     });
-
   return { ok: true, jobId };
 }
 
-/**
- * Get current status of a job.
- *
- * @param jobId - Job ID from startJob
- * @returns Job status or undefined if not found
- */
-export function getJobStatus(jobId: string): JobStatus | undefined {
+export function getJobStatus(
+  jobId: string,
+  manager?: JobManager
+): JobStatus | undefined {
+  if (manager) {
+    const record = manager.getJob(jobId);
+    return record ? fromResidentRecord(record) : undefined;
+  }
   cleanupExpiredJobs();
   return jobs.get(jobId);
 }
 
-/**
- * Get the currently active job ID, if any.
- */
-export function getActiveJobId(): string | null {
-  return activeJobId;
+export function getActiveJobId(manager?: JobManager): string | null {
+  return manager?.getActiveJob()?.id ?? activeJobId;
 }
 
-/**
- * Get the currently active job status, if any.
- */
-export function getActiveJob(): JobStatus | null {
-  if (!activeJobId) {
-    return null;
+export function getActiveJob(manager?: JobManager): JobStatus | null {
+  if (manager) {
+    const record = manager.getActiveJob();
+    return record ? fromResidentRecord(record) : null;
   }
-  return jobs.get(activeJobId) ?? null;
+  return activeJobId ? (jobs.get(activeJobId) ?? null) : null;
 }
 
-/**
- * Update job progress (called from within job execution).
- *
- * @param jobId - Job ID to update
- * @param progress - Current progress info
- */
-export function updateJobProgress(jobId: string, progress: JobProgress): void {
-  const job = jobs.get(jobId);
-  if (job) {
-    job.progress = progress;
+export function updateJobProgress(
+  jobId: string,
+  progress: JobProgress,
+  manager?: JobManager
+): void {
+  if (manager) {
+    manager.updateJobProgress(jobId, progress);
+    return;
   }
+  const job = jobs.get(jobId);
+  if (job) job.progress = progress;
 }
 
-/**
- * Get all jobs (for debugging/monitoring).
- */
-export function getAllJobs(): JobStatus[] {
+export function getAllJobs(manager?: JobManager): JobStatus[] {
+  if (manager) {
+    const listed = manager.listJobs(100);
+    return [...listed.active, ...listed.recent].map(fromResidentRecord);
+  }
   cleanupExpiredJobs();
   return Array.from(jobs.values());
 }
 
-/**
- * Clear all jobs (for testing).
- */
-export function clearAllJobs(): void {
+export function clearAllJobs(manager?: JobManager): void {
+  if (manager) manager.clear();
   jobs.clear();
   activeJobId = null;
 }

package/src/serve/public/app.tsx

@@ -29,6 +29,7 @@ import DocumentEditor from "./pages/DocumentEditor";
 import DocView from "./pages/DocView";
 import GraphView from "./pages/GraphView";
 import Search from "./pages/Search";
+import TraceHistory from "./pages/TraceHistory";
 
 type Route =
   | "/"
@@ -39,7 +40,8 @@ type Route =
   | "/edit"
   | "/collections"
   | "/graph"
-  | "/connectors";
+  | "/connectors"
+  | "/traces";
 type Navigate = (to: string | number) => void;
 
 interface RoutePageProps {
@@ -57,6 +59,7 @@ const routes: Record<Route, React.ComponentType<RoutePageProps>> = {
   "/connectors": Connectors,
   "/ask": Ask,
   "/graph": GraphView,
+  "/traces": TraceHistory,
 };
 
 interface AppContentProps {
@@ -165,6 +168,14 @@ function AppContent({
               Collections
             </button>
             <span className="text-border/30">—</span>
+            <button
+              className="transition-colors duration-300 hover:text-primary"
+              onClick={() => navigate("/traces")}
+              type="button"
+            >
+              Trace history
+            </button>
+            <span className="text-border/30">—</span>
             <a
               className="transition-colors duration-300 hover:text-primary"
               href="https://github.com/gmickel/gno"

package/src/serve/public/components/HealthCenter.tsx

@@ -1,8 +1,10 @@
 import {
+  ActivityIcon,
   AlertCircleIcon,
   CheckCircle2Icon,
   HardDriveIcon,
   Loader2Icon,
+  ServerIcon,
   SparklesIcon,
 } from "lucide-react";
 
@@ -24,6 +26,7 @@ import {
 
 interface HealthCenterProps {
   health: AppStatusResponse["health"];
+  resident: AppStatusResponse["resident"];
   onAction: (action: HealthActionKind) => void;
   busyAction?: HealthActionKind | null;
 }
@@ -52,6 +55,7 @@ function getStatusLabel(status: HealthCheck["status"]): string {
 
 export function HealthCenter({
   health,
+  resident,
   onAction,
   busyAction,
 }: HealthCenterProps) {
@@ -83,7 +87,76 @@ export function HealthCenter({
         </Badge>
       </div>
 
-      <div className="grid gap-4 md:grid-cols-2 xl:grid-cols-3">
+      <div className="rounded-lg border border-border/40 bg-muted/10 px-4 py-3">
+        <div className="mb-3 flex items-center gap-2">
+          <ServerIcon className="size-4 text-primary" />
+          <h3 className="font-mono text-[10px] text-muted-foreground uppercase tracking-[0.15em]">
+            {resident.resident ? "Resident runtime" : "Standalone runtime"}
+          </h3>
+          <span className="ml-auto rounded bg-primary/12 px-1.5 py-0.5 font-mono text-[10px] text-primary tabular-nums">
+            {resident.mode}
+          </span>
+        </div>
+        <dl className="grid grid-cols-2 gap-x-4 gap-y-3 text-sm sm:grid-cols-4 lg:grid-cols-6">
+          <div>
+            <dt className="font-mono text-[9px] text-muted-foreground/50 uppercase">
+              Uptime
+            </dt>
+            <dd className="font-mono tabular-nums">
+              {resident.uptimeSeconds === null
+                ? "standalone"
+                : `${resident.uptimeSeconds}s`}
+            </dd>
+          </div>
+          <div>
+            <dt className="font-mono text-[9px] text-muted-foreground/50 uppercase">
+              Listener
+            </dt>
+            <dd className="font-mono tabular-nums">
+              {resident.listenerPort ?? "none"}
+            </dd>
+          </div>
+          <div>
+            <dt className="font-mono text-[9px] text-muted-foreground/50 uppercase">
+              Sessions
+            </dt>
+            <dd className="font-mono tabular-nums">
+              {resident.transport.activeSessions}
+            </dd>
+          </div>
+          <div>
+            <dt className="font-mono text-[9px] text-muted-foreground/50 uppercase">
+              Requests
+            </dt>
+            <dd className="font-mono tabular-nums">
+              {resident.transport.activeRequests}
+              {resident.transport.queuedRequests > 0
+                ? ` +${resident.transport.queuedRequests} queued`
+                : ""}
+            </dd>
+          </div>
+          <div>
+            <dt className="font-mono text-[9px] text-muted-foreground/50 uppercase">
+              Models
+            </dt>
+            <dd className="font-mono tabular-nums">
+              {resident.models.loadedModels} warm ·{" "}
+              {resident.models.activeLeases} leased
+            </dd>
+          </div>
+          <div>
+            <dt className="font-mono text-[9px] text-muted-foreground/50 uppercase">
+              Admission
+            </dt>
+            <dd className="flex items-center gap-1.5 font-mono">
+              <ActivityIcon className="size-3 text-primary" />
+              {resident.admission.state}
+            </dd>
+          </div>
+        </dl>
+      </div>
+
+      <div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
         {health.checks.map((check) => {
           const isBusy = busyAction === check.actionKind;