diff --git a/apps/obsidian/src/components/ModifyNodeModal.tsx b/apps/obsidian/src/components/ModifyNodeModal.tsx
index 7c07369bc..7bd3fcee4 100644
--- a/apps/obsidian/src/components/ModifyNodeModal.tsx
+++ b/apps/obsidian/src/components/ModifyNodeModal.tsx
@@ -19,11 +19,15 @@ type ModifyNodeFormProps = {
     title: string;
     initialFile?: TFile; // for edit mode
     selectedExistingNode?: TFile;
+    /** DiscourseRelation.id; when set, relation is created with currentFile as the other end. */
+    relationshipId?: string;
+    relationshipTargetFile?: TFile;
   }) => Promise<void>;
   onCancel: () => void;
   initialTitle?: string;
   initialNodeType?: DiscourseNode;
   initialFile?: TFile; // for edit mode
+  currentFile?: TFile; // the file where the node is being created from
   plugin: DiscourseGraphPlugin;
 };
 
@@ -34,6 +38,7 @@ export const ModifyNodeForm = ({
   initialTitle = "",
   initialNodeType,
   initialFile,
+  currentFile,
   plugin,
 }: ModifyNodeFormProps) => {
   const isEditMode = !!initialFile;
@@ -48,6 +53,9 @@ export const ModifyNodeForm = ({
   const [isFocused, setIsFocused] = useState(false);
   const [searchResults, setSearchResults] = useState<TFile[]>([]);
   const [isSearching, setIsSearching] = useState(false);
+  const [selectedRelationshipKey, setSelectedRelationshipKey] = useState<
+    string | undefined
+  >(undefined);
   const queryEngine = useRef(new QueryEngine(plugin.app));
   const titleInputRef = useRef<HTMLInputElement>(null);
   const popoverRef = useRef<HTMLDivElement>(null);
@@ -136,6 +144,78 @@ export const ModifyNodeForm = ({
     }
   }, [activeIndex, isOpen]);
 
+  // Determine available relationships based on current file and selected node type
+  const availableRelationships = useMemo(() => {
+    if (!currentFile || !selectedNodeType || isEditMode) {
+      return [];
+    }
+
+    const currentFileCache = plugin.app.metadataCache.getFileCache(currentFile);
+    const currentNodeTypeId = currentFileCache?.frontmatter?.nodeTypeId as
+      | string
+      | undefined;
+
+    if (!currentNodeTypeId) {
+      return [];
+    }
+
+    // Find all relations that connect the current node type to the selected node type
+    const relevantRelations = plugin.settings.discourseRelations.filter(
+      (relation) =>
+        (relation.sourceId === currentNodeTypeId &&
+          relation.destinationId === selectedNodeType.id) ||
+        (relation.sourceId === selectedNodeType.id &&
+          relation.destinationId === currentNodeTypeId),
+    );
+
+    const relations = relevantRelations
+      .map((relation) => {
+        const relationType = plugin.settings.relationTypes.find(
+          (rt) => rt.id === relation.relationshipTypeId,
+        );
+        if (!relationType) return null;
+
+        const isCurrentFileSource = relation.sourceId === currentNodeTypeId;
+        return {
+          relationTypeId: relation.relationshipTypeId,
+          label: isCurrentFileSource
+            ? relationType.label
+            : relationType.complement,
+          isCurrentFileSource,
+          uniqueKey: relation.id,
+        };
+      })
+      .filter(Boolean) as Array<{
+      relationTypeId: string;
+      label: string;
+      isCurrentFileSource: boolean;
+      uniqueKey: string;
+    }>;
+
+    return [
+      ...relations,
+      {
+        uniqueKey: "",
+        label: "No relation",
+        relationTypeId: "",
+        isCurrentFileSource: false,
+      },
+    ];
+  }, [currentFile, selectedNodeType, isEditMode, plugin]);
+
+  // Default to first option when list appears or selection is no longer valid
+  useEffect(() => {
+    const first = availableRelationships[0];
+    if (!first) return;
+    const isValid =
+      selectedRelationshipKey !== undefined &&
+      availableRelationships.some(
+        (r) => r.uniqueKey === selectedRelationshipKey,
+      );
+    if (isValid) return;
+    setSelectedRelationshipKey(first.uniqueKey);
+  }, [availableRelationships, selectedRelationshipKey]);
+
   const isFormValid = title.trim() && selectedNodeType;
 
   const handleSelect = useCallback((file: TFile) => {
@@ -194,6 +274,7 @@ export const ModifyNodeForm = ({
       setQuery("");
       setTitle("");
     }
+    setSelectedRelationshipKey(undefined);
   };
 
   const handleQueryChange = (e: React.ChangeEvent<HTMLInputElement>) => {
@@ -223,11 +304,18 @@ export const ModifyNodeForm = ({
 
     try {
       setIsSubmitting(true);
+      const key =
+        selectedRelationshipKey ?? availableRelationships[0]?.uniqueKey ?? "";
+      const selectedRel = key
+        ? availableRelationships.find((r) => r.uniqueKey === key)
+        : undefined;
       await onSubmit({
         nodeType: selectedNodeType,
         title: trimmedTitle,
         initialFile,
         selectedExistingNode: selectedExistingNode || undefined,
+        relationshipId: selectedRel?.uniqueKey || undefined,
+        relationshipTargetFile: currentFile || undefined,
       });
       onCancel();
     } catch (error) {
@@ -252,6 +340,9 @@ export const ModifyNodeForm = ({
     isEditMode,
     initialFile,
     selectedExistingNode,
+    selectedRelationshipKey,
+    currentFile,
+    availableRelationships,
   ]);
 
   return (
@@ -371,6 +462,32 @@ export const ModifyNodeForm = ({
         </div>
       </div>
 
+      {availableRelationships.length > 0 && !isEditMode && currentFile && (
+        <div className="setting-item">
+          <div className="setting-item-name">
+            Relationship with &quot;{currentFile.basename}&quot;
+          </div>
+          <div className="setting-item-control">
+            <select
+              value={
+                selectedRelationshipKey ??
+                availableRelationships[0]?.uniqueKey ??
+                ""
+              }
+              onChange={(e) => setSelectedRelationshipKey(e.target.value)}
+              disabled={isSubmitting}
+              className="w-full"
+            >
+              {availableRelationships.map((rel) => (
+                <option key={rel.uniqueKey || "none"} value={rel.uniqueKey}>
+                  {rel.label}
+                </option>
+              ))}
+            </select>
+          </div>
+        </div>
+      )}
+
       <div className="modal-button-container mt-5 flex justify-end gap-2">
         <button
           type="button"
@@ -407,10 +524,13 @@ type ModifyNodeModalProps = {
     title: string;
     initialFile?: TFile;
     selectedExistingNode?: TFile;
+    relationshipId?: string;
+    relationshipTargetFile?: TFile;
   }) => Promise<void>;
   initialTitle?: string;
   initialNodeType?: DiscourseNode;
   initialFile?: TFile;
+  currentFile?: TFile;
 };
 
 class ModifyNodeModal extends Modal {
@@ -420,11 +540,14 @@ class ModifyNodeModal extends Modal {
     title: string;
     initialFile?: TFile;
     selectedExistingNode?: TFile;
+    relationshipId?: string;
+    relationshipTargetFile?: TFile;
   }) => Promise<void>;
   private root: Root | null = null;
   private initialTitle?: string;
   private initialNodeType?: DiscourseNode;
   private initialFile?: TFile;
+  private currentFile?: TFile;
   private plugin: DiscourseGraphPlugin;
 
   constructor(app: App, props: ModifyNodeModalProps) {
@@ -434,6 +557,7 @@ class ModifyNodeModal extends Modal {
     this.initialTitle = props.initialTitle;
     this.initialNodeType = props.initialNodeType;
     this.initialFile = props.initialFile;
+    this.currentFile = props.currentFile;
     this.plugin = props.plugin;
   }
 
@@ -451,6 +575,7 @@ class ModifyNodeModal extends Modal {
           initialTitle={this.initialTitle}
           initialNodeType={this.initialNodeType}
           initialFile={this.initialFile}
+          currentFile={this.currentFile}
           plugin={this.plugin}
         />
       </StrictMode>,
diff --git a/apps/obsidian/src/components/RelationshipSection.tsx b/apps/obsidian/src/components/RelationshipSection.tsx
index 99e805db6..207ed7924 100644
--- a/apps/obsidian/src/components/RelationshipSection.tsx
+++ b/apps/obsidian/src/components/RelationshipSection.tsx
@@ -367,11 +367,6 @@ const CurrentRelationships = ({
     const fileCache = plugin.app.metadataCache.getFileCache(activeFile);
     if (!fileCache?.frontmatter) return;
 
-    const activeNodeTypeId = fileCache.frontmatter.nodeTypeId as
-      | string
-      | undefined;
-    if (!activeNodeTypeId) return;
-
     const nodeInstanceId = await getNodeInstanceIdForFile(plugin, activeFile);
     if (!nodeInstanceId) return;
 
@@ -381,21 +376,17 @@ const CurrentRelationships = ({
     );
     const tempRelationships = new Map<string, GroupedRelation>();
 
-    for (const relationType of plugin.settings.relationTypes) {
-      const typeLevelRelation = plugin.settings.discourseRelations.find(
-        (rel) =>
-          (rel.sourceId === activeNodeTypeId ||
-            rel.destinationId === activeNodeTypeId) &&
-          rel.relationshipTypeId === relationType.id,
+    for (const r of relations) {
+      const relationType = plugin.settings.relationTypes.find(
+        (rt) => rt.id === r.type,
       );
-      if (!typeLevelRelation) continue;
+      if (!relationType) continue;
 
-      const instanceRels = relations.filter((r) => r.type === relationType.id);
-      const isSource = typeLevelRelation.sourceId === activeNodeTypeId;
+      const isSource = r.source === nodeInstanceId;
       const relationLabel = isSource
         ? relationType.label
         : relationType.complement;
-      const relationKey = `${relationType.id}-${isSource}`;
+      const relationKey = `${r.type}-${isSource ? "source" : "target"}`;
 
       if (!tempRelationships.has(relationKey)) {
         tempRelationships.set(relationKey, {
@@ -409,16 +400,13 @@ const CurrentRelationships = ({
       }
 
       const group = tempRelationships.get(relationKey)!;
-      for (const r of instanceRels) {
-        const otherId = r.source === nodeInstanceId ? r.destination : r.source;
-        const linkedFile = await getFileForNodeInstanceId(plugin, otherId);
-        if (!linkedFile) continue;
-        if (
-          linkedFile &&
-          !group.linkedFiles.some((f) => f.path === linkedFile.path)
-        ) {
-          group.linkedFiles.push(linkedFile);
-        }
+      const otherId = isSource ? r.destination : r.source;
+      const linkedFile = await getFileForNodeInstanceId(plugin, otherId);
+      if (
+        linkedFile &&
+        !group.linkedFiles.some((f) => f.path === linkedFile.path)
+      ) {
+        group.linkedFiles.push(linkedFile);
       }
     }
 
diff --git a/apps/obsidian/src/components/canvas/shapes/DiscourseRelationShape.tsx b/apps/obsidian/src/components/canvas/shapes/DiscourseRelationShape.tsx
index fc8ff91dc..756955ad1 100644
--- a/apps/obsidian/src/components/canvas/shapes/DiscourseRelationShape.tsx
+++ b/apps/obsidian/src/components/canvas/shapes/DiscourseRelationShape.tsx
@@ -1212,7 +1212,6 @@ export class DiscourseRelationUtil extends ShapeUtil<DiscourseRelationShape> {
 
       const { alreadyExisted, relationInstanceId } =
         await addRelationToRelationsJson({
-          app: this.options.app,
           plugin: this.options.plugin,
           sourceFile,
           targetFile,
diff --git a/apps/obsidian/src/components/canvas/utils/nodeCreationFlow.ts b/apps/obsidian/src/components/canvas/utils/nodeCreationFlow.ts
index 0d8a2b120..54dbc2e13 100644
--- a/apps/obsidian/src/components/canvas/utils/nodeCreationFlow.ts
+++ b/apps/obsidian/src/components/canvas/utils/nodeCreationFlow.ts
@@ -8,6 +8,7 @@ import { addWikilinkBlockrefForFile } from "~/components/canvas/stores/assetStor
 import { showToast } from "./toastUtils";
 import { calcDiscourseNodeSize } from "~/utils/calcDiscourseNodeSize";
 import { getFirstImageSrcForFile } from "~/components/canvas/shapes/discourseNodeShapeUtils";
+import { addRelationIfRequested } from "./relationJsonUtils";
 
 export type CreateNodeAtArgs = {
   plugin: DiscourseGraphPlugin;
@@ -24,10 +25,13 @@ export const openCreateDiscourseNodeAt = (args: CreateNodeAtArgs): void => {
     nodeTypes: plugin.settings.nodeTypes,
     plugin,
     initialNodeType,
+    currentFile: canvasFile,
     onSubmit: async ({
       nodeType: selectedNodeType,
       title,
       selectedExistingNode,
+      relationshipId,
+      relationshipTargetFile,
     }) => {
       try {
         // If user selected an existing node, use it instead of creating a new one
@@ -43,6 +47,13 @@ export const openCreateDiscourseNodeAt = (args: CreateNodeAtArgs): void => {
           throw new Error("Failed to get discourse node file");
         }
 
+        if (relationshipId && relationshipTargetFile) {
+          await addRelationIfRequested(plugin, fileToUse, {
+            relationshipId,
+            relationshipTargetFile,
+          });
+        }
+
         const src = await addWikilinkBlockrefForFile({
           app: plugin.app,
           canvasFile,
diff --git a/apps/obsidian/src/components/canvas/utils/relationJsonUtils.ts b/apps/obsidian/src/components/canvas/utils/relationJsonUtils.ts
index 043feeeec..7e547c57a 100644
--- a/apps/obsidian/src/components/canvas/utils/relationJsonUtils.ts
+++ b/apps/obsidian/src/components/canvas/utils/relationJsonUtils.ts
@@ -1,6 +1,10 @@
-import type { App, TFile } from "obsidian";
+import { Notice, type TFile } from "obsidian";
 import type DiscourseGraphPlugin from "~/index";
-import { addRelation, getNodeInstanceIdForFile } from "~/utils/relationsStore";
+import {
+  addRelation,
+  getNodeInstanceIdForFile,
+  getNodeTypeIdForFile,
+} from "~/utils/relationsStore";
 
 /**
  * Persists a relation between two files to the relations store (relations.json).
@@ -9,13 +13,11 @@ import { addRelation, getNodeInstanceIdForFile } from "~/utils/relationsStore";
  * @returns Object indicating whether the relation already existed and the relation instance id.
  */
 export const addRelationToRelationsJson = async ({
-  app,
   plugin,
   sourceFile,
   targetFile,
   relationTypeId,
 }: {
-  app: App;
   plugin: DiscourseGraphPlugin;
   sourceFile: TFile;
   targetFile: TFile;
@@ -23,8 +25,19 @@ export const addRelationToRelationsJson = async ({
 }): Promise<{ alreadyExisted: boolean; relationInstanceId?: string }> => {
   const sourceId = await getNodeInstanceIdForFile(plugin, sourceFile);
   const destId = await getNodeInstanceIdForFile(plugin, targetFile);
+
   if (!sourceId || !destId) {
-    console.warn("Could not resolve nodeInstanceIds for relation files");
+    const missing: string[] = [];
+    if (!sourceId) missing.push(`source (${sourceFile.basename})`);
+    if (!destId) missing.push(`target (${targetFile.basename})`);
+    console.warn(
+      "Could not resolve nodeInstanceIds for relation files:",
+      missing.join(", "),
+    );
+    new Notice(
+      "Could not create relation: one or both files are not discourse nodes or metadata is not ready.",
+      3000,
+    );
     return { alreadyExisted: false };
   }
 
@@ -35,3 +48,60 @@ export const addRelationToRelationsJson = async ({
   });
   return { alreadyExisted, relationInstanceId: id };
 };
+
+type RelationParams = {
+  /** DiscourseRelation.id; when set, a relation is created between the two files. */
+  relationshipId?: string;
+  relationshipTargetFile?: TFile;
+};
+
+export const addRelationIfRequested = async (
+  plugin: DiscourseGraphPlugin,
+  createdOrSelectedFile: TFile,
+  params: RelationParams,
+): Promise<void> => {
+  const { relationshipId, relationshipTargetFile } = params;
+  if (!relationshipId || !relationshipTargetFile) return;
+  if (relationshipTargetFile === createdOrSelectedFile) return;
+
+  const relation = plugin.settings.discourseRelations.find(
+    (r) => r.id === relationshipId,
+  );
+  if (!relation) return;
+
+  const [typeA, typeB] = await Promise.all([
+    getNodeTypeIdForFile(plugin, createdOrSelectedFile),
+    getNodeTypeIdForFile(plugin, relationshipTargetFile),
+  ]);
+  if (!typeA || !typeB) {
+    console.warn(
+      "addRelationIfRequested: could not resolve node types for one or both files",
+    );
+    return;
+  }
+
+  let sourceFile: TFile;
+  let targetFile: TFile;
+  if (relation.sourceId === typeA && relation.destinationId === typeB) {
+    sourceFile = createdOrSelectedFile;
+    targetFile = relationshipTargetFile;
+  } else if (relation.sourceId === typeB && relation.destinationId === typeA) {
+    sourceFile = relationshipTargetFile;
+    targetFile = createdOrSelectedFile;
+  } else if (relation.sourceId === relation.destinationId) {
+    sourceFile = createdOrSelectedFile;
+    targetFile = relationshipTargetFile;
+  } else {
+    console.warn(
+      "addRelationIfRequested: file node types do not match relation definition",
+    );
+    return;
+  }
+
+  await addRelationToRelationsJson({
+    plugin,
+    sourceFile,
+    targetFile,
+    relationTypeId: relation.relationshipTypeId,
+  });
+};
\ No newline at end of file
diff --git a/apps/obsidian/src/constants.ts b/apps/obsidian/src/constants.ts
index 23ce48a99..5084f6d85 100644
--- a/apps/obsidian/src/constants.ts
+++ b/apps/obsidian/src/constants.ts
@@ -5,7 +5,7 @@ import generateUid from "~/utils/generateUid";
 const now = new Date().getTime();
 
 export const DEFAULT_NODE_TYPES: Record<string, DiscourseNode> = {
-  Question: {
+  question: {
     id: generateUid("node"),
     name: "Question",
     format: "QUE - {content}",
@@ -13,7 +13,7 @@ export const DEFAULT_NODE_TYPES: Record<string, DiscourseNode> = {
     created: now,
     modified: now,
   },
-  Claim: {
+  claim: {
     id: generateUid("node"),
     name: "Claim",
     format: "CLM - {content}",
@@ -22,7 +22,7 @@ export const DEFAULT_NODE_TYPES: Record<string, DiscourseNode> = {
     created: now,
     modified: now,
   },
-  Evidence: {
+  evidence: {
     id: generateUid("node"),
     name: "Evidence",
     format: "EVD - {content}",
@@ -31,6 +31,15 @@ export const DEFAULT_NODE_TYPES: Record<string, DiscourseNode> = {
     created: now,
     modified: now,
   },
+  source: {
+    id: generateUid("node"),
+    name: "Source",
+    format: "SRC - {content}",
+    color: "#3B82F6",
+    tag: "src-candidate",
+    created: now,
+    modified: now,
+  },
 };
 export const DEFAULT_RELATION_TYPES: Record<string, DiscourseRelationType> = {
   supports: {
@@ -57,6 +66,14 @@ export const DEFAULT_RELATION_TYPES: Record<string, DiscourseRelationType> = {
     created: now,
     modified: now,
   },
+  derivedFrom: {
+    id: generateUid("relation"),
+    label: "derived from",
+    complement: "has derivation",
+    color: "blue",
+    created: now,
+    modified: now,
+  },
 };
 
 export const DEFAULT_SETTINGS: Settings = {
@@ -65,28 +82,36 @@ export const DEFAULT_SETTINGS: Settings = {
   discourseRelations: [
     {
       id: generateUid("rel3"),
-      sourceId: DEFAULT_NODE_TYPES.Evidence!.id,
-      destinationId: DEFAULT_NODE_TYPES.Question!.id,
+      sourceId: DEFAULT_NODE_TYPES.evidence!.id,
+      destinationId: DEFAULT_NODE_TYPES.question!.id,
       relationshipTypeId: DEFAULT_RELATION_TYPES.informs!.id,
       created: now,
       modified: now,
     },
     {
       id: generateUid("rel3"),
-      sourceId: DEFAULT_NODE_TYPES.Evidence!.id,
-      destinationId: DEFAULT_NODE_TYPES.Claim!.id,
+      sourceId: DEFAULT_NODE_TYPES.evidence!.id,
+      destinationId: DEFAULT_NODE_TYPES.claim!.id,
       relationshipTypeId: DEFAULT_RELATION_TYPES.supports!.id,
       created: now,
       modified: now,
     },
     {
       id: generateUid("rel3"),
-      sourceId: DEFAULT_NODE_TYPES.Evidence!.id,
-      destinationId: DEFAULT_NODE_TYPES.Claim!.id,
+      sourceId: DEFAULT_NODE_TYPES.evidence!.id,
+      destinationId: DEFAULT_NODE_TYPES.claim!.id,
       relationshipTypeId: DEFAULT_RELATION_TYPES.opposes!.id,
       created: now,
       modified: now,
     },
+    {
+      id: generateUid("rel3"),
+      sourceId: DEFAULT_NODE_TYPES.evidence!.id,
+      destinationId: DEFAULT_NODE_TYPES.source!.id,
+      relationshipTypeId: DEFAULT_RELATION_TYPES.derivedFrom!.id,
+      created: now,
+      modified: now,
+    },
   ],
   showIdsInFrontmatter: false,
   nodesFolderPath: "",
diff --git a/apps/obsidian/src/utils/registerCommands.ts b/apps/obsidian/src/utils/registerCommands.ts
index ffe07b1b3..bff59fc39 100644
--- a/apps/obsidian/src/utils/registerCommands.ts
+++ b/apps/obsidian/src/utils/registerCommands.ts
@@ -1,4 +1,4 @@
-import { Editor, MarkdownView, Notice } from "obsidian";
+import { Editor, MarkdownView, Notice, TFile } from "obsidian";
 import type DiscourseGraphPlugin from "~/index";
 import { NodeTypeModal } from "~/components/NodeTypeModal";
 import ModifyNodeModal from "~/components/ModifyNodeModal";
@@ -8,6 +8,52 @@ import { VIEW_TYPE_MARKDOWN, VIEW_TYPE_TLDRAW_DG_PREVIEW } from "~/constants";
 import { createCanvas } from "~/components/canvas/utils/tldraw";
 import { createOrUpdateDiscourseEmbedding } from "./syncDgNodesToSupabase";
 import { publishNode } from "./publishNode";
+import { addRelationIfRequested } from "~/components/canvas/utils/relationJsonUtils";
+import type { DiscourseNode } from "~/types";
+
+
+type ModifyNodeSubmitParams = {
+  nodeType: DiscourseNode;
+  title: string;
+  initialFile?: TFile;
+  selectedExistingNode?: TFile;
+  relationshipId?: string;
+  relationshipTargetFile?: TFile;
+};
+
+const createModifyNodeModalSubmitHandler = (
+  plugin: DiscourseGraphPlugin,
+  editor: Editor,
+): ((params: ModifyNodeSubmitParams) => Promise<void>) => {
+  return async ({
+    nodeType,
+    title,
+    selectedExistingNode,
+    relationshipId,
+    relationshipTargetFile,
+  }: ModifyNodeSubmitParams) => {
+    if (selectedExistingNode) {
+      editor.replaceSelection(`[[${selectedExistingNode.basename}]]`);
+      await addRelationIfRequested(plugin, selectedExistingNode, {
+        relationshipId,
+        relationshipTargetFile,
+      });
+    } else {
+      const newFile = await createDiscourseNode({
+        plugin,
+        nodeType,
+        text: title,
+        editor,
+      });
+      if (newFile) {
+        await addRelationIfRequested(plugin, newFile, {
+          relationshipId,
+          relationshipTargetFile,
+        });
+      }
+    }
+  };
+};
 
 export const registerCommands = (plugin: DiscourseGraphPlugin) => {
   plugin.addCommand({
@@ -20,21 +66,14 @@ export const registerCommands = (plugin: DiscourseGraphPlugin) => {
       if (hasSelection) {
         new NodeTypeModal(editor, plugin.settings.nodeTypes, plugin).open();
       } else {
+        const currentFile =
+          plugin.app.workspace.getActiveViewOfType(MarkdownView)?.file ||
+          undefined;
         new ModifyNodeModal(plugin.app, {
           nodeTypes: plugin.settings.nodeTypes,
           plugin,
-          onSubmit: async ({ nodeType, title, selectedExistingNode }) => {
-            if (selectedExistingNode) {
-              editor.replaceSelection(`[[${selectedExistingNode.basename}]]`);
-            } else {
-              await createDiscourseNode({
-                plugin,
-                nodeType,
-                text: title,
-                editor,
-              });
-            }
-          },
+          currentFile,
+          onSubmit: createModifyNodeModalSubmitHandler(plugin, editor),
         }).open();
       }
     },
@@ -44,21 +83,14 @@ export const registerCommands = (plugin: DiscourseGraphPlugin) => {
     id: "create-discourse-node",
     name: "Create discourse node",
     editorCallback: (editor: Editor) => {
+      const currentFile =
+        plugin.app.workspace.getActiveViewOfType(MarkdownView)?.file ||
+        undefined;
       new ModifyNodeModal(plugin.app, {
         nodeTypes: plugin.settings.nodeTypes,
         plugin,
-        onSubmit: async ({ nodeType, title, selectedExistingNode }) => {
-          if (selectedExistingNode) {
-            editor.replaceSelection(`[[${selectedExistingNode.basename}]]`);
-          } else {
-            await createDiscourseNode({
-              plugin,
-              nodeType,
-              text: title,
-              editor,
-            });
-          }
-        },
+        currentFile,
+        onSubmit: createModifyNodeModalSubmitHandler(plugin, editor),
       }).open();
     },
   });
diff --git a/apps/obsidian/src/utils/relationsStore.ts b/apps/obsidian/src/utils/relationsStore.ts
index 43e330702..24935ce6e 100644
--- a/apps/obsidian/src/utils/relationsStore.ts
+++ b/apps/obsidian/src/utils/relationsStore.ts
@@ -176,22 +176,68 @@ export const getRelationsForNodeInstanceId = async (
   );
 }
 
+const DEFAULT_CACHE_WAIT_MS = 500;
+const CACHE_POLL_INTERVAL_MS = 30;
+
+/**
+ * Waits for the metadata cache to contain frontmatter with nodeTypeId for the file
+ * (e.g. after a file was just created). Polls at a short interval up to a timeout.
+ */
+const waitForDiscourseFrontmatter = async (
+  plugin: DiscourseGraphPlugin,
+  file: TFile,
+  timeoutMs = DEFAULT_CACHE_WAIT_MS,
+): Promise<Record<string, unknown> | null> => {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    const cache = plugin.app.metadataCache.getFileCache(file);
+    const fm = cache?.frontmatter;
+    if (fm?.nodeTypeId) return fm as Record<string, unknown>;
+    await new Promise((r) => setTimeout(r, CACHE_POLL_INTERVAL_MS));
+  }
+  return null;
+};
+
 export const getNodeInstanceIdForFile = async (
   plugin: DiscourseGraphPlugin,
   file: TFile,
 ): Promise<string | null> => {
-  const cache = plugin.app.metadataCache.getFileCache(file);
-  const frontmatter = cache?.frontmatter;
+  let frontmatter = plugin.app.metadataCache.getFileCache(file)?.frontmatter as
+    | Record<string, unknown>
+    | undefined;
+
+  if (!frontmatter?.nodeTypeId) {
+    frontmatter =
+      (await waitForDiscourseFrontmatter(plugin, file)) ?? undefined;
+  }
+
   if (!frontmatter?.nodeTypeId) {
     return null;
   }
-  return await ensureNodeInstanceId(
-    plugin,
-    file,
-    frontmatter as Record<string, unknown>,
-  );
+  return await ensureNodeInstanceId(plugin, file, frontmatter);
 }
 
+/**
+ * Returns the node type id from a file's frontmatter (nodeTypeId).
+ * Waits for metadata cache if not yet available (e.g. after file creation).
+ */
+export const getNodeTypeIdForFile = async (
+  plugin: DiscourseGraphPlugin,
+  file: TFile,
+): Promise<string | null> => {
+  let frontmatter = plugin.app.metadataCache.getFileCache(file)?.frontmatter as
+    | Record<string, unknown>
+    | undefined;
+
+  if (!frontmatter?.nodeTypeId) {
+    frontmatter =
+      (await waitForDiscourseFrontmatter(plugin, file)) ?? undefined;
+  }
+
+  const nodeTypeId = frontmatter?.nodeTypeId;
+  return typeof nodeTypeId === "string" ? nodeTypeId : null;
+};
+
 export const getFileForNodeInstanceId = async (
   plugin: DiscourseGraphPlugin,
   nodeInstanceId: string,
diff --git a/apps/obsidian/src/utils/tagNodeHandler.ts b/apps/obsidian/src/utils/tagNodeHandler.ts
index 5b955714a..5fac4d81e 100644
--- a/apps/obsidian/src/utils/tagNodeHandler.ts
+++ b/apps/obsidian/src/utils/tagNodeHandler.ts
@@ -6,6 +6,7 @@ import type DiscourseGraphPlugin from "~/index";
 import ModifyNodeModal from "~/components/ModifyNodeModal";
 import { createDiscourseNodeFile, formatNodeName } from "./createNode";
 import { getNodeTagColors } from "./colorUtils";
+import { addRelationIfRequested } from "~/components/canvas/utils/relationJsonUtils";
 
 const HOVER_DELAY = 200;
 const HIDE_DELAY = 100;
@@ -40,6 +41,8 @@ type NodeCreationParams = {
   editor: Editor;
   tagElement: HTMLElement;
   selectedExistingNode?: TFile;
+  relationshipId?: string;
+  relationshipTargetFile?: TFile;
 };
 
 /**
@@ -268,15 +271,22 @@ export class TagNodeHandler {
       extractedData.fullLineContent.replace(/#[^\s]+/g, ""),
     );
 
+    // Get the current file from the active view
+    const activeView = this.app.workspace.getActiveViewOfType(MarkdownView);
+    const currentFile = activeView?.file || undefined;
+
     new ModifyNodeModal(this.app, {
       nodeTypes: this.plugin.settings.nodeTypes,
       plugin: this.plugin,
       initialTitle: cleanText,
       initialNodeType: nodeType,
+      currentFile,
       onSubmit: async ({
         nodeType: selectedNodeType,
         title,
         selectedExistingNode,
+        relationshipId,
+        relationshipTargetFile,
       }) => {
         await this.createNodeAndReplace({
           nodeType: selectedNodeType,
@@ -284,6 +294,8 @@ export class TagNodeHandler {
           editor,
           tagElement,
           selectedExistingNode,
+          relationshipId,
+          relationshipTargetFile,
         });
       },
     }).open();
@@ -295,13 +307,22 @@ export class TagNodeHandler {
   private async createNodeAndReplace(
     params: NodeCreationParams,
   ): Promise<void> {
-    const { nodeType, title, editor, tagElement, selectedExistingNode } =
-      params;
+    const {
+      nodeType,
+      title,
+      editor,
+      tagElement,
+      selectedExistingNode,
+      relationshipId,
+      relationshipTargetFile,
+    } = params;
     try {
       let linkText: string;
+      let createdOrSelectedFile: TFile;
 
       if (selectedExistingNode) {
         linkText = `[[${selectedExistingNode.basename}]]`;
+        createdOrSelectedFile = selectedExistingNode;
       } else {
         const formattedNodeName = formatNodeName(title, nodeType);
         if (!formattedNodeName) {
@@ -321,6 +342,14 @@ export class TagNodeHandler {
         }
 
         linkText = `[[${formattedNodeName}]]`;
+        createdOrSelectedFile = newFile;
+      }
+
+      if (relationshipId && relationshipTargetFile) {
+        await addRelationIfRequested(this.plugin, createdOrSelectedFile, {
+          relationshipId,
+          relationshipTargetFile,
+        });
       }
 
       const extractedData = this.extractContent(tagElement);