@opengeni/api-router 0.15.4 → 0.15.6

package/dist/index.js

@@ -1,7 +1,7 @@
 import {
   createAppComposition,
   startSlackInteractionPump
-} from "./chunk-ICRZC3JH.js";
+} from "./chunk-MN7BW3UV.js";
 
 // src/index.ts
 import {

package/dist/sandbox/channel-a.d.ts

@@ -2,11 +2,13 @@ import { type Settings } from "@opengeni/config";
 import type { Session } from "@opengeni/contracts";
 import { type Database, type LeaseSnapshot } from "@opengeni/db";
 import { type EventBus } from "@opengeni/events";
+import { type Observability } from "@opengeni/observability";
 import { SandboxChannelAService, type RoutingSandboxSession } from "@opengeni/runtime/sandbox";
 export type ChannelAServices = {
     db: Database;
     settings: Settings;
     bus: EventBus;
+    observability?: Observability | undefined;
 };
 export type ChannelAContext = {
     accountId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeni/api-router",
-  "version": "0.15.4",
+  "version": "0.15.6",
   "description": "OpenGeni HTTP surface: the Hono adapter/router (createApp), routes, MCP HTTP transport, and HTTP access adapters over @opengeni/core. An engine-distribution surface — its runtime closure includes engine-internal packages.",
   "license": "Apache-2.0",
   "repository": {
@@ -46,14 +46,14 @@
     "@opengeni/codex": "^0.2.9",
     "@opengeni/config": "^0.9.1",
     "@opengeni/contracts": "^0.28.1",
-    "@opengeni/core": "^0.16.1",
-    "@opengeni/db": "^0.18.1",
-    "@opengeni/documents": "^0.2.63",
-    "@opengeni/events": "^0.3.54",
+    "@opengeni/core": "^0.16.3",
+    "@opengeni/db": "^0.19.0",
+    "@opengeni/documents": "^0.2.64",
+    "@opengeni/events": "^0.3.55",
     "@opengeni/github": "^0.4.13",
     "@opengeni/network": "^0.1.1",
-    "@opengeni/observability": "^0.3.0",
-    "@opengeni/runtime": "^0.15.3",
+    "@opengeni/observability": "^0.4.0",
+    "@opengeni/runtime": "^0.16.0",
     "@opengeni/storage": "^0.2.50",
     "@temporalio/client": "^1.17.0",
     "better-auth": "^1.6.14",

package/src/routes/sessions.ts

@@ -179,6 +179,7 @@ type SessionRouteDeps = ApiRouteDeps & Pick<ViewerServices, "establishSandboxSes
 
 export function registerSessionRoutes(app: Hono, deps: SessionRouteDeps): void {
   const { settings, db, bus, workflowClient, objectStorage } = deps;
+  const channelAServices = { db, settings, bus, observability: deps.observability };
   const workspaceCaptureManifestCache = new WorkspaceCaptureManifestCache();
   const ptyIdentity = (pty: SandboxOpenPtySessionRow): SandboxPtyProcessIdentity => ({
     leaseId: pty.leaseId,
@@ -2047,54 +2048,42 @@ export function registerSessionRoutes(app: Hono, deps: SessionRouteDeps): void {
   app.post("/v1/workspaces/:workspaceId/sessions/:sessionId/fs/list", async (c) => {
     const ctx = await channelAPreamble(c, "files:read");
     const req = await parseChannelABody(c, FsListRequest);
-    const out = await withChannelA({ db, settings, bus }, ctx, ({ service }) =>
-      service.fsList(req),
-    );
+    const out = await withChannelA(channelAServices, ctx, ({ service }) => service.fsList(req));
     return c.json(out);
   });
 
   app.post("/v1/workspaces/:workspaceId/sessions/:sessionId/fs/read", async (c) => {
     const ctx = await channelAPreamble(c, "files:read");
     const req = await parseChannelABody(c, FsReadRequest);
-    const out = await withChannelA({ db, settings, bus }, ctx, ({ service }) =>
-      service.fsRead(req),
-    );
+    const out = await withChannelA(channelAServices, ctx, ({ service }) => service.fsRead(req));
     return c.json(out);
   });
 
   app.post("/v1/workspaces/:workspaceId/sessions/:sessionId/fs/write", async (c) => {
     const ctx = await channelAPreamble(c, "files:write");
     const req = await parseChannelABody(c, FsWriteRequest);
-    const out = await withChannelA({ db, settings, bus }, ctx, ({ service }) =>
-      service.fsWrite(req),
-    );
+    const out = await withChannelA(channelAServices, ctx, ({ service }) => service.fsWrite(req));
     return c.json(out);
   });
 
   app.post("/v1/workspaces/:workspaceId/sessions/:sessionId/fs/delete", async (c) => {
     const ctx = await channelAPreamble(c, "files:write");
     const req = await parseChannelABody(c, FsDeleteRequest);
-    const out = await withChannelA({ db, settings, bus }, ctx, ({ service }) =>
-      service.fsDelete(req),
-    );
+    const out = await withChannelA(channelAServices, ctx, ({ service }) => service.fsDelete(req));
     return c.json(out);
   });
 
   app.post("/v1/workspaces/:workspaceId/sessions/:sessionId/fs/move", async (c) => {
     const ctx = await channelAPreamble(c, "files:write");
     const req = await parseChannelABody(c, FsMoveRequest);
-    const out = await withChannelA({ db, settings, bus }, ctx, ({ service }) =>
-      service.fsMove(req),
-    );
+    const out = await withChannelA(channelAServices, ctx, ({ service }) => service.fsMove(req));
     return c.json(out);
   });
 
   app.post("/v1/workspaces/:workspaceId/sessions/:sessionId/fs/mkdir", async (c) => {
     const ctx = await channelAPreamble(c, "files:write");
     const req = await parseChannelABody(c, FsMkdirRequest);
-    const out = await withChannelA({ db, settings, bus }, ctx, ({ service }) =>
-      service.fsMkdir(req),
-    );
+    const out = await withChannelA(channelAServices, ctx, ({ service }) => service.fsMkdir(req));
     return c.json(out);
   });
 
@@ -2102,36 +2091,28 @@ export function registerSessionRoutes(app: Hono, deps: SessionRouteDeps): void {
   app.post("/v1/workspaces/:workspaceId/sessions/:sessionId/git/status", async (c) => {
     const ctx = await channelAPreamble(c, "files:read");
     const req = await parseChannelABody(c, GitStatusRequest);
-    const out = await withChannelA({ db, settings, bus }, ctx, ({ service }) =>
-      service.gitStatus(req),
-    );
+    const out = await withChannelA(channelAServices, ctx, ({ service }) => service.gitStatus(req));
     return c.json(out);
   });
 
   app.post("/v1/workspaces/:workspaceId/sessions/:sessionId/git/diff", async (c) => {
     const ctx = await channelAPreamble(c, "files:read");
     const req = await parseChannelABody(c, GitDiffRequest);
-    const out = await withChannelA({ db, settings, bus }, ctx, ({ service }) =>
-      service.gitDiff(req),
-    );
+    const out = await withChannelA(channelAServices, ctx, ({ service }) => service.gitDiff(req));
     return c.json(out);
   });
 
   app.post("/v1/workspaces/:workspaceId/sessions/:sessionId/git/log", async (c) => {
     const ctx = await channelAPreamble(c, "files:read");
     const req = await parseChannelABody(c, GitLogRequest);
-    const out = await withChannelA({ db, settings, bus }, ctx, ({ service }) =>
-      service.gitLog(req),
-    );
+    const out = await withChannelA(channelAServices, ctx, ({ service }) => service.gitLog(req));
     return c.json(out);
   });
 
   app.post("/v1/workspaces/:workspaceId/sessions/:sessionId/git/show", async (c) => {
     const ctx = await channelAPreamble(c, "files:read");
     const req = await parseChannelABody(c, GitShowRequest);
-    const out = await withChannelA({ db, settings, bus }, ctx, ({ service }) =>
-      service.gitShow(req),
-    );
+    const out = await withChannelA(channelAServices, ctx, ({ service }) => service.gitShow(req));
     return c.json(out);
   });
 
@@ -2196,7 +2177,7 @@ export function registerSessionRoutes(app: Hono, deps: SessionRouteDeps): void {
   app.post("/v1/workspaces/:workspaceId/sessions/:sessionId/terminal/exec", async (c) => {
     const ctx = await channelAPreamble(c, "terminal:attach");
     const req = await parseChannelABody(c, TerminalExecRequest);
-    const out = await withChannelA({ db, settings, bus }, ctx, ({ service }) =>
+    const out = await withChannelA(channelAServices, ctx, ({ service }) =>
       service.terminalExec(req),
     );
     return c.json(out);
@@ -2213,7 +2194,7 @@ export function registerSessionRoutes(app: Hono, deps: SessionRouteDeps): void {
       });
     }
     const ptyId = crypto.randomUUID();
-    const out = await withChannelA({ db, settings, bus }, ctx, async (handle) => {
+    const out = await withChannelA(channelAServices, ctx, async (handle) => {
       if (!handle.lease) {
         throw new HTTPException(409, {
           message: "durable interactive terminals require a session-home provider lease",
@@ -2324,7 +2305,7 @@ export function registerSessionRoutes(app: Hono, deps: SessionRouteDeps): void {
       throw new HTTPException(404, { message: "pty not found or closed" });
     }
     let seq = 1;
-    await withChannelA({ db, settings, bus }, ctx, async (handle) => {
+    await withChannelA(channelAServices, ctx, async (handle) => {
       await adoptPtyProcess(ctx, handle, pty);
       let output: string;
       try {
@@ -2387,7 +2368,7 @@ export function registerSessionRoutes(app: Hono, deps: SessionRouteDeps): void {
     if (!pty) {
       throw new HTTPException(404, { message: "pty not found or closed" });
     }
-    await withChannelA({ db, settings, bus }, ctx, async (handle) => {
+    await withChannelA(channelAServices, ctx, async (handle) => {
       await adoptPtyProcess(ctx, handle, pty);
       await handle.service.ptyResize(req, pty.execSessionId);
       const updated = await updatePtySessionActivity(db, {
@@ -2418,7 +2399,7 @@ export function registerSessionRoutes(app: Hono, deps: SessionRouteDeps): void {
     });
     // Idempotent: closing an already-closed/absent PTY is a 204 no-op.
     if (pty) {
-      await withChannelA({ db, settings, bus }, ctx, async (handle) => {
+      await withChannelA(channelAServices, ctx, async (handle) => {
         await adoptPtyProcess(ctx, handle, pty);
         await handle.service.ptyClose(req, pty.execSessionId);
         const terminal = await getRetainedProcess(db, {

package/src/sandbox/channel-a.ts

@@ -40,6 +40,7 @@ import {
   type LeaseSnapshot,
 } from "@opengeni/db";
 import { appendAndPublishEvents, type EventBus } from "@opengeni/events";
+import { sandboxOperationMetricObserver, type Observability } from "@opengeni/observability";
 import { HTTPException } from "hono/http-exception";
 
 import {
@@ -67,6 +68,7 @@ export type ChannelAServices = {
   db: Database;
   settings: Settings;
   bus: EventBus;
+  observability?: Observability | undefined;
 };
 
 export type ChannelAContext = {
@@ -103,6 +105,9 @@ export async function withChannelA<T>(
   fn: (handle: ChannelAHandle) => Promise<T>,
 ): Promise<T> {
   const { db, settings, bus } = services;
+  const onSandboxOperation = services.observability
+    ? sandboxOperationMetricObserver(services.observability)
+    : undefined;
   const { accountId, workspaceId, session } = ctx;
 
   if (session.sandboxBackend === "none") {
@@ -204,7 +209,7 @@ export async function withChannelA<T>(
         backendId: "selfhosted",
       };
       const routed = wrapChannelABoxWithRouting(
-        { db, settings, bus },
+        { db, settings, bus, ...(onSandboxOperation ? { onSandboxOperation } : {}) },
         {
           accountId,
           workspaceId,
@@ -354,7 +359,7 @@ export async function withChannelA<T>(
     // routing may be dormant, but its direct mutation admission is mandatory for
     // every persistable provider write.
     const routed = wrapChannelABoxWithRouting(
-      { db, settings, bus },
+      { db, settings, bus, ...(onSandboxOperation ? { onSandboxOperation } : {}) },
       {
         accountId,
         workspaceId,