@opengeni/core 3.0.1 → 4.0.0

package/src/domain/session-file-access.ts

@@ -0,0 +1,47 @@
+import type { AccessGrant, FileAsset } from "@opengeni/contracts";
+import {
+  getSessionAuthorityProjection,
+  getFilesForSubject,
+  readSessionFileAttachments,
+  withSessionRlsActorContext,
+} from "@opengeni/db";
+import type { SessionAuthorizationDependencies } from "../session-authorization";
+import {
+  requireSessionAuthorization,
+  withResolvedSessionAuthorization,
+} from "../session-authorization";
+
+/** A session attachment grant is never a generic file/Knowledge grant. */
+export async function readSessionAttachmentFiles(
+  deps: SessionAuthorizationDependencies,
+  grant: AccessGrant,
+  sessionId: string,
+  fileIds: readonly string[],
+): Promise<FileAsset[]> {
+  const authority = await getSessionAuthorityProjection(deps.db, grant.workspaceId, sessionId);
+  if (!authority) return [];
+  const authorization = await requireSessionAuthorization(deps, grant, {
+    sessionId,
+    operation: "session.read",
+    surface: "core",
+  });
+  const ordinary = await getFilesForSubject(deps.db, {
+    accountId: grant.accountId,
+    workspaceId: grant.workspaceId,
+    subjectId: grant.subjectId,
+    fileIds,
+  });
+  const missing = fileIds.filter((id) => !ordinary.some((file) => file.id === id));
+  const actor = authorization?.actor ?? { kind: "subject" as const, subjectId: grant.subjectId };
+  const read = () =>
+    readSessionFileAttachments(deps.db, {
+      accountId: grant.accountId,
+      workspaceId: grant.workspaceId,
+      fileIds: missing,
+      access: { sessionId, authorityEpoch: authority.authorityEpoch, actor },
+    });
+  const shared = authorization
+    ? await withResolvedSessionAuthorization(authorization, read)
+    : await withSessionRlsActorContext({ subjectId: grant.subjectId }, read);
+  return [...ordinary, ...shared];
+}

package/src/domain/session-tool-policy.ts

@@ -65,8 +65,11 @@ export function resolveSessionToolPolicy(input: SessionToolPolicyInput): Resolve
     availableIds.has(id),
   );
   const mandatoryIdSet = new Set<string>(mandatoryIds);
-  const selectedRefs = mergeToolRefs([], input.sessionTools);
   const tracksWorkspaceDefaults = policy.mode === "workspace_default";
+  const excludedIds = new Set(tracksWorkspaceDefaults ? policy.excludedMcpServerIds : []);
+  const selectedRefs = mergeToolRefs([], input.sessionTools).filter(
+    (tool) => !excludedIds.has(tool.id) || mandatoryIdSet.has(tool.id),
+  );
 
   // Persisted refs may outlive a capability installation, deployment config,
   // or its credentials. Admission remains strict for newly requested refs, but
@@ -80,7 +83,7 @@ export function resolveSessionToolPolicy(input: SessionToolPolicyInput): Resolve
     toolRefs = mergeToolRefs(
       toolRefs,
       sortedIds(defaultIds)
-        .filter((id) => availableIds.has(id))
+        .filter((id) => availableIds.has(id) && !excludedIds.has(id))
         .map((id) => ({ kind: "mcp" as const, id, optional: true as const })),
     );
   }
@@ -97,7 +100,7 @@ export function resolveSessionToolPolicy(input: SessionToolPolicyInput): Resolve
     selectedRefs,
     tracksWorkspaceDefaults
       ? sortedIds(defaultIds)
-          .filter((id) => availableIds.has(id))
+          .filter((id) => availableIds.has(id) && !excludedIds.has(id))
           .map((id) => ({ kind: "mcp" as const, id, optional: true as const }))
       : [],
   );
@@ -190,7 +193,12 @@ export async function workspaceSessionToolPolicyDefaultServerIds(
   const configured = resolveWorkspaceSessionToolDefaults(workspace.settings);
   if (!configured?.mcpServerIds) return availableDefaults;
   const available = new Set(availableDefaults);
-  return sortedIds(configured.mcpServerIds.filter((id) => available.has(id)));
+  return sortedIds([
+    ...configured.mcpServerIds.filter((id) => available.has(id)),
+    ...(configured.inheritConnectedMcpServers
+      ? availableDefaults.filter((id) => !["opengeni", "files", "docs"].includes(id))
+      : []),
+  ]);
 }
 
 /** Add a bounded, secret-safe effective projection to a session response. */