From 7f28041287949fb92200022f68377796de0c5dc6 Mon Sep 17 00:00:00 2001
From: Marc-Antoine Parent <maparent@acm.org>
Date: Fri, 7 Aug 2026 09:50:17 -0400
Subject: [PATCH] eng-2050-reintroduce-rid-to-CrossAppBase

---
 packages/database/src/crossAppContracts.ts    |  1 +
 .../database/src/lib/crossAppConverters.ts    | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/packages/database/src/crossAppContracts.ts b/packages/database/src/crossAppContracts.ts
index c1bf4268a..e60090690 100644
--- a/packages/database/src/crossAppContracts.ts
+++ b/packages/database/src/crossAppContracts.ts
@@ -10,6 +10,7 @@ export type Rid = string;
 // Common attributes for most types
 export type CrossAppBase = {
   localId: LocalId;
+  rid?: string;
   createdAt: Date;
   modifiedAt?: Date;
   authorId: LocalId;
diff --git a/packages/database/src/lib/crossAppConverters.ts b/packages/database/src/lib/crossAppConverters.ts
index 4427c8f3b..3199f299c 100644
--- a/packages/database/src/lib/crossAppConverters.ts
+++ b/packages/database/src/lib/crossAppConverters.ts
@@ -8,6 +8,7 @@ import {
   CrossAppRelation,
 } from "../crossAppContracts";
 import { LocalContentDataInput, LocalConceptDataInput } from "../inputTypes";
+import { ridToSpaceUriAndLocalId } from "./rid";
 import { Enums, CompositeTypes } from "../dbTypes";
 
 type InlineEmbeddingInput = CompositeTypes<"inline_embedding_input">;
@@ -70,7 +71,11 @@ export const crossAppNodeToDbContent = (
 export const crossAppNodeToDbConcept = (
   node: CrossAppNode,
 ): LocalConceptDataInput => {
+  const spaceUri = node.rid
+    ? ridToSpaceUriAndLocalId(node.rid).spaceUri
+    : undefined;
   return filterUndefined<LocalConceptDataInput>({
+    space_url: spaceUri,
     source_local_id: node.localId,
     name: node.content.direct.value,
     author_local_id: node.authorId,
@@ -91,7 +96,11 @@ export const crossAppNodeSchemaToDbConcept = (
     template: node.templateTitle,
     template_content: node.template,
   });
+  const spaceUri = node.rid
+    ? ridToSpaceUriAndLocalId(node.rid).spaceUri
+    : undefined;
   return filterUndefined<LocalConceptDataInput>({
+    space_url: spaceUri,
     source_local_id: node.localId,
     name: node.label,
     author_local_id: node.authorId,
@@ -106,7 +115,11 @@ export const crossAppNodeSchemaToDbConcept = (
 export const crossAppRelationTypeSchemaToDbConcept = (
   node: CrossAppRelationTypeSchema,
 ): LocalConceptDataInput => {
+  const spaceUri = node.rid
+    ? ridToSpaceUriAndLocalId(node.rid).spaceUri
+    : undefined;
   return filterUndefined<LocalConceptDataInput>({
+    space_url: spaceUri,
     source_local_id: node.localId,
     name: node.label,
     author_local_id: node.authorId,
@@ -130,7 +143,11 @@ export const crossAppRelationTripleSchemaToDbConcept = (
   const label = "label" in node ? node.label : relationType!.label;
   const complement =
     "complement" in node ? node.complement : relationType!.complement;
+  const spaceUri = node.rid
+    ? ridToSpaceUriAndLocalId(node.rid).spaceUri
+    : undefined;
   return filterUndefined<LocalConceptDataInput>({
+    space_url: spaceUri,
     source_local_id: node.localId,
     name: node.localId, // has to be unique within space. Not seen yet.
     author_local_id: node.authorId,
@@ -153,9 +170,13 @@ export const crossAppRelationTripleSchemaToDbConcept = (
 export const crossAppRelationToDbConcept = (
   node: CrossAppRelation,
 ): LocalConceptDataInput => {
+  const spaceUri = node.rid
+    ? ridToSpaceUriAndLocalId(node.rid).spaceUri
+    : undefined;
   return filterUndefined<LocalConceptDataInput>({
     // use LocalIds... not ideal
     name: `${node.localId}: ${node.source} -${node.relationType}-> ${node.destination}`,
+    space_url: spaceUri,
     source_local_id: node.localId,
     author_local_id: node.authorId,
     schema_represented_by_local_id: node.relationType,