@opengeni/core 0.20.10 → 0.20.12

package/dist/domain/capabilities.d.ts

@@ -6,6 +6,7 @@ export declare function buildCapabilityCatalog(input: {
     db: Database;
     workspaceId: string;
     settings: Settings;
+    subjectId?: string | null;
 }): Promise<CapabilityCatalogResponse>;
 export declare function createCatalogItem(input: {
     db: Database;

package/dist/domain/personal-connection-delegations.d.ts

@@ -1,5 +1,5 @@
 import type { McpServerConfig, Settings } from "@opengeni/config";
-import type { AccessGrant, ConnectionMetadata, McpPersonalConnectionDelegation, SessionTurn, ToolRef } from "@opengeni/contracts";
+import type { AccessGrant, ConnectionMetadata, McpPersonalConnectionDelegation, SessionTurn, SocialConnection, ToolRef } from "@opengeni/contracts";
 import { type Database, type ResolveConnectionCredentialInput, type ResolveConnectionCredentialResult } from "@opengeni/db";
 export type PersonalConnectionDelegationSource = {
     kind: "subject";
@@ -11,8 +11,17 @@ export type PersonalConnectionDelegationSource = {
 } | {
     kind: "none";
 };
+export type AuthorizedSocialConnection = {
+    connection: SocialConnection;
+    subjectId: string | null;
+};
 export declare function directPersonalConnectionSubjectId(turn: Pick<SessionTurn, "source" | "initiator" | "initiatorContext">): string | undefined;
 export declare function personalConnectionDelegationSourceForGrant(grant: AccessGrant): PersonalConnectionDelegationSource;
+export declare function authorizedSocialConnectionsForGrant(input: {
+    db: Database;
+    grant: AccessGrant;
+    limit?: number;
+}): Promise<AuthorizedSocialConnection[]>;
 export declare function selectedPersonalConnectionServers(settings: Pick<Settings, "mcpServers">, tools: ToolRef[]): McpServerConfig[];
 export declare function personalConnectionDelegationsFromVisibleConnections(input: {
     servers: McpServerConfig[];

package/dist/index.js

@@ -1752,7 +1752,7 @@ async function buildCapabilityCatalog(input) {
     listCapabilityInstallations(input.db, input.workspaceId),
     listPackInstallations2(input.db, input.workspaceId),
     listWorkspaceCapabilityPacks(input.db, input.workspaceId),
-    listSocialConnections(input.db, input.workspaceId, 500),
+    listSocialConnections(input.db, input.workspaceId, 500, input.subjectId),
     discoverBundledSkills(),
     discoverCuratedSkillLibraryItems()
   ]);
@@ -2456,11 +2456,11 @@ function platformApiCatalogItems(socialConnections) {
       notes: "Account access is provided through OpenGeni's first-party social tools."
     },
     enabled: xEnabled,
-    enabledReason: xEnabled ? xConnection.status === "connected" ? "workspace social account connected" : "workspace social account needs reconnection" : null,
+    enabledReason: xEnabled ? xConnection.status === "connected" ? `${xConnection.ownership} social account connected` : `${xConnection.ownership} social account needs reconnection` : null,
     metadata: {
       connectorMode: "first_party_social",
       provider: "x",
-      ownership: "workspace",
+      ownership: xConnection?.ownership ?? "workspace",
       firstPartyMcpTools: [
         "social_connections_list",
         "social_posts_recent",
@@ -3228,8 +3228,10 @@ async function listRigChangesForApi(deps, workspaceId, rigId, limit) {
 // src/domain/personal-connection-delegations.ts
 import {
   getSessionTurnPersonalConnectionDelegations,
+  getSocialConnection,
   getWorkspaceGrant as getWorkspaceGrant2,
-  listConnectionsMetadata as listConnectionsMetadata2
+  listConnectionsMetadata as listConnectionsMetadata2,
+  listSocialConnections as listSocialConnections2
 } from "@opengeni/db";
 function directPersonalConnectionSubjectId(turn) {
   if (turn.source !== "user" && turn.source !== "api" || turn.initiator.kind !== "subject") {
@@ -3250,6 +3252,51 @@ function personalConnectionDelegationSourceForGrant(grant) {
   }
   return { kind: "subject", subjectId: grant.subjectId };
 }
+async function authorizedSocialConnectionsForGrant(input) {
+  const workspace = await listSocialConnections2(
+    input.db,
+    input.grant.workspaceId,
+    input.limit ?? 500,
+    null
+  );
+  const source = personalConnectionDelegationSourceForGrant(input.grant);
+  if (source.kind === "none")
+    return workspace.map((connection) => ({ connection, subjectId: null }));
+  if (source.kind === "subject") {
+    const visible = await listSocialConnections2(
+      input.db,
+      input.grant.workspaceId,
+      input.limit ?? 500,
+      source.subjectId
+    );
+    return visible.map((connection) => ({
+      connection,
+      subjectId: connection.ownership === "personal" ? source.subjectId : null
+    }));
+  }
+  const delegations = (await getSessionTurnPersonalConnectionDelegations(
+    input.db,
+    input.grant.workspaceId,
+    source.sessionId,
+    source.turnId
+  )).filter((item) => item.connectionType === "social");
+  const personal = [];
+  for (const delegation of delegations) {
+    if (!await getWorkspaceGrant2(input.db, delegation.ownerSubjectId, input.grant.workspaceId))
+      continue;
+    const connection = await getSocialConnection(
+      input.db,
+      input.grant.workspaceId,
+      delegation.connectionId,
+      delegation.ownerSubjectId
+    );
+    if (!connection || connection.ownership !== "personal") continue;
+    const domain = connection.provider === "x" ? "x.com" : `${connection.provider}.com`;
+    if (!sameProviderDomain(domain, delegation.providerDomain)) continue;
+    personal.push({ connection, subjectId: delegation.ownerSubjectId });
+  }
+  return [...workspace.map((connection) => ({ connection, subjectId: null })), ...personal];
+}
 function selectedPersonalConnectionServers(settings, tools) {
   const selected = new Set(tools.map((tool) => tool.id));
   return settings.mcpServers.filter(
@@ -3291,7 +3338,7 @@ function personalConnectionDelegationsFromVisibleConnections(input) {
   return delegations;
 }
 function personalConnectionDelegationsFromParent(input) {
-  return input.servers.flatMap((server) => {
+  const mcp = input.servers.flatMap((server) => {
     const ref = server.connectionRef;
     if (!ref || ref.subjectScope !== "subject") return [];
     const delegation = input.parentDelegations.find(
@@ -3299,13 +3346,17 @@ function personalConnectionDelegationsFromParent(input) {
     );
     return delegation ? [{ ...delegation }] : [];
   });
+  return [
+    ...mcp,
+    ...input.parentDelegations.filter((item) => item.connectionType === "social").map((item) => ({ ...item }))
+  ];
 }
 function personalConnectionDelegationsEqual(left, right) {
   if (left.length !== right.length) return false;
   const byServer = new Map(right.map((delegation) => [delegation.serverId, delegation]));
   return left.every((delegation) => {
     const other = byServer.get(delegation.serverId);
-    return other?.connectionId === delegation.connectionId && other.ownerSubjectId === delegation.ownerSubjectId && sameProviderDomain(other.providerDomain, delegation.providerDomain) && other.kind === delegation.kind;
+    return other?.connectionId === delegation.connectionId && other.ownerSubjectId === delegation.ownerSubjectId && sameProviderDomain(other.providerDomain, delegation.providerDomain) && other.kind === delegation.kind && other.connectionType === delegation.connectionType;
   });
 }
 function personalConnectionDelegationForServer(delegations, server) {
@@ -3356,9 +3407,10 @@ function withFrozenPersonalConnectionDelegations(input) {
 }
 async function freezePersonalConnectionDelegations(input) {
   const servers = selectedPersonalConnectionServers(input.settings, input.tools);
-  if (servers.length === 0 || input.source.kind === "none") return [];
+  const includeSocial = input.tools.some((tool) => tool.id === "opengeni");
+  if (servers.length === 0 && !includeSocial || input.source.kind === "none") return [];
   if (input.source.kind === "turn") {
-    return personalConnectionDelegationsFromParent({
+    const inherited = personalConnectionDelegationsFromParent({
       servers,
       parentDelegations: await getSessionTurnPersonalConnectionDelegations(
         input.db,
@@ -3367,14 +3419,37 @@ async function freezePersonalConnectionDelegations(input) {
         input.source.turnId
       )
     });
+    return includeSocial ? inherited : inherited.filter((item) => item.connectionType !== "social");
   }
   const membership = await getWorkspaceGrant2(input.db, input.source.subjectId, input.workspaceId);
   if (!membership) return [];
-  return personalConnectionDelegationsFromVisibleConnections({
+  const mcp = personalConnectionDelegationsFromVisibleConnections({
     servers,
     subjectId: input.source.subjectId,
     connections: await listConnectionsMetadata2(input.db, input.workspaceId, input.source.subjectId)
   });
+  if (!includeSocial) return mcp;
+  const ownerSubjectId = input.source.subjectId;
+  const visible = await listSocialConnections2(input.db, input.workspaceId, 500, ownerSubjectId);
+  const latest = /* @__PURE__ */ new Map();
+  for (const connection of visible) {
+    if (connection.ownership !== "personal" || connection.status !== "connected" || connection.provider !== "x" && connection.provider !== "reddit")
+      continue;
+    const prior = latest.get(connection.provider);
+    if (!prior || connection.updatedAt > prior.updatedAt)
+      latest.set(connection.provider, connection);
+  }
+  return [
+    ...mcp,
+    ...[...latest.values()].map((connection) => ({
+      serverId: `social:${connection.provider}`,
+      connectionId: connection.id,
+      ownerSubjectId,
+      providerDomain: connection.provider === "x" ? "x.com" : `${connection.provider}.com`,
+      kind: "oauth2",
+      connectionType: "social"
+    }))
+  ];
 }
 
 // src/domain/resources.ts
@@ -4541,7 +4616,7 @@ async function postUserMessageTurn(input) {
       sessionId,
       workflowId: turn.temporalWorkflowId,
       wakeRevision: result.wakeRevision,
-      ...result.interruptionCount > 0 ? { interruptionRequested: true } : {}
+      ...(input.delivery ?? "send") === "steer" || result.interruptionCount > 0 ? { interruptionRequested: true } : {}
     });
   } catch (error) {
     console.warn(
@@ -5371,7 +5446,7 @@ async function createValidatedScheduledTask(input) {
     db: input.db,
     workspaceId: input.grant.workspaceId,
     settings: runtimeSettings,
-    tools: agentConfig.tools,
+    tools: [...agentConfig.tools, { kind: "mcp", id: "opengeni" }],
     source: personalConnectionDelegationSourceForGrant(input.grant)
   });
   const creationInitiator = creationInitiatorForGrant(input.grant);
@@ -5479,7 +5554,7 @@ async function validatedScheduledTaskUpdate(input) {
       db: input.db,
       workspaceId: input.existing.workspaceId,
       settings: runtimeSettings,
-      tools: nextAgentConfig.tools,
+      tools: [...nextAgentConfig.tools, { kind: "mcp", id: "opengeni" }],
       source: personalConnectionDelegationSourceForGrant(input.grant)
     });
     if (input.existing.reusableSessionId && input.existing.runMode === "reusable_session") {
@@ -6608,7 +6683,7 @@ async function publishAndWakeAgentCommand(deps, input) {
       sessionId: input.sessionId,
       workflowId: input.workflowId,
       wakeRevision: input.wakeRevision,
-      ...input.interruptionCount > 0 ? { interruptionRequested: true } : {}
+      ...input.controlRequested || input.interruptionCount > 0 ? { interruptionRequested: true } : {}
     });
   } catch (error) {
     console.warn(
@@ -6697,7 +6772,8 @@ async function steerAgentSession(deps, context, input) {
     workflowId: result.workflowId,
     wakeRevision: result.wakeRevision,
     shouldSignal: result.shouldSignal,
-    interruptionCount: result.interruptionCount
+    interruptionCount: result.interruptionCount,
+    controlRequested: true
   });
   await publishWorkspaceControlEvent(deps, context.workspaceId, result.workspaceControlEventId);
   return result;
@@ -7035,6 +7111,7 @@ export {
   assertWorkspaceDeletable,
   assertWorkspaceMemberRemovable,
   assertWorkspaceModelPolicyAllows,
+  authorizedSocialConnectionsForGrant,
   availableToolRefs,
   buildCapabilityCatalog,
   buildFleetContextForSession,