@automagik/omni 2.260717.2 → 2.260717.4

package/dist/index.js

@@ -125164,7 +125164,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@automagik/omni",
-  version: "2.260717.2",
+  version: "2.260717.4",
   description: "LLM-optimized CLI for Omni",
   type: "module",
   bin: {

package/dist/server/index.js

@@ -225883,7 +225883,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package7 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260717.2",
+    version: "2.260717.4",
     type: "module",
     exports: {
       ".": {
@@ -285026,11 +285026,9 @@ var init_genie_signature = __esm(() => {
         }
       }, 401);
     }
-    if (outcome.status === "verified" && outcome.hostId) {
+    if (outcome.status === "verified") {
       c.set("signedBy", outcome.hostId);
-      if (outcome.hostScopes) {
-        c.set("signedByScopes", outcome.hostScopes);
-      }
+      c.set("signedByScopes", outcome.hostScopes);
       services.genieHosts.touchLastSeen(outcome.hostId).catch((err) => {
         log59.warn("touchLastSeen failed (non-fatal)", { hostId: outcome.hostId, err: String(err) });
       });
@@ -285685,6 +285683,18 @@ var init_scopes = __esm(() => {
   };
 });
 
+// ../api/src/lib/signed-host-scope-context.ts
+function readSignedHostScopeContext(c) {
+  const hostId = c.get("signedBy");
+  if (!hostId)
+    return { kind: "unsigned" };
+  const scopes = c.get("signedByScopes");
+  if (!Array.isArray(scopes) || !scopes.every((scope) => typeof scope === "string")) {
+    return { kind: "invalid", hostId };
+  }
+  return { kind: "valid", hostId, scopes };
+}
+
 // ../api/src/middleware/scope-enforcer.ts
 function buildSegmentRegex(patternPath) {
   const escaped = patternPath.split("/").map((seg) => seg.startsWith(":") ? "[^/]+" : seg.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("/");
@@ -285852,6 +285862,16 @@ function lockDenyResponse(c, lock, result) {
     }
   }, 403);
 }
+function invalidSignedHostScopeContextResponse(c, hostId) {
+  log61.warn(`DENIED: signedBy=${hostId} route=${c.req.method.toUpperCase()} ${c.req.path} host-scopes=INVALID`);
+  return c.json({
+    error: {
+      code: "FORBIDDEN",
+      message: "Signing host scope context is missing.",
+      host: hostId
+    }
+  }, 403);
+}
 var log61, OUTBOUND_SEND_PREFIXES, PATH_INSTANCE_PREFIXES, PATH_CHAT_PREFIXES, PATH_MEDIA_INSTANCE_PREFIX = "/media/", scopeEnforcerMiddleware;
 var init_scope_enforcer = __esm(() => {
   init_src();
@@ -285875,8 +285895,9 @@ var init_scope_enforcer = __esm(() => {
     }
     const method = c.req.method.toUpperCase();
     const path2 = c.req.path;
-    const signedBy = c.get("signedBy");
-    const signedByScopes = c.get("signedByScopes");
+    const signedHost = readSignedHostScopeContext(c);
+    if (signedHost.kind === "invalid")
+      return invalidSignedHostScopeContextResponse(c, signedHost.hostId);
     const wildcard = ApiKeyService.scopeAllows(apiKey.scopes, "*");
     let requiredScope;
     if (!wildcard) {
@@ -285900,8 +285921,9 @@ var init_scope_enforcer = __esm(() => {
         }, 403);
       }
     }
-    if (signedBy && signedByScopes) {
-      const hostWildcard = ApiKeyService.scopeAllows(signedByScopes, "*");
+    if (signedHost.kind === "valid") {
+      const { hostId: signedBy, scopes: hostScopes } = signedHost;
+      const hostWildcard = ApiKeyService.scopeAllows(hostScopes, "*");
       if (!hostWildcard) {
         const needed = requiredScope ?? findRequiredScope(method, path2);
         if (!needed) {
@@ -285913,8 +285935,8 @@ var init_scope_enforcer = __esm(() => {
             }
           }, 403);
         }
-        if (!ApiKeyService.scopeAllows(signedByScopes, needed)) {
-          log61.warn(`DENIED: signedBy=${signedBy} route=${method} ${path2} required=${needed} host-scopes=${signedByScopes.join(",")}`);
+        if (!ApiKeyService.scopeAllows(hostScopes, needed)) {
+          log61.warn(`DENIED: signedBy=${signedBy} route=${method} ${path2} required=${needed} host-scopes=${hostScopes.join(",")}`);
           return c.json({
             error: {
               code: "FORBIDDEN",
@@ -356775,15 +356797,29 @@ function normalizeOverrides(overrides) {
     denylistPresetKey: overrides.denylistPresetKey === null ? undefined : overrides.denylistPresetKey
   };
 }
-function enforceMintCeiling(c, requestedScopes) {
-  const callerScopes = c.get("apiKey")?.scopes ?? [];
-  const exceeding = requestedScopes.filter((scope) => !ApiKeyService.scopeAllows(callerScopes, scope));
+function invalidSignedHostScopeContextResponse2(c, hostId) {
+  return c.json({
+    error: {
+      code: "FORBIDDEN",
+      message: "Signing host scope context is missing.",
+      host: hostId
+    }
+  }, 403);
+}
+function enforceScopeCeiling(c, requestedScopes) {
+  const authorizerScopeSets = [c.get("apiKey")?.scopes ?? []];
+  const signedHost = readSignedHostScopeContext(c);
+  if (signedHost.kind === "invalid")
+    return invalidSignedHostScopeContextResponse2(c, signedHost.hostId);
+  if (signedHost.kind === "valid")
+    authorizerScopeSets.push(signedHost.scopes);
+  const exceeding = requestedScopes.filter((scope) => authorizerScopeSets.some((authorizerScopes) => !ApiKeyService.scopeAllows(authorizerScopes, scope)));
   if (exceeding.length === 0)
     return null;
   return c.json({
     error: {
       code: "FORBIDDEN",
-      message: `Cannot mint a key whose scopes exceed the caller's own. Disallowed: ${exceeding.join(", ")}`
+      message: `Cannot grant scopes that exceed the caller's own. Disallowed: ${exceeding.join(", ")}`
     }
   }, 403);
 }
@@ -356798,7 +356834,7 @@ async function handleProfileCreate(c, data, services) {
       overrides: normalizeOverrides(data.overrides),
       denylistPresetKey: data.denylistPresetKey
     });
-    const ceilingDenied = enforceMintCeiling(c, resolved.scopes);
+    const ceilingDenied = enforceScopeCeiling(c, resolved.scopes);
     if (ceilingDenied)
       return ceilingDenied;
     const result = await services.apiKeys.create({
@@ -356833,7 +356869,7 @@ async function handleLegacyCreate(c, data, services) {
   if (!data.scopes || data.scopes.length === 0) {
     return c.json({ error: { code: "VALIDATION_ERROR", message: "scopes is required when no profile is supplied" } }, 400);
   }
-  const ceilingDenied = enforceMintCeiling(c, data.scopes);
+  const ceilingDenied = enforceScopeCeiling(c, data.scopes);
   if (ceilingDenied)
     return ceilingDenied;
   const result = await services.apiKeys.create({
@@ -356957,6 +356993,11 @@ var init_keys = __esm(() => {
     const id = c.req.param("id");
     const data = c.req.valid("json");
     const services = c.get("services");
+    if (data.scopes) {
+      const ceilingDenied = enforceScopeCeiling(c, data.scopes);
+      if (ceilingDenied)
+        return ceilingDenied;
+    }
     try {
       const updated = await services.apiKeys.update(id, {
         ...data,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automagik/omni",
-  "version": "2.260717.2",
+  "version": "2.260717.4",
   "description": "LLM-optimized CLI for Omni",
   "type": "module",
   "bin": {