Merge main into migration-block-init-staging-branch

Author: sid597

.github/workflows/roam-main.yaml

@@ -23,6 +23,8 @@ jobs:
     steps:
       - name: Checkout Code
         uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
@@ -53,3 +55,15 @@ jobs:
 
       - name: Deploy
         run: npx turbo run deploy --filter=roam --ui stream -- --no-compile
+
+      - name: Get version
+        id: version
+        run: echo "version=$(node -p "require('./apps/roam/package.json').version")" >> $GITHUB_OUTPUT
+
+      - name: Sync Linear release
+        uses: linear/linear-release-action@v0
+        with:
+          access_key: ${{ secrets.LINEAR_RELEASES_ACCESS_KEY }}
+          name: Roam ${{ steps.version.outputs.version }}
+          version: ${{ steps.version.outputs.version }}
+          include_paths: "apps/roam/**,packages/tailwind-config/**,packages/utils/**,packages/database/**,packages/ui/**"

.github/workflows/roam-release.yaml

@@ -19,6 +19,8 @@ jobs:
     steps:
       - name: Checkout Code
         uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
@@ -42,6 +44,14 @@ jobs:
         id: version
         run: echo "version=$(node -p "require('./apps/roam/package.json').version")" >> $GITHUB_OUTPUT
 
+      - name: Sync Linear release
+        uses: linear/linear-release-action@v0
+        with:
+          access_key: ${{ secrets.LINEAR_RELEASES_ACCESS_KEY }}
+          name: Roam ${{ steps.version.outputs.version }}
+          version: ${{ steps.version.outputs.version }}
+          include_paths: "apps/roam/**,packages/tailwind-config/**,packages/utils/**,packages/database/**,packages/ui/**"
+
       - name: Inject & upload source maps to PostHog
         uses: PostHog/upload-source-maps@v0.5.7.0
         with:
@@ -53,3 +63,11 @@ jobs:
 
       - name: Update Roam Depot Extension
         run: npx turbo run publish --filter=roam --ui stream -- --no-compile
+
+      - name: Mark Linear release sent to Roam review
+        uses: linear/linear-release-action@v0
+        with:
+          access_key: ${{ secrets.LINEAR_RELEASES_ACCESS_KEY }}
+          command: update
+          version: ${{ steps.version.outputs.version }}
+          stage: Sent to Roam for Review

.github/workflows/test-database.yaml

@@ -21,7 +21,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version: "22"
           cache: "pnpm"
       - name: Install Dependencies
         run: pnpm install --frozen-lockfile

apps/obsidian/src/components/AdminPanelSettings.tsx

@@ -1,13 +1,17 @@
 import { useState, useCallback } from "react";
 import { usePlugin } from "./PluginContext";
 import { Notice } from "obsidian";
+import { updateUsername } from "~/utils/supabaseContext";
 import { initializeSupabaseSync } from "~/utils/syncDgNodesToSupabase";
 
 export const AdminPanelSettings = () => {
   const plugin = usePlugin();
   const [syncModeEnabled, setSyncModeEnabled] = useState<boolean>(
     plugin.settings.syncModeEnabled ?? false,
   );
+  const [username, setUsername] = useState<string>(
+    plugin.settings.username || "",
+  );
 
   const handleSyncModeToggle = useCallback(
     async (newValue: boolean) => {
@@ -30,6 +34,13 @@ export const AdminPanelSettings = () => {
     [plugin],
   );
 
+  const handleSetUsername = async (newValue: string) => {
+    setUsername(newValue);
+    plugin.settings.username = newValue;
+    await plugin.saveSettings();
+    await updateUsername(plugin, newValue);
+  };
+
   return (
     <div className="general-settings">
       <div className="setting-item">
@@ -48,6 +59,27 @@ export const AdminPanelSettings = () => {
           </div>
         </div>
       </div>
+      <div
+        className={
+          "setting-item " + (plugin.settings.syncModeEnabled ? "" : "hidden")
+        }
+      >
+        <div className="setting-item-info">
+          <div className="setting-item-name">Username</div>
+          <div className="setting-item-description">
+            A username that will be associated with your vault if you share
+            data.
+          </div>
+        </div>
+        <div className="setting-item-control">
+          <input
+            type="text"
+            value={username}
+            onChange={(e) => setUsername(e.target.value)}
+            onBlur={(e) => void handleSetUsername(e.target.value)}
+          />
+        </div>
+      </div>
     </div>
   );
 };

apps/obsidian/src/components/DiscourseContextView.tsx

@@ -13,7 +13,11 @@ import { getDiscourseNodeFormatExpression } from "~/utils/getDiscourseNodeFormat
 import { RelationshipSection } from "~/components/RelationshipSection";
 import { VIEW_TYPE_DISCOURSE_CONTEXT } from "~/types";
 import { PluginProvider, usePlugin } from "~/components/PluginContext";
-import { getNodeTypeById, getAndFormatImportSource } from "~/utils/typeUtils";
+import {
+  getNodeTypeById,
+  getAndFormatImportSource,
+  getUserNameById,
+} from "~/utils/typeUtils";
 import { refreshImportedFile } from "~/utils/importNodes";
 import { publishNode } from "~/utils/publishNode";
 import { createBaseForNodeType } from "~/utils/baseForNodeType";
@@ -161,6 +165,13 @@ const DiscourseContext = ({ activeFile }: DiscourseContextProps) => {
       !isImported &&
       !!frontmatter.nodeTypeId;
 
+    const formattedVaultName = isImported
+      ? getAndFormatImportSource(
+          frontmatter.importedFromRid as string,
+          plugin.settings.spaceNames,
+        )
+      : "";
+
     return (
       <>
         <div className="mb-6">
@@ -232,7 +243,7 @@ const DiscourseContext = ({ activeFile }: DiscourseContextProps) => {
                 View only
               </span>
               <InfoTooltip
-                content={`Imported from ${getAndFormatImportSource(frontmatter.importedFromRid as string, plugin.settings.spaceNames)}. Direct edits will be overwritten when refreshed.`}
+                content={`Imported from ${formattedVaultName}. Direct edits will be overwritten when refreshed.`}
               />
             </div>
           )}
@@ -244,6 +255,15 @@ const DiscourseContext = ({ activeFile }: DiscourseContextProps) => {
             </div>
           )}
 
+          {isImported &&
+            frontmatter.authorId &&
+            typeof frontmatter.authorId === "number" && (
+              <div className="text-modifier-text mt-2 text-xs">
+                <div>
+                  Author: {getUserNameById(plugin, frontmatter.authorId)}
+                </div>
+              </div>
+            )}
           {isImported && sourceDates && (
             <div className="text-modifier-text mt-2 text-xs">
               <div>Created in source: {sourceDates.createdAt}</div>

apps/obsidian/src/components/ImportNodesModal.tsx

@@ -3,7 +3,9 @@ import { createRoot, Root } from "react-dom/client";
 import { StrictMode, useState, useEffect, useCallback } from "react";
 import type DiscourseGraphPlugin from "../index";
 import type { ImportableNode, GroupWithNodes } from "~/types";
+import { getUserNameById } from "~/utils/typeUtils";
 import {
+  fetchUserNames,
   getAvailableGroupIds,
   getPublishedNodesForGroups,
   getLocalNodeInstanceIds,
@@ -61,6 +63,8 @@ const ImportNodesContent = ({ plugin, onClose }: ImportNodesModalProps) => {
         return;
       }
 
+      await fetchUserNames(plugin, client);
+
       const publishedNodes = await getPublishedNodesForGroups({
         client,
         groupIds,
@@ -82,7 +86,7 @@ const ImportNodesContent = ({ plugin, onClose }: ImportNodesModalProps) => {
         getSpaceUris(client, uniqueSpaceIds),
       ]);
 
-      // Populate plugin settings with current space names so they stay up to date
+      // Keep spaceNames in settings up to date for UI display (formatImportSource reads it)
       if (uniqueSpaceIds.length > 0) {
         if (!plugin.settings.spaceNames) plugin.settings.spaceNames = {};
 
@@ -106,21 +110,26 @@ const ImportNodesContent = ({ plugin, onClose }: ImportNodesModalProps) => {
             groupName:
               spaceNames.get(node.space_id) ?? `Space ${node.space_id}`,
             nodes: [],
+            authorIds: new Set(),
           });
         }
 
         const group = grouped.get(groupId)!;
+        const spaceName =
+          spaceNames.get(node.space_id) ?? `Space ${node.space_id}`;
         group.nodes.push({
           nodeInstanceId: node.source_local_id,
           title: node.text,
           spaceId: node.space_id,
-          spaceName: spaceNames.get(node.space_id) ?? `Space ${node.space_id}`,
+          spaceName,
           groupId,
           selected: false,
           createdAt: node.createdAt,
           modifiedAt: node.modifiedAt,
           filePath: node.filePath,
+          authorId: node.authorId,
         });
+        if (node.authorId) group.authorIds.add(node.authorId);
       }
 
       setGroupsWithNodes(Array.from(grouped.values()));
@@ -258,6 +267,7 @@ const ImportNodesContent = ({ plugin, onClose }: ImportNodesModalProps) => {
       number,
       {
         spaceName: string;
+        authorIds: Set<number>;
         nodes: Array<{
           node: ImportableNode;
           groupId: string;
@@ -271,6 +281,7 @@ const ImportNodesContent = ({ plugin, onClose }: ImportNodesModalProps) => {
         if (!nodesBySpace.has(node.spaceId)) {
           nodesBySpace.set(node.spaceId, {
             spaceName: node.spaceName,
+            authorIds: group.authorIds,
             nodes: [],
           });
         }
@@ -322,14 +333,19 @@ const ImportNodesContent = ({ plugin, onClose }: ImportNodesModalProps) => {
 
         <div className="max-h-96 overflow-y-auto rounded border">
           {Array.from(nodesBySpace.entries()).map(
-            ([spaceId, { spaceName, nodes }]) => {
+            ([spaceId, { spaceName, nodes, authorIds }]) => {
               return (
                 <div key={spaceId} className="border-b">
                   <div className="bg-muted/10 flex items-center px-3 py-2">
                     <span className="mr-2">📂</span>
                     <span className="text-accent-foreground line-clamp-1 font-medium italic">
                       {spaceName}
                     </span>
+                    {authorIds.size === 1 && (
+                      <span>
+                        &nbsp;({getUserNameById(plugin, [...authorIds][0]!)})
+                      </span>
+                    )}
                     <span className="text-muted ml-2 text-sm">
                       ({nodes.length} node{nodes.length !== 1 ? "s" : ""})
                     </span>
@@ -349,6 +365,11 @@ const ImportNodesContent = ({ plugin, onClose }: ImportNodesModalProps) => {
                       <div className="min-w-0 flex-1">
                         <div className="line-clamp-3 font-medium">
                           {node.title}
+                          {node.authorId && authorIds.size > 1 && (
+                            <span className="font-light">
+                              &nbsp;({getUserNameById(plugin, node.authorId)})
+                            </span>
+                          )}
                         </div>
                       </div>
                     </div>

apps/obsidian/src/components/InlineNodeTypePicker.ts

@@ -1,7 +1,8 @@
-import { Editor } from "obsidian";
+import { Editor, MarkdownView } from "obsidian";
 import { DiscourseNode } from "~/types";
-import { createDiscourseNode } from "~/utils/createNode";
 import type DiscourseGraphPlugin from "~/index";
+import { createModifyNodeModalSubmitHandler } from "~/utils/registerCommands";
+import ModifyNodeModal from "./ModifyNodeModal";
 
 /**
  * A popover that shows all node types inline near the cursor/selection.
@@ -98,7 +99,7 @@ export class InlineNodeTypePicker {
       itemEl.addEventListener("mousedown", (e) => {
         e.preventDefault();
         e.stopPropagation();
-        void this.selectItem(item);
+        this.selectItem(item);
       });
 
       itemEl.addEventListener("mouseenter", () => {
@@ -138,14 +139,22 @@ export class InlineNodeTypePicker {
     }
   }
 
-  private async selectItem(item: DiscourseNode) {
+  private selectItem(item: DiscourseNode) {
     this.close();
-    await createDiscourseNode({
+    const currentFile =
+      this.options.plugin.app.workspace.getActiveViewOfType(MarkdownView)
+        ?.file || undefined;
+    new ModifyNodeModal(this.options.plugin.app, {
+      nodeTypes: this.options.plugin.settings.nodeTypes,
       plugin: this.options.plugin,
-      nodeType: item,
-      text: this.options.selectedText,
-      editor: this.options.editor,
-    });
+      initialTitle: this.options.selectedText,
+      initialNodeType: item,
+      currentFile,
+      onSubmit: createModifyNodeModalSubmitHandler(
+        this.options.plugin,
+        this.options.editor,
+      ),
+    }).open();
   }
 
   private setupEventHandlers() {
@@ -173,7 +182,7 @@ export class InlineNodeTypePicker {
         e.stopPropagation();
         const selectedItem = this.items[this.selectedIndex];
         if (selectedItem) {
-          void this.selectItem(selectedItem);
+          this.selectItem(selectedItem);
         }
       } else if (e.key === "Escape") {
         e.preventDefault();