Merge branch 'main' into workflows01

Author: mdroidian

apps/obsidian/src/components/ImportNodesModal.tsx

@@ -4,9 +4,9 @@ import { StrictMode, useState, useEffect, useCallback } from "react";
 import type DiscourseGraphPlugin from "../index";
 import type { ImportableNode, GroupWithNodes } from "~/types";
 import { getUserNameById } from "~/utils/typeUtils";
+import { getAvailableGroupIds } from "@repo/database/lib/groups";
 import {
   fetchUserNames,
-  getAvailableGroupIds,
   getPublishedNodesForGroups,
   getLocalNodeInstanceIds,
   getSpaceNameFromIds,

apps/obsidian/src/components/NodeTypeSettings.tsx

@@ -1234,7 +1234,7 @@ const NodeTypeSettings = () => {
                   void createBaseForNodeType(plugin, editingNodeType)
                 }
               >
-                Create Base view
+                Create new Base view
               </button>
             </div>
           </div>

apps/obsidian/src/components/PublishGroupDropdown.tsx

@@ -11,7 +11,7 @@ import {
   publishToSelectedGroupWithNotice,
   withPublishedState,
 } from "~/utils/publishGroupSelection";
-import type { MyGroup } from "~/utils/importNodes";
+import type { MyGroup } from "@repo/database/lib/groups";
 
 type PublishGroupDropdownProps = {
   plugin: DiscourseGraphPlugin;

apps/obsidian/src/services/QueryEngine.ts

@@ -287,7 +287,7 @@ export class QueryEngine {
                 matchedNodeType,
                 alternativePattern: pattern.alternativePattern,
                 extractedContent,
-                selected: true,
+                selected: false,
               });
             }
             break; // Stop checking other patterns for this file
@@ -374,7 +374,7 @@ export class QueryEngine {
           if (opts?.excludeImported) {
             const fm = this.app.metadataCache.getFileCache(file)
               ?.frontmatter as Record<string, unknown> | undefined;
-            if (fm?.importedFromRid || fm?.importedFromSpaceUri) continue;
+            if (fm?.importedFromRid) continue;
           }
           files.push(file);
         }
@@ -528,13 +528,14 @@ export class QueryEngine {
     const files: TFile[] = [];
     const allFiles = this.app.vault.getMarkdownFiles();
     for (const f of allFiles) {
-      const fm = this.app.metadataCache.getFileCache(f)?.frontmatter;
-      const nodeTypeId = (fm as Record<string, unknown> | undefined)
-        ?.nodeTypeId;
+      const fm = this.app.metadataCache.getFileCache(f)?.frontmatter as
+        | Record<string, unknown>
+        | undefined;
+      const nodeTypeId = fm?.nodeTypeId;
       if (!nodeTypeId) continue;
       if (
         opts?.excludeImported &&
-        (fm as Record<string, unknown>)?.importedFromRid
+        (fm?.importedFromRid || fm?.importedFromSpaceUri)
       ) {
         continue;
       }
@@ -590,7 +591,7 @@ export class QueryEngine {
             matchedNodeType,
             alternativePattern: pattern.alternativePattern,
             extractedContent,
-            selected: true,
+            selected: false,
           });
           break;
         }

apps/obsidian/src/utils/getDiscourseNodes.ts

@@ -13,7 +13,7 @@ export type DiscourseNodeInVault = {
 /**
  * Collect all discourse nodes from the vault.
  * Uses DataCore when available; falls back to vault iteration otherwise.
- * When includeImported is false (default), excludes files with importedFromRid/importedFromSpaceUri.
+ * When includeImported is false (default), excludes files with importedFromRid.
  */
 export const collectDiscourseNodesFromVault = async (
   plugin: DiscourseGraphPlugin,

apps/obsidian/src/utils/importNodes.ts

@@ -21,54 +21,6 @@ import {
 import { createTemplateFile } from "./templates";
 import { resolveFolderForSpaceUri } from "./importFolderMetadata";
 
-export type MyGroup = {
-  id: string;
-  name: string;
-};
-
-export const getAvailableGroupIds = async (
-  client: DGSupabaseClient,
-): Promise<string[]> => {
-  const { data, error } = await client
-    .from("group_membership")
-    .select("group_id")
-    .eq("member_id", (await client.auth.getUser()).data.user?.id || "");
-
-  if (error) {
-    console.error("Error fetching groups:", error);
-    throw new Error(`Failed to fetch groups: ${error.message}`);
-  }
-
-  return (data || []).map((g) => g.group_id);
-};
-
-export const getMyGroups = async (
-  client: DGSupabaseClient,
-): Promise<MyGroup[]> => {
-  const userId = (await client.auth.getUser()).data.user?.id ?? "";
-  const { data, error } = await client
-    .from("group_membership")
-    .select("group_id, my_groups!group_id(name)")
-    .eq("member_id", userId);
-
-  if (error) {
-    console.error("Error fetching groups:", error);
-    throw new Error(`Failed to fetch groups: ${error.message}`);
-  }
-
-  return (data ?? [])
-    .filter(
-      (row): row is { group_id: string; my_groups: { name: string | null } } =>
-        typeof row.group_id === "string" &&
-        row.my_groups !== null &&
-        typeof row.my_groups === "object",
-    )
-    .map((row) => ({
-      id: row.group_id,
-      name: row.my_groups.name ?? row.group_id,
-    }));
-};
-
 type PublishedNode = {
   source_local_id: string;
   space_id: number;

apps/obsidian/src/utils/publishGroupSelection.ts

@@ -1,11 +1,11 @@
 import { Notice, type FrontMatterCache, type TFile } from "obsidian";
-import type DiscourseGraphPlugin from "~/index";
-import { PublishGroupSuggestModal } from "~/components/PublishGroupSuggestModal";
 import {
   getAvailableGroupIds,
   getMyGroups,
   type MyGroup,
-} from "~/utils/importNodes";
+} from "@repo/database/lib/groups";
+import type DiscourseGraphPlugin from "~/index";
+import { PublishGroupSuggestModal } from "~/components/PublishGroupSuggestModal";
 import { getLoggedInClient } from "~/utils/supabaseContext";
 import {
   getPublishedToGroups,

apps/obsidian/src/utils/publishNode.ts

@@ -11,7 +11,7 @@ import {
   type RelationsFile,
 } from "./relationsStore";
 import type { RelationInstance } from "~/types";
-import { getAvailableGroupIds } from "./importNodes";
+import { getAvailableGroupIds } from "@repo/database/lib/groups";
 import {
   syncAllNodesAndRelations,
   syncPublishedNodeAssets,

apps/obsidian/src/utils/templateImport.ts

@@ -1,9 +1,9 @@
 /* eslint-disable @typescript-eslint/naming-convention -- Supabase query results use snake_case column names */
 import type { Json } from "@repo/database/dbTypes";
+import { getAvailableGroupIds } from "@repo/database/lib/groups";
 import type DiscourseGraphPlugin from "~/index";
 import {
   fetchUserNames,
-  getAvailableGroupIds,
   getSpaceNameFromIds,
   getSpaceUris,
 } from "./importNodes";

apps/obsidian/src/utils/upsertNodesAsContentWithEmbeddings.ts

@@ -63,6 +63,7 @@ const createNodeContentEntries = async (
       ...baseEntry,
       text: node.file.basename,
       variant: "direct",
+      content_type: "text/plain",
       metadata: { filePath: node.file.path },
     });
   }
@@ -75,6 +76,7 @@ const createNodeContentEntries = async (
         ...baseEntry,
         text: fullContent,
         variant: "full",
+        content_type: "text/obsidian+markdown",
         metadata: node.frontmatter as Json,
       });
     } catch (error) {