diff --git a/README.md b/README.md
index 3d1b672..3372aba 100644
--- a/README.md
+++ b/README.md
@@ -115,13 +115,14 @@ Restart Claude Code fully (**Cmd+Q on Mac**, not just closing the window).
 }
 ```
 
-**What happens:** Once connected, Claude calls `getContext` first to orient itself (stats, hub nodes, dimensions, available skills). It proactively captures knowledge — when a new insight, decision, person, or reference surfaces, it proposes a specific node (title, dimensions, description) so you can approve with minimal friction. For complex tasks it reads skills to follow your graph conventions and workflows.
+**What happens:** Once connected, Claude calls `getContext` first to orient itself (stats, contexts, hub nodes, dimensions, available skills). It proactively captures knowledge — when a new insight, decision, person, or reference surfaces, it proposes a specific node (title, dimensions, description) so you can approve with minimal friction. For complex tasks it reads skills to follow your graph conventions and workflows.
 
 Available tools:
 
 | Tool | What it does |
 |------|--------------|
-| `getContext` | Get graph overview — stats, hub nodes, dimensions, recent activity |
+| `getContext` | Get graph overview — stats, contexts, hub nodes, dimensions, recent activity |
+| `queryContexts` | List contexts, inspect a context, or search contexts |
 | `queryNodes` | Find nodes by keyword |
 | `createNode` | Create a new node |
 | `getNodesById` | Fetch nodes by ID |
diff --git a/app/api/contexts/[id]/nodes/route.ts b/app/api/contexts/[id]/nodes/route.ts
new file mode 100644
index 0000000..20a77a6
--- /dev/null
+++ b/app/api/contexts/[id]/nodes/route.ts
@@ -0,0 +1,22 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { contextService } from '@/services/database';
+
+export const runtime = 'nodejs';
+
+export async function GET(
+  request: NextRequest,
+  { params }: { params: Promise<{ id: string }> }
+) {
+  try {
+    const { id } = await params;
+    const contextId = parseInt(id, 10);
+    if (Number.isNaN(contextId)) {
+      return NextResponse.json({ success: false, error: 'Invalid context ID' }, { status: 400 });
+    }
+
+    const nodes = await contextService.getNodesForContext(contextId);
+    return NextResponse.json({ success: true, data: nodes, count: nodes.length });
+  } catch (error) {
+    return NextResponse.json({ success: false, error: error instanceof Error ? error.message : 'Failed to fetch context nodes' }, { status: 500 });
+  }
+}
diff --git a/app/api/contexts/[id]/route.ts b/app/api/contexts/[id]/route.ts
new file mode 100644
index 0000000..a633e81
--- /dev/null
+++ b/app/api/contexts/[id]/route.ts
@@ -0,0 +1,26 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { contextService } from '@/services/database';
+
+export const runtime = 'nodejs';
+
+export async function GET(
+  request: NextRequest,
+  { params }: { params: Promise<{ id: string }> }
+) {
+  try {
+    const { id } = await params;
+    const contextId = parseInt(id, 10);
+    if (Number.isNaN(contextId)) {
+      return NextResponse.json({ success: false, error: 'Invalid context ID' }, { status: 400 });
+    }
+
+    const context = await contextService.getContextById(contextId);
+    if (!context) {
+      return NextResponse.json({ success: false, error: 'Context not found' }, { status: 404 });
+    }
+
+    return NextResponse.json({ success: true, data: context });
+  } catch (error) {
+    return NextResponse.json({ success: false, error: error instanceof Error ? error.message : 'Failed to fetch context' }, { status: 500 });
+  }
+}
diff --git a/app/api/contexts/route.ts b/app/api/contexts/route.ts
new file mode 100644
index 0000000..2969194
--- /dev/null
+++ b/app/api/contexts/route.ts
@@ -0,0 +1,47 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { contextService } from '@/services/database';
+
+export const runtime = 'nodejs';
+
+export async function GET() {
+  try {
+    const contexts = await contextService.listContexts();
+    return NextResponse.json({ success: true, data: contexts });
+  } catch (error) {
+    return NextResponse.json({ success: false, error: error instanceof Error ? error.message : 'Failed to fetch contexts' }, { status: 500 });
+  }
+}
+
+export async function POST(request: NextRequest) {
+  try {
+    const body = await request.json();
+    const context = await contextService.createContext({
+      name: body.name,
+      description: body.description,
+      icon: body.icon,
+    });
+    return NextResponse.json({ success: true, data: context }, { status: 201 });
+  } catch (error) {
+    return NextResponse.json({ success: false, error: error instanceof Error ? error.message : 'Failed to create context' }, { status: 400 });
+  }
+}
+
+export async function PUT(request: NextRequest) {
+  try {
+    const body = await request.json();
+    if (typeof body.id !== 'number' || !Number.isInteger(body.id) || body.id <= 0) {
+      return NextResponse.json({ success: false, error: 'Context id is required' }, { status: 400 });
+    }
+
+    const context = await contextService.updateContext({
+      id: body.id,
+      name: body.name,
+      description: body.description,
+      icon: body.icon,
+    });
+
+    return NextResponse.json({ success: true, data: context });
+  } catch (error) {
+    return NextResponse.json({ success: false, error: error instanceof Error ? error.message : 'Failed to update context' }, { status: 400 });
+  }
+}
diff --git a/app/api/nodes/[id]/route.ts b/app/api/nodes/[id]/route.ts
index 5116be0..133deeb 100644
--- a/app/api/nodes/[id]/route.ts
+++ b/app/api/nodes/[id]/route.ts
@@ -1,9 +1,11 @@
 import { NextRequest, NextResponse } from 'next/server';
-import { nodeService } from '@/services/database';
+import { contextService, nodeService } from '@/services/database';
 import { autoEmbedQueue } from '@/services/embedding/autoEmbedQueue';
 import { hasSufficientContent } from '@/services/embedding/constants';
-import { normalizeDimensions, validateExplicitDescription } from '@/services/database/quality';
+import { coerceDescriptionForStorage, normalizeDimensions } from '@/services/database/quality';
 import { formatUnknownDimensionsError, getUnknownDimensions } from '@/services/database/dimensionValidation';
+import { normalizeNodeLink } from '@/utils/nodeLink';
+import { mergeNodeMetadata } from '@/services/nodes/metadata';
 
 export const runtime = 'nodejs';
 
@@ -73,13 +75,23 @@ export async function PUT(
     const updates: Record<string, unknown> = { ...body };
     let shouldQueueEmbed = false;
 
-    if (typeof body.description === 'string') {
-      const descriptionError = validateExplicitDescription(body.description);
-      if (descriptionError) {
-        console.warn(
-          `[DescriptionQuality] User-updated description failed validation for node ${nodeId}: ${descriptionError}`
-        );
+    if (typeof body.link === 'string') {
+      const trimmedLink = body.link.trim();
+      const normalizedLink = normalizeNodeLink(trimmedLink);
+      if (trimmedLink && !normalizedLink) {
+        return NextResponse.json({
+          success: false,
+          error: 'Invalid link. Use a full URL like https://example.com'
+        }, { status: 400 });
       }
+      updates.link = normalizedLink ?? null;
+    }
+
+    if (typeof body.description === 'string') {
+      updates.description = coerceDescriptionForStorage({
+        title: typeof updates.title === 'string' ? updates.title : existingNode.title,
+        description: body.description
+      });
     }
 
     if (Array.isArray(body.dimensions)) {
@@ -96,6 +108,24 @@ export async function PUT(
     delete updates.notes;
     delete updates.chunk;
 
+    if (Object.prototype.hasOwnProperty.call(body, 'context_id') || Object.prototype.hasOwnProperty.call(body, 'context_name')) {
+      try {
+        updates.context_id = await contextService.resolveContextId({
+          context_id: body.context_id,
+          context_name: body.context_name,
+        });
+      } catch (error) {
+        return NextResponse.json({
+          success: false,
+          error: error instanceof Error ? error.message : 'Invalid context input'
+        }, { status: 400 });
+      }
+    }
+
+    if (body.metadata !== undefined) {
+      updates.metadata = mergeNodeMetadata(existingNode.metadata, body.metadata);
+    }
+
     const incomingSource = typeof body.source === 'string' ? body.source : undefined;
     const existingSource = existingNode.source ?? '';
 
diff --git a/app/api/nodes/route.ts b/app/api/nodes/route.ts
index 69d4fa1..52c400b 100644
--- a/app/api/nodes/route.ts
+++ b/app/api/nodes/route.ts
@@ -1,11 +1,14 @@
 import { NextRequest, NextResponse } from 'next/server';
-import { nodeService } from '@/services/database';
+import { contextService, nodeService } from '@/services/database';
 import { Node, NodeFilters } from '@/types/database';
 import { autoEmbedQueue } from '@/services/embedding/autoEmbedQueue';
 import { generateDescription } from '@/services/database/descriptionService';
 import { scheduleAutoEdgeCreation } from '@/services/agents/autoEdge';
-import { normalizeDimensions, validateExplicitDescription } from '@/services/database/quality';
+import { coerceDescriptionForStorage, normalizeDimensions } from '@/services/database/quality';
 import { formatUnknownDimensionsError, getUnknownDimensions } from '@/services/database/dimensionValidation';
+import { normalizeNodeLink } from '@/utils/nodeLink';
+import { buildCanonicalNodeMetadata } from '@/services/nodes/metadata';
+import { inferBestContextIdForNode } from '@/services/context/contextAssignment';
 
 export const runtime = 'nodejs';
 
@@ -19,6 +22,14 @@ export async function GET(request: NextRequest) {
       offset: searchParams.get('offset') ? parseInt(searchParams.get('offset')!) : 0
     };
 
+    const contextIdParam = searchParams.get('contextId');
+    if (contextIdParam) {
+      const parsed = parseInt(contextIdParam, 10);
+      if (!Number.isNaN(parsed)) {
+        filters.contextId = parsed;
+      }
+    }
+
     // Handle dimensions parameter (comma-separated)
     const dimensionsParam = searchParams.get('dimensions');
     if (dimensionsParam) {
@@ -94,6 +105,14 @@ export async function POST(request: NextRequest) {
     body.title = sanitizeTitle(body.title);
 
     const rawSource = typeof body.source === 'string' ? body.source.trim() : null;
+    const rawLink = typeof body.link === 'string' ? body.link : null;
+    const normalizedLink = normalizeNodeLink(rawLink);
+    if (rawLink && !normalizedLink) {
+      return NextResponse.json({
+        success: false,
+        error: 'Invalid link. Use a full URL like https://example.com'
+      }, { status: 400 });
+    }
     const eventDate = typeof body.event_date === 'string' ? body.event_date : null;
 
     // Process provided dimensions first (needed for description generation)
@@ -109,7 +128,7 @@ export async function POST(request: NextRequest) {
     // Use provided description if present, otherwise auto-generate
     const isUserSuppliedDescription = typeof body.description === 'string' && body.description.trim().length > 0;
     let nodeDescription: string | undefined = isUserSuppliedDescription
-      ? body.description.trim().slice(0, 280)
+      ? body.description.trim().slice(0, 500)
       : undefined;
 
     if (!nodeDescription) {
@@ -117,7 +136,7 @@ export async function POST(request: NextRequest) {
         nodeDescription = await generateDescription({
           title: body.title,
           source: rawSource?.slice(0, 2000) || undefined,
-          link: body.link || undefined,
+          link: normalizedLink || undefined,
           metadata: body.metadata,
           dimensions: trimmedProvidedDimensions
         });
@@ -128,28 +147,16 @@ export async function POST(request: NextRequest) {
 
     // Final safety net — never store null/empty description
     if (!nodeDescription || nodeDescription.trim().length === 0) {
-      nodeDescription = body.title.slice(0, 280);
+      nodeDescription = `${body.title}. Added via Quick Add with no further context yet, so the reason it belongs in the graph is not fully inferred. It has not been reviewed yet.`.slice(0, 500);
     }
 
-    let finalDescription = nodeDescription ?? body.title.slice(0, 280);
-
-    const descriptionError = validateExplicitDescription(finalDescription);
-    if (descriptionError) {
-      if (isUserSuppliedDescription) {
-        return NextResponse.json({
-          success: false,
-          error: descriptionError
-        }, { status: 400 });
-      }
-
-      console.warn(
-        `[DescriptionQuality] Auto-generated description failed validation for "${body.title}": ${descriptionError}. Falling back to title.`
-      );
-      finalDescription = body.title.slice(0, 280);
-    }
+    const finalDescription = coerceDescriptionForStorage({
+      title: body.title,
+      description: nodeDescription
+    });
 
     // Monitor description quality
-    if (WEAK_PATTERNS.test(finalDescription)) {
+    if (WEAK_PATTERNS.test(nodeDescription ?? finalDescription)) {
       console.warn(`[DescriptionQuality] Weak description for node "${body.title}": "${finalDescription}"`);
     }
 
@@ -162,15 +169,52 @@ export async function POST(request: NextRequest) {
       chunkStatus = 'not_chunked';
     }
 
+    let resolvedContextId: number | null | undefined;
+    try {
+      resolvedContextId = await contextService.resolveContextId({
+        context_id: body.context_id,
+        context_name: body.context_name,
+      });
+    } catch (error) {
+      console.warn('[nodes.create] Invalid explicit context input, falling back to inheritance/inference:', error);
+      resolvedContextId = undefined;
+    }
+
+    if (resolvedContextId === undefined && typeof body.active_context_id === 'number' && Number.isInteger(body.active_context_id) && body.active_context_id > 0) {
+      const inherited = await contextService.getContextById(body.active_context_id);
+      if (inherited) {
+        resolvedContextId = inherited.id;
+      }
+    }
+
+    if (resolvedContextId == null) {
+      resolvedContextId = await inferBestContextIdForNode({
+        title: body.title,
+        description: finalDescription,
+        source: sourceToStore,
+        dimensions: finalDimensions,
+        metadata: body.metadata,
+      });
+    }
+
     const node = await nodeService.createNode({
       title: body.title,
       description: finalDescription,
       source: sourceToStore ?? undefined,
       event_date: eventDate ?? undefined,
-      link: body.link,
+      link: normalizedLink ?? undefined,
       dimensions: finalDimensions,
       chunk_status: chunkStatus,
-      metadata: body.metadata || {}
+      context_id: resolvedContextId,
+      metadata: buildCanonicalNodeMetadata({
+        metadata: body.metadata || {},
+        type: typeof body.metadata?.type === 'string'
+          ? body.metadata.type
+          : typeof body.metadata?.source === 'string'
+            ? body.metadata.source
+            : undefined,
+        state: body.metadata?.state === 'processed' ? 'processed' : 'not_processed',
+      })
     });
 
     if (chunkStatus === 'not_chunked' && node.id) {
diff --git a/apps/mcp-server-standalone/README.md b/apps/mcp-server-standalone/README.md
index c464c8f..3bdfde9 100644
--- a/apps/mcp-server-standalone/README.md
+++ b/apps/mcp-server-standalone/README.md
@@ -41,7 +41,7 @@ Restart Claude. Done.
 ## What to Expect
 
 Once connected, Claude will:
-- **Call `getContext` first** to orient itself (stats, hub nodes, dimensions, skills)
+- **Call `getContext` first** to orient itself (stats, contexts, hub nodes, dimensions, skills)
 - **Proactively capture knowledge** — when a new insight, decision, person, or reference surfaces, it proposes a specific node (title, dimensions, description) so you can approve with minimal friction
 - **Read skills for complex tasks** — skills are editable and shared across internal + external agents
 - **Search before creating** to avoid duplicates
@@ -50,9 +50,10 @@ Once connected, Claude will:
 
 | Tool | Description |
 |------|-------------|
-| `getContext` | Get graph overview — stats, hub nodes, dimensions, recent activity |
+| `getContext` | Get graph overview — stats, contexts, hub nodes, dimensions, recent activity |
 | `createNode` | Create a new node |
 | `queryNodes` | Search nodes by keyword |
+| `queryContexts` | List or inspect contexts |
 | `getNodesById` | Load nodes by ID (includes chunk + metadata) |
 | `updateNode` | Update an existing node |
 | `createEdge` | Create connection between nodes |
diff --git a/apps/mcp-server-standalone/index.js b/apps/mcp-server-standalone/index.js
index 4562bdd..2efc4da 100644
--- a/apps/mcp-server-standalone/index.js
+++ b/apps/mcp-server-standalone/index.js
@@ -31,13 +31,14 @@ const { StdioServerTransport } = require('@modelcontextprotocol/sdk/server/stdio
 const { initDatabase, getDatabasePath, closeDatabase, getDb, query } = require('./services/sqlite-client');
 const nodeService = require('./services/nodeService');
 const edgeService = require('./services/edgeService');
+const contextService = require('./services/contextService');
 const dimensionService = require('./services/dimensionService');
 const skillService = require('./services/skillService');
 
 // Server info
 const serverInfo = {
   name: 'ra-h-standalone',
-  version: '1.8.0'
+  version: '1.10.1'
 };
 
 function buildInstructions() {
@@ -58,7 +59,7 @@ function buildInstructions() {
   return `Today's date: ${now}. RA-H is the user's personal knowledge graph — local SQLite, fully on-device.
 
 ## Quick start
-1. Call getContext for orientation (stats, hubs, dimensions).
+1. Call getContext for orientation (stats, contexts, dimensions, anchors/hubs).
 2. For simple tasks, tool descriptions have everything you need.
 3. For complex tasks, call readSkill("db-operations").
 
@@ -69,6 +70,7 @@ Always search before creating to avoid duplicates.
 Use only existing dimensions returned by getContext or queryDimensions.
 Do not invent new dimensions from node titles, concepts, or phrasing.
 Only call createDimension when the user explicitly instructs you to create a new dimension.
+Use contexts as the primary scope layer. Query contexts before assigning when needed.
 
 ## Available skills
 ${skillIndex}
@@ -83,15 +85,18 @@ const addNodeInputSchema = {
   content: z.string().max(20000).optional().describe('Legacy content field; mapped to source'),
   source: z.string().max(50000).optional().describe('Full source text'),
   link: z.string().url().optional().describe('Source URL'),
-  description: z.string().min(24).max(280).describe('REQUIRED. One-sentence summary: WHAT this is (explicit, concrete) + WHY it matters. No weak verbs (discusses, explores, examines). Example: "Podcast — Lex Fridman interviews Sam Altman on AGI timelines. First public comments since board drama."'),
+  description: z.string().optional().describe('Strongly recommended. Write the description as natural prose, not labels or a checklist. It should make clear what the artifact is and any surrounding context available. RA-H will accept whatever description is provided and will not block the write.'),
+  context_id: z.number().int().positive().nullable().optional().describe('Optional primary context ID.'),
+  context_name: z.string().optional().describe('Optional convenience context name.'),
   dimensions: z.array(z.string()).min(1).max(5).describe('1-5 existing categories. Call queryDimensions first to use existing ones. Do not invent new dimensions.'),
-  metadata: z.record(z.any()).optional().describe('Additional metadata'),
+  metadata: z.record(z.any()).optional().describe('Optional metadata. Prefer canonical keys: type, state, captured_method, captured_by, source_metadata.'),
   chunk: z.string().max(50000).optional().describe('Full source text')
 };
 
 const searchNodesInputSchema = {
   query: z.string().min(1).max(400).describe('Search query'),
   limit: z.number().min(1).max(25).optional().describe('Max results (default 10)'),
+  contextId: z.number().int().positive().optional().describe('Optional primary context filter.'),
   dimensions: z.array(z.string()).max(5).optional().describe('Filter by dimensions'),
   created_after: z.string().optional().describe('ISO date (YYYY-MM-DD). Only return nodes created on or after this date.'),
   created_before: z.string().optional().describe('ISO date (YYYY-MM-DD). Only return nodes created before this date.'),
@@ -107,9 +112,11 @@ const updateNodeInputSchema = {
   id: z.number().int().positive().describe('Node ID'),
   updates: z.object({
     title: z.string().optional().describe('New title'),
-    description: z.string().min(24).max(280).describe('REQUIRED. Explicitly state WHAT this is (podcast, conversation summary, user insight, etc.) + WHY it matters for context grounding. No vague verbs like "discusses/explores/examines".'),
+    description: z.string().optional().describe('Recommended replacement description. Keep it as natural prose that says what this artifact is and any surrounding context available. RA-H will accept whatever description is provided and will not block the write.'),
     content: z.string().optional().describe('Content to APPEND'),
+    source: z.string().optional().describe('Canonical source content for embedding'),
     link: z.string().optional().describe('New link'),
+    context_id: z.number().int().positive().nullable().optional().describe('Primary context ID. Omit to preserve existing context; use null to clear it.'),
     dimensions: z.array(z.string()).optional().describe('New dimensions (replaces existing)'),
     metadata: z.record(z.any()).optional().describe('New metadata')
   }).describe('Fields to update')
@@ -131,6 +138,14 @@ const queryEdgesInputSchema = {
   limit: z.number().min(1).max(50).optional().describe('Max edges (default 25)')
 };
 
+const queryContextsInputSchema = {
+  contextId: z.number().int().positive().optional().describe('Exact context ID lookup'),
+  name: z.string().optional().describe('Exact context name lookup'),
+  search: z.string().optional().describe('Case-insensitive search across context names and descriptions'),
+  limit: z.number().min(1).max(100).optional().describe('Maximum number of contexts to return'),
+  includeNodes: z.boolean().optional().describe('Include nodes for an exact single-context lookup')
+};
+
 const listDimensionsInputSchema = {};
 
 const createDimensionInputSchema = {
@@ -192,26 +207,6 @@ function sanitizeDimensions(raw) {
   return result;
 }
 
-function validateExplicitDescription(description) {
-  if (typeof description !== 'string') {
-    return 'Description is required and must be a string.';
-  }
-  const text = description.trim();
-  if (text.length < 24) {
-    return 'Description must be explicit and substantial (at least 24 characters).';
-  }
-  const weakPatterns = /\b(discusses|explores|examines|talks about|is about|delves into)\b/i;
-  const explicitEntityPatterns = /\b(article|artifact|book|brief|claim|company|concept|conversation|dataset|decision|dimension|document|episode|essay|event|guide|idea|insight|interview|lesson|link|node|note|paper|person|plan|placeholder|podcast|post|presentation|project|question|record|research|resource|skill|source|status|summary|talk|target|test node|thread|tool|transcript|tweet|update|video|website|workflow)\b/i;
-  const uncertaintyPatterns = /\b(likely|probably|possibly|appears to be|seems to be|unclear|uncertain)\b/i;
-  if (weakPatterns.test(text)) {
-    return 'Description is too vague. State exactly what this is and why it matters.';
-  }
-  if (!explicitEntityPatterns.test(text) && !uncertaintyPatterns.test(text)) {
-    return 'Description must explicitly identify what this thing is, or state uncertainty explicitly.';
-  }
-  return null;
-}
-
 // FTS5 helpers
 function sanitizeFtsQuery(input) {
   return input
@@ -319,7 +314,7 @@ async function main() {
     'getContext',
     {
       title: 'Get RA-H context',
-      description: 'Get knowledge graph overview: stats, hub nodes (most connected), dimensions, recent activity, and available skills. Call this first to orient yourself. For deeper operating policy, follow up with readSkill("db-operations").',
+      description: 'Get knowledge graph overview: stats, contexts, hub nodes (secondary diagnostics), dimensions, recent activity, and available skills. Call this first to orient yourself. For deeper operating policy, follow up with readSkill("db-operations").',
       inputSchema: {}
     },
     async () => {
@@ -340,7 +335,7 @@ async function main() {
         };
       }
 
-      const summary = `Graph: ${context.stats.nodeCount} nodes, ${context.stats.edgeCount} edges, ${context.stats.dimensionCount} dimensions, ${skills.length} skills.`;
+      const summary = `Graph: ${context.stats.contextCount || 0} contexts, ${context.stats.nodeCount} nodes, ${context.stats.edgeCount} edges, ${context.stats.dimensionCount} dimensions, ${skills.length} skills.`;
       return {
         content: [{ type: 'text', text: summary }],
         structuredContent: context
@@ -354,24 +349,28 @@ async function main() {
     'createNode',
     {
       title: 'Add RA-H node',
-      description: 'Create a new node. Always search first (queryNodes) to avoid duplicates. Title: max 160 chars, clear and descriptive. Description is REQUIRED and must be explicit about what the thing is and why it matters for contextual grounding. Use "link" ONLY for external content (URL, video, article) — omit for synthesis/ideas derived from existing nodes. "source" = verbatim or canonical content for embedding. Legacy "content" and "chunk" are mapped to source for compatibility. Assign 1-5 existing dimensions — call queryDimensions first to use existing ones. Do not invent new dimensions.',
+      description: 'Create a new node. Always search first (queryNodes) to avoid duplicates. Set context explicitly when clear; otherwise RA-H will infer the best-fit context automatically on create. Title: max 160 chars, clear and descriptive. Description is REQUIRED and should be natural prose that makes clear what the thing is, why it belongs in the graph, and workflow status. Use "link" ONLY for external content (URL, video, article) — omit for synthesis/ideas derived from existing nodes. "source" = verbatim or canonical content for embedding. Legacy "content" and "chunk" are mapped to source for compatibility. Assign 1-5 dimensions — call queryDimensions first to use existing ones.',
       inputSchema: addNodeInputSchema
     },
-    async ({ title, content, source, link, description, dimensions, metadata, chunk }) => {
+    async ({ title, content, source, link, description, context_id, context_name, dimensions, metadata, chunk }) => {
       const normalizedDimensions = sanitizeDimensions(dimensions);
       if (normalizedDimensions.length === 0) {
         throw new Error('At least one dimension is required.');
       }
-      const descriptionError = validateExplicitDescription(description);
-      if (descriptionError) {
-        throw new Error(descriptionError);
+      let resolvedContextId;
+      try {
+        resolvedContextId = contextService.resolveContextId({ context_id, context_name });
+      } catch (error) {
+        log('Warning: invalid explicit context input on createNode; falling back to automatic inference:', error.message);
+        resolvedContextId = undefined;
       }
 
       const node = nodeService.createNode({
         title: title.trim(),
         source: source?.trim() || chunk?.trim() || content?.trim(),
         link: link?.trim(),
-        description: description?.trim(),
+        description: typeof description === 'string' ? description.trim() : description,
+        context_id: resolvedContextId,
         dimensions: normalizedDimensions,
         metadata: metadata || {}
       });
@@ -397,12 +396,41 @@ async function main() {
       description: 'Search nodes by keyword across title, description, and source fields. Multi-word queries find nodes containing all words (not exact phrases). Returns up to 25 results (default 10). Call before creating nodes to check for duplicates. Optionally filter by dimensions. NOT for searching source documents (transcripts, articles) — use searchContentEmbeddings for that.',
       inputSchema: searchNodesInputSchema
     },
-    async ({ query: searchQuery, limit = 10, dimensions, created_after, created_before, event_after, event_before }) => {
+    async ({ query: searchQuery, limit = 10, contextId, dimensions, created_after, created_before, event_after, event_before }) => {
       const normalizedDimensions = sanitizeDimensions(dimensions || []);
       const safeLimit = Math.min(Math.max(limit, 1), 25);
       const trimmedQuery = searchQuery.trim();
       const fts = checkFtsAvailability();
 
+      if (contextId) {
+        const nodes = nodeService.getNodes({
+          search: trimmedQuery,
+          limit: safeLimit,
+          contextId,
+          dimensions: normalizedDimensions,
+        });
+
+        const summary = nodes.length === 0
+          ? 'No matching RA-H nodes found in that context.'
+          : `Found ${nodes.length} node(s) in that context.`;
+
+        return {
+          content: [{ type: 'text', text: summary }],
+          structuredContent: {
+            count: nodes.length,
+            nodes: nodes.map((node) => ({
+              id: node.id,
+              title: node.title,
+              source: node.source ?? null,
+              description: node.description ?? null,
+              link: node.link ?? null,
+              dimensions: node.dimensions || [],
+              updated_at: node.updated_at,
+            })),
+          },
+        };
+      }
+
       // Build temporal filter clauses
       const temporalClauses = [];
       const temporalParams = [];
@@ -596,21 +624,13 @@ async function main() {
     'updateNode',
     {
       title: 'Update RA-H node',
-      description: 'Update an existing node. Description is REQUIRED on every update and must explicitly state WHAT this thing is + WHY it matters for contextual grounding. Source content lives in "source". Legacy "content" and "chunk" are mapped to source for compatibility. Dimensions are REPLACED entirely with the new array. Title, description, and link are overwritten. Call getNodesById first to verify current state before updating.',
+      description: 'Update an existing node. Description is REQUIRED on every update and should be natural prose that makes clear what this thing is, why it belongs in the graph, and workflow status. Source content lives in "source". Legacy "content" and "chunk" are mapped to source for compatibility. Dimensions are REPLACED entirely with the new array. Title, description, and link are overwritten. Call getNodesById first to verify current state before updating.',
       inputSchema: updateNodeInputSchema
     },
     async ({ id, updates }) => {
       if (!updates || Object.keys(updates).length === 0) {
         throw new Error('At least one field must be provided in updates.');
       }
-      if (!updates.description) {
-        throw new Error('Every node update requires an explicit description (WHAT this is + WHY it matters).');
-      }
-      const descriptionError = validateExplicitDescription(updates.description);
-      if (descriptionError) {
-        throw new Error(descriptionError);
-      }
-
       // Map MCP legacy fields to canonical source
       const mappedUpdates = { ...updates };
       if (mappedUpdates.content !== undefined) {
@@ -621,6 +641,11 @@ async function main() {
       }
       delete mappedUpdates.content;
       delete mappedUpdates.chunk;
+      if (Object.prototype.hasOwnProperty.call(mappedUpdates, 'description')) {
+        mappedUpdates.description = typeof mappedUpdates.description === 'string'
+          ? mappedUpdates.description.trim()
+          : mappedUpdates.description;
+      }
 
       const node = nodeService.updateNode(id, mappedUpdates);
 
@@ -735,6 +760,55 @@ async function main() {
     }
   );
 
+  registerToolWithAliases(
+    'queryContexts',
+    {
+      title: 'Query RA-H contexts',
+      description: 'List contexts, inspect a specific context, or search contexts by name/description.',
+      inputSchema: queryContextsInputSchema
+    },
+    async ({ contextId, name, search, limit = 50, includeNodes = false }) => {
+      const normalizedName = typeof name === 'string' ? name.trim().toLowerCase() : '';
+      let contexts = [];
+
+      if (contextId) {
+        const context = contextService.getContextById(contextId);
+        if (context) {
+          contexts = [context];
+        }
+      } else if (normalizedName) {
+        const context = contextService.getContextByName(normalizedName);
+        if (context) {
+          contexts = [context];
+        }
+      } else {
+        const all = contextService.listContexts();
+        contexts = all.filter((context) => {
+          if (search) {
+            const haystack = `${context.name || ''} ${context.description || ''}`.toLowerCase();
+            return haystack.includes(search.trim().toLowerCase());
+          }
+          return true;
+        }).slice(0, Math.min(Math.max(limit, 1), 100));
+      }
+
+      const includeContextNodes = includeNodes && contexts.length === 1 && (contextId || normalizedName);
+      const enriched = contexts.map((context) => {
+        if (!includeContextNodes) return context;
+        const nodes = nodeService.getNodes({ contextId: context.id, limit: 500 });
+        return { ...context, nodes };
+      });
+
+      return {
+        content: [{ type: 'text', text: enriched.length === 0 ? 'No matching contexts found.' : `Found ${enriched.length} context(s).` }],
+        structuredContent: {
+          count: enriched.length,
+          contexts: enriched
+        }
+      };
+    }
+  );
+
   registerToolWithAliases(
     'createDimension',
     {
diff --git a/apps/mcp-server-standalone/package-lock.json b/apps/mcp-server-standalone/package-lock.json
index cd460c4..539ad59 100644
--- a/apps/mcp-server-standalone/package-lock.json
+++ b/apps/mcp-server-standalone/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@ra-h/mcp-server",
-  "version": "1.8.0",
+  "version": "1.10.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@ra-h/mcp-server",
-      "version": "1.8.0",
+      "version": "1.10.1",
       "license": "MIT",
       "dependencies": {
         "@modelcontextprotocol/sdk": "^1.0.0",
diff --git a/apps/mcp-server-standalone/package.json b/apps/mcp-server-standalone/package.json
index cfae7af..0bd5c3f 100644
--- a/apps/mcp-server-standalone/package.json
+++ b/apps/mcp-server-standalone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ra-h-mcp-server",
-  "version": "1.8.0",
+  "version": "1.10.1",
   "description": "Connect Claude Code/Desktop to your RA-H knowledge base. Direct SQLite access - no web app required.",
   "main": "index.js",
   "bin": {
diff --git a/apps/mcp-server-standalone/services/contextService.js b/apps/mcp-server-standalone/services/contextService.js
new file mode 100644
index 0000000..575ebc1
--- /dev/null
+++ b/apps/mcp-server-standalone/services/contextService.js
@@ -0,0 +1,135 @@
+'use strict';
+
+const { getDb } = require('./sqlite-client');
+
+function mapContext(row) {
+  if (!row) return null;
+  return {
+    id: row.id,
+    name: row.name,
+    description: row.description ?? null,
+    icon: row.icon ?? null,
+    count: Number(row.count ?? 0),
+  };
+}
+
+function listContexts() {
+  const db = getDb();
+  const rows = db.prepare(`
+    SELECT c.id, c.name, c.description, c.icon, COUNT(n.id) AS count
+    FROM contexts c
+    LEFT JOIN nodes n ON n.context_id = c.id
+    GROUP BY c.id
+    ORDER BY c.name COLLATE NOCASE ASC
+  `).all();
+  return rows.map(mapContext);
+}
+
+function getContextById(id) {
+  const db = getDb();
+  const row = db.prepare(`
+    SELECT c.id, c.name, c.description, c.icon, COUNT(n.id) AS count
+    FROM contexts c
+    LEFT JOIN nodes n ON n.context_id = c.id
+    WHERE c.id = ?
+    GROUP BY c.id
+  `).get(id);
+  return mapContext(row);
+}
+
+function getContextByName(name) {
+  const trimmed = typeof name === 'string' ? name.trim() : '';
+  if (!trimmed) return null;
+  const db = getDb();
+  const row = db.prepare(`
+    SELECT c.id, c.name, c.description, c.icon, COUNT(n.id) AS count
+    FROM contexts c
+    LEFT JOIN nodes n ON n.context_id = c.id
+    WHERE lower(c.name) = lower(?)
+    GROUP BY c.id
+  `).get(trimmed);
+  return mapContext(row);
+}
+
+function createContext({ name, description = null, icon = null }) {
+  const db = getDb();
+  const trimmedName = typeof name === 'string' ? name.trim() : '';
+  if (!trimmedName) {
+    throw new Error('Context name is required.');
+  }
+
+  const now = new Date().toISOString();
+  const info = db.prepare(`
+    INSERT INTO contexts (name, description, icon, created_at, updated_at)
+    VALUES (?, ?, ?, ?, ?)
+  `).run(trimmedName, description ?? null, icon ?? null, now, now);
+
+  return getContextById(Number(info.lastInsertRowid));
+}
+
+function updateContext({ id, name, description, icon }) {
+  const db = getDb();
+  const existing = getContextById(id);
+  if (!existing) {
+    throw new Error(`Context ${id} not found.`);
+  }
+
+  const nextName = typeof name === 'string' && name.trim() ? name.trim() : existing.name;
+  const nextDescription = description === undefined ? existing.description : description;
+  const nextIcon = icon === undefined ? existing.icon : icon;
+  const now = new Date().toISOString();
+
+  db.prepare(`
+    UPDATE contexts
+    SET name = ?, description = ?, icon = ?, updated_at = ?
+    WHERE id = ?
+  `).run(nextName, nextDescription ?? null, nextIcon ?? null, now, id);
+
+  return getContextById(id);
+}
+
+function resolveContextId(input = {}) {
+  const hasContextId = Object.prototype.hasOwnProperty.call(input, 'context_id');
+  const hasContextName = typeof input.context_name === 'string' && input.context_name.trim().length > 0;
+
+  if (!hasContextId && !hasContextName) {
+    return undefined;
+  }
+
+  if (hasContextId && input.context_id === null) {
+    if (hasContextName) {
+      throw new Error('context_name cannot be combined with context_id: null.');
+    }
+    return null;
+  }
+
+  let resolvedById = null;
+  if (hasContextId) {
+    resolvedById = getContextById(input.context_id);
+    if (!resolvedById) {
+      throw new Error(`Context ${input.context_id} not found.`);
+    }
+  }
+
+  if (!hasContextName) {
+    return resolvedById ? resolvedById.id : undefined;
+  }
+
+  const byName = getContextByName(input.context_name);
+  if (!byName) {
+    throw new Error(`Context "${input.context_name}" not found.`);
+  }
+  if (resolvedById && resolvedById.id !== byName.id) {
+    throw new Error('context_id and context_name refer to different contexts.');
+  }
+  return byName.id;
+}
+
+module.exports = {
+  listContexts,
+  getContextById,
+  getContextByName,
+  createContext,
+  updateContext,
+  resolveContextId,
+};
diff --git a/apps/mcp-server-standalone/services/nodeService.js b/apps/mcp-server-standalone/services/nodeService.js
index ac4ddb7..800b968 100644
--- a/apps/mcp-server-standalone/services/nodeService.js
+++ b/apps/mcp-server-standalone/services/nodeService.js
@@ -1,47 +1,83 @@
 'use strict';
 
 const { query, transaction, getDb } = require('./sqlite-client');
+const contextService = require('./contextService');
 
-function normalizeDimensionName(value) {
-  return String(value || '').trim().replace(/\s+/g, ' ');
-}
-
-function getUnknownDimensions(dimensions) {
-  if (!Array.isArray(dimensions) || dimensions.length === 0) return [];
-
-  const normalized = dimensions
-    .map(normalizeDimensionName)
-    .filter(Boolean);
-
-  if (normalized.length === 0) return [];
-
-  const placeholders = normalized.map(() => '?').join(', ');
-  const rows = query(`SELECT name FROM dimensions WHERE name IN (${placeholders})`, normalized);
-  const existing = new Set(rows.map(row => normalizeDimensionName(row.name)));
-
-  return normalized.filter(value => !existing.has(value));
-}
-
-function formatUnknownDimensionsError(values) {
-  if (values.length === 1) {
-    return `Unknown dimension: "${values[0]}". Create it first or use an existing dimension.`;
+function parseMetadata(metadata) {
+  if (!metadata) return {};
+  if (typeof metadata === 'string') {
+    try {
+      const parsed = JSON.parse(metadata);
+      return parsed && typeof parsed === 'object' && !Array.isArray(parsed) ? { ...parsed } : {};
+    } catch {
+      return {};
+    }
   }
+  return metadata && typeof metadata === 'object' && !Array.isArray(metadata) ? { ...metadata } : {};
+}
 
-  return `Unknown dimensions: ${values.map(value => `"${value}"`).join(', ')}. Create them first or use existing dimensions.`;
+function normalizeString(value) {
+  if (typeof value !== 'string') return undefined;
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : undefined;
+}
+
+function buildCanonicalMetadata({ existing, metadata }) {
+  const prior = parseMetadata(existing);
+  const incoming = parseMetadata(metadata);
+  const sourceMetadata = {
+    ...(prior.source_metadata && typeof prior.source_metadata === 'object' ? prior.source_metadata : {}),
+    ...(incoming.source_metadata && typeof incoming.source_metadata === 'object' ? incoming.source_metadata : {}),
+  };
+
+  const merged = {
+    ...prior,
+    ...incoming,
+    state: incoming.state === 'processed' ? 'processed' : (prior.state === 'processed' ? 'processed' : 'not_processed'),
+    captured_by: incoming.captured_by || prior.captured_by || 'human',
+    source_metadata: sourceMetadata,
+  };
+
+  const type = normalizeString(incoming.type) || normalizeString(prior.type);
+  const capturedMethod = normalizeString(incoming.captured_method) || normalizeString(prior.captured_method);
+
+  if (type) merged.type = type;
+  else delete merged.type;
+
+  if (capturedMethod) merged.captured_method = capturedMethod;
+  else delete merged.captured_method;
+
+  return merged;
+}
+
+function mapNodeRow(row) {
+  return {
+    ...row,
+    dimensions: JSON.parse(row.dimensions_json || '[]'),
+    metadata: row.metadata ? (typeof row.metadata === 'string' ? JSON.parse(row.metadata) : row.metadata) : null,
+    context: row.context_json ? JSON.parse(row.context_json) : null,
+    dimensions_json: undefined,
+    context_json: undefined,
+  };
 }
 
 /**
  * Get nodes with optional filtering.
  */
 function getNodes(filters = {}) {
-  const { dimensions, search, limit = 100, offset = 0 } = filters;
+  const { dimensions, search, limit = 100, offset = 0, contextId } = filters;
 
   let sql = `
     SELECT n.id, n.title, n.description, n.source, n.link, n.event_date, n.metadata,
-           n.created_at, n.updated_at,
+           n.created_at, n.updated_at, n.context_id,
            COALESCE((SELECT JSON_GROUP_ARRAY(d.dimension)
-                     FROM node_dimensions d WHERE d.node_id = n.id), '[]') as dimensions_json
+                     FROM node_dimensions d WHERE d.node_id = n.id), '[]') as dimensions_json,
+           CASE
+             WHEN c.id IS NULL THEN NULL
+             ELSE json_object('id', c.id, 'name', c.name, 'description', c.description, 'icon', c.icon)
+           END as context_json
     FROM nodes n
+    LEFT JOIN contexts c ON c.id = n.context_id
     WHERE 1=1
   `;
   const params = [];
@@ -61,6 +97,10 @@ function getNodes(filters = {}) {
     sql += ` AND (n.title LIKE ? COLLATE NOCASE OR n.description LIKE ? COLLATE NOCASE OR n.source LIKE ? COLLATE NOCASE)`;
     params.push(`%${search}%`, `%${search}%`, `%${search}%`);
   }
+  if (contextId !== undefined) {
+    sql += ' AND n.context_id = ?';
+    params.push(contextId);
+  }
 
   // Sort by search relevance or updated_at
   if (search) {
@@ -85,12 +125,7 @@ function getNodes(filters = {}) {
 
   const rows = query(sql, params);
 
-  return rows.map(row => ({
-    ...row,
-    dimensions: JSON.parse(row.dimensions_json || '[]'),
-    metadata: row.metadata ? (typeof row.metadata === 'string' ? JSON.parse(row.metadata) : row.metadata) : null,
-    dimensions_json: undefined
-  }));
+  return rows.map(mapNodeRow);
 }
 
 /**
@@ -99,10 +134,15 @@ function getNodes(filters = {}) {
 function getNodeById(id) {
   const sql = `
     SELECT n.id, n.title, n.description, n.source, n.link, n.event_date, n.metadata,
-           n.created_at, n.updated_at,
+           n.created_at, n.updated_at, n.context_id,
            COALESCE((SELECT JSON_GROUP_ARRAY(d.dimension)
-                     FROM node_dimensions d WHERE d.node_id = n.id), '[]') as dimensions_json
+                     FROM node_dimensions d WHERE d.node_id = n.id), '[]') as dimensions_json,
+           CASE
+             WHEN c.id IS NULL THEN NULL
+             ELSE json_object('id', c.id, 'name', c.name, 'description', c.description, 'icon', c.icon)
+           END as context_json
     FROM nodes n
+    LEFT JOIN contexts c ON c.id = n.context_id
     WHERE n.id = ?
   `;
 
@@ -110,12 +150,7 @@ function getNodeById(id) {
   if (rows.length === 0) return null;
 
   const row = rows[0];
-  return {
-    ...row,
-    dimensions: JSON.parse(row.dimensions_json || '[]'),
-    metadata: row.metadata ? (typeof row.metadata === 'string' ? JSON.parse(row.metadata) : row.metadata) : null,
-    dimensions_json: undefined
-  };
+  return mapNodeRow(row);
 }
 
 /**
@@ -129,6 +164,134 @@ function sanitizeTitle(title) {
   return clean.slice(0, 160);
 }
 
+const STOP_WORDS = new Set([
+  'a', 'an', 'and', 'are', 'as', 'at', 'be', 'by', 'for', 'from', 'has', 'i',
+  'in', 'is', 'it', 'its', 'of', 'on', 'or', 'that', 'the', 'their', 'this',
+  'to', 'was', 'with', 'you', 'your'
+]);
+
+function normalizeText(value) {
+  if (typeof value !== 'string') return '';
+  return value.toLowerCase().replace(/[^a-z0-9\s]+/g, ' ').replace(/\s+/g, ' ').trim();
+}
+
+function tokenize(value) {
+  return normalizeText(value)
+    .split(' ')
+    .map((token) => token.trim())
+    .filter((token) => token.length >= 2 && !STOP_WORDS.has(token));
+}
+
+function uniqueTokens(values) {
+  return [...new Set(values.flatMap((value) => tokenize(value || '')))];
+}
+
+function safeStringify(value) {
+  try {
+    return JSON.stringify(value ?? {});
+  } catch {
+    return '';
+  }
+}
+
+function fetchContextCandidates() {
+  return query(`
+    WITH context_counts AS (
+      SELECT c.id, c.name, c.description, COUNT(n.id) AS count
+      FROM contexts c
+      LEFT JOIN nodes n ON n.context_id = c.id
+      GROUP BY c.id
+    ),
+    ranked_anchors AS (
+      SELECT
+        c.id AS context_id,
+        n.title AS anchor_title,
+        n.description AS anchor_description,
+        ROW_NUMBER() OVER (
+          PARTITION BY c.id
+          ORDER BY COUNT(e.id) DESC, n.updated_at DESC, n.id ASC
+        ) AS anchor_rank
+      FROM contexts c
+      LEFT JOIN nodes n ON n.context_id = c.id
+      LEFT JOIN edges e ON (e.from_node_id = n.id OR e.to_node_id = n.id)
+      GROUP BY c.id, n.id
+    )
+    SELECT
+      cc.id,
+      cc.name,
+      cc.description,
+      cc.count,
+      ra.anchor_title,
+      ra.anchor_description
+    FROM context_counts cc
+    LEFT JOIN ranked_anchors ra
+      ON ra.context_id = cc.id
+     AND ra.anchor_rank = 1
+    ORDER BY cc.name COLLATE NOCASE ASC
+  `).map((row) => ({
+    id: Number(row.id),
+    name: row.name,
+    description: row.description ?? null,
+    count: Number(row.count ?? 0),
+    anchor_title: row.anchor_title ?? null,
+    anchor_description: row.anchor_description ?? null,
+  }));
+}
+
+function scoreContextCandidate(candidate, input) {
+  const titleText = normalizeText(input.title || '');
+  const descriptionText = normalizeText(input.description || '');
+  const sourceText = normalizeText(String(input.source || '').slice(0, 4000));
+  const metadataText = normalizeText(safeStringify(input.metadata));
+  const dimensionTokens = uniqueTokens(input.dimensions || []);
+  const contextName = normalizeText(candidate.name);
+  const contextNameTokens = tokenize(candidate.name);
+  const contextDescriptorTokens = uniqueTokens([
+    candidate.description,
+    candidate.anchor_title,
+    candidate.anchor_description,
+  ]);
+
+  let score = 0;
+  if (contextName && (titleText.includes(contextName) || descriptionText.includes(contextName))) score += 80;
+  if (contextName && sourceText.includes(contextName)) score += 40;
+
+  for (const token of contextNameTokens) {
+    if (dimensionTokens.includes(token)) score += 30;
+    if (titleText.includes(token)) score += 16;
+    if (descriptionText.includes(token)) score += 12;
+    if (sourceText.includes(token)) score += 6;
+    if (metadataText.includes(token)) score += 4;
+  }
+
+  for (const token of contextDescriptorTokens) {
+    if (dimensionTokens.includes(token)) score += 8;
+    if (titleText.includes(token)) score += 4;
+    if (descriptionText.includes(token)) score += 3;
+    if (sourceText.includes(token)) score += 2;
+  }
+
+  return score;
+}
+
+function inferBestContextIdForNode(input) {
+  const contexts = fetchContextCandidates();
+  if (contexts.length === 0) return null;
+
+  const ranked = contexts
+    .map((context) => ({ context, score: scoreContextCandidate(context, input) }))
+    .sort((a, b) => b.score - a.score || (b.context.count - a.context.count) || a.context.id - b.context.id);
+
+  const best = ranked[0];
+  if (!best) return null;
+  if (best.score > 0) return best.context.id;
+
+  const research = contexts.find((context) => context.name.trim().toLowerCase() === 'research');
+  if (research) return research.id;
+
+  return best.context.id;
+}
+
 /**
  * Create a new node.
  */
@@ -140,26 +303,25 @@ function createNode(nodeData) {
     link,
     event_date,
     dimensions = [],
-    metadata = {}
+    metadata = {},
+    context_id
   } = nodeData;
 
   const title = sanitizeTitle(rawTitle);
-  const unknownDimensions = getUnknownDimensions(dimensions);
-  if (unknownDimensions.length > 0) {
-    throw new Error(formatUnknownDimensionsError(unknownDimensions));
-  }
 
+  const canonicalMetadata = buildCanonicalMetadata({ metadata });
   const now = new Date().toISOString();
   const db = getDb();
 
-  const sourceToStore = source && source.trim()
-    ? source
-    : [title, description].filter(Boolean).join('\n\n').trim() || null;
+  const sourceToStore = source ?? ([title, description].filter(Boolean).join('\n\n').trim() || null);
+  const effectiveContextId = context_id == null
+    ? inferBestContextIdForNode({ title, description, source: sourceToStore, dimensions, metadata: canonicalMetadata })
+    : context_id;
 
   const nodeId = transaction(() => {
     const stmt = db.prepare(`
-      INSERT INTO nodes (title, description, source, link, event_date, metadata, created_at, updated_at)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+      INSERT INTO nodes (title, description, source, link, event_date, metadata, context_id, created_at, updated_at)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
     `);
 
     const result = stmt.run(
@@ -168,7 +330,8 @@ function createNode(nodeData) {
       sourceToStore,
       link ?? null,
       event_date ?? null,
-      JSON.stringify(metadata),
+      JSON.stringify(canonicalMetadata),
+      effectiveContextId ?? null,
       now,
       now
     );
@@ -193,7 +356,6 @@ function createNode(nodeData) {
 
 /**
  * Update an existing node.
- * Source-first update path.
  */
 function updateNode(id, updates, options = {}) {
   const { title, description, source, link, event_date, dimensions, metadata } = updates;
@@ -206,12 +368,9 @@ function updateNode(id, updates, options = {}) {
     throw new Error(`Node with ID ${id} not found. Use rah_search_nodes to find nodes by keyword.`);
   }
 
-  if (Array.isArray(dimensions)) {
-    const unknownDimensions = getUnknownDimensions(dimensions);
-    if (unknownDimensions.length > 0) {
-      throw new Error(formatUnknownDimensionsError(unknownDimensions));
-    }
-  }
+  const mergedMetadata = metadata !== undefined
+    ? buildCanonicalMetadata({ existing: existing.metadata, metadata })
+    : undefined;
 
   transaction(() => {
     const setFields = [];
@@ -237,9 +396,13 @@ function updateNode(id, updates, options = {}) {
       setFields.push('event_date = ?');
       params.push(event_date);
     }
-    if (metadata !== undefined) {
+    if (Object.prototype.hasOwnProperty.call(updates, 'context_id')) {
+      setFields.push('context_id = ?');
+      params.push(updates.context_id ?? null);
+    }
+    if (mergedMetadata !== undefined) {
       setFields.push('metadata = ?');
-      params.push(JSON.stringify(metadata));
+      params.push(JSON.stringify(mergedMetadata));
     }
 
     // Always update timestamp
@@ -286,7 +449,7 @@ function getNodeCount() {
 
 /**
  * Get knowledge graph context overview.
- * Returns stats, hub nodes, dimensions, and recent activity.
+ * Returns stats, contexts, hub nodes, dimensions, and recent activity.
  */
 function getContext() {
   const nodeCount = query('SELECT COUNT(*) as count FROM nodes')[0].count;
@@ -315,7 +478,8 @@ function getContext() {
   `);
 
   return {
-    stats: { nodeCount, edgeCount, dimensionCount: dimensions.length },
+    stats: { nodeCount, edgeCount, dimensionCount: dimensions.length, contextCount: contextService.listContexts().length },
+    contexts: contextService.listContexts(),
     dimensions,
     recentNodes,
     hubNodes
diff --git a/apps/mcp-server-standalone/services/skillService.js b/apps/mcp-server-standalone/services/skillService.js
index 4f06e5a..dd34ff2 100644
--- a/apps/mcp-server-standalone/services/skillService.js
+++ b/apps/mcp-server-standalone/services/skillService.js
@@ -26,6 +26,7 @@ const SEEDED_SKILL_IDS = new Set([
   'persona',
   'calibration',
   'connect',
+  'node-context-enrichment',
 ]);
 
 const DEPRECATED_SKILL_IDS = new Set([
diff --git a/apps/mcp-server-standalone/services/sqlite-client.js b/apps/mcp-server-standalone/services/sqlite-client.js
index 3668d32..ea04056 100644
--- a/apps/mcp-server-standalone/services/sqlite-client.js
+++ b/apps/mcp-server-standalone/services/sqlite-client.js
@@ -59,7 +59,9 @@ function initDatabase() {
         embedding BLOB,
         embedding_updated_at TEXT,
         embedding_text TEXT,
-        chunk_status TEXT DEFAULT 'not_chunked'
+        chunk_status TEXT DEFAULT 'not_chunked',
+        context_id INTEGER,
+        FOREIGN KEY (context_id) REFERENCES contexts(id) ON DELETE SET NULL
       );
 
       CREATE TABLE IF NOT EXISTS edges (
@@ -93,6 +95,15 @@ function initDatabase() {
         updated_at TEXT DEFAULT CURRENT_TIMESTAMP
       );
 
+      CREATE TABLE IF NOT EXISTS contexts (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        name TEXT NOT NULL,
+        description TEXT NOT NULL DEFAULT '',
+        icon TEXT,
+        created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
+      );
+
       -- Seed default dimensions
       INSERT OR IGNORE INTO dimensions (name, is_priority) VALUES ('research', 1);
       INSERT OR IGNORE INTO dimensions (name, is_priority) VALUES ('ideas', 1);
@@ -143,6 +154,42 @@ function initDatabase() {
         AND LENGTH(TRIM(chunk)) > 0;
     `);
   }
+  if (!nodeCols.includes('context_id')) {
+    db.exec('ALTER TABLE nodes ADD COLUMN context_id INTEGER REFERENCES contexts(id) ON DELETE SET NULL;');
+  }
+
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS contexts (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      name TEXT NOT NULL,
+      description TEXT NOT NULL DEFAULT '',
+      icon TEXT,
+      created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+      updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
+    );
+  `);
+
+  const contextCols = db.prepare('PRAGMA table_info(contexts)').all().map(c => c.name);
+  if (!contextCols.includes('description')) {
+    db.exec("ALTER TABLE contexts ADD COLUMN description TEXT NOT NULL DEFAULT '';");
+  }
+  if (!contextCols.includes('icon')) {
+    db.exec('ALTER TABLE contexts ADD COLUMN icon TEXT;');
+  }
+  if (!contextCols.includes('created_at')) {
+    db.exec("ALTER TABLE contexts ADD COLUMN created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP;");
+  }
+  if (!contextCols.includes('updated_at')) {
+    db.exec("ALTER TABLE contexts ADD COLUMN updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP;");
+  }
+  db.exec(`
+    UPDATE contexts
+    SET description = COALESCE(NULLIF(TRIM(description), ''), name)
+    WHERE description IS NULL OR LENGTH(TRIM(description)) = 0;
+    CREATE UNIQUE INDEX IF NOT EXISTS idx_contexts_name_normalized
+      ON contexts(LOWER(TRIM(name)));
+    CREATE INDEX IF NOT EXISTS idx_nodes_context_id ON nodes(context_id);
+  `);
 
   const edgeCols = db.prepare('PRAGMA table_info(edges)').all().map(c => c.name);
   if (!edgeCols.includes('explanation')) {
diff --git a/apps/mcp-server-standalone/skills/audit.md b/apps/mcp-server-standalone/skills/audit.md
index e257704..3b6d2c5 100644
--- a/apps/mcp-server-standalone/skills/audit.md
+++ b/apps/mcp-server-standalone/skills/audit.md
@@ -1,9 +1,6 @@
 ---
 name: Audit
-description: "Run a structured audit of graph quality, skill quality, and operational consistency."
-when_to_use: "User asks for review, QA, cleanup, or governance checks."
-when_not_to_use: "Simple one-off write/read requests."
-success_criteria: "Findings are prioritized, concrete, and tied to actionable fixes."
+description: "Use for structured review, QA, cleanup, or governance checks across graph quality, skill quality, and operational consistency."
 ---
 
 # Audit
@@ -27,3 +24,5 @@ success_criteria: "Findings are prioritized, concrete, and tied to actionable fi
 - Prefer specific evidence over generic commentary.
 - Propose the smallest high-leverage fixes first.
 - Separate defects from optional polish.
+- Node descriptions must read like natural prose while still making what / why / status clear.
+- Flag any node description missing a clear why or status component as a high-priority quality issue.
diff --git a/apps/mcp-server-standalone/skills/calibration.md b/apps/mcp-server-standalone/skills/calibration.md
index b39e12c..1691127 100644
--- a/apps/mcp-server-standalone/skills/calibration.md
+++ b/apps/mcp-server-standalone/skills/calibration.md
@@ -3,7 +3,7 @@ name: Calibration
 description: "Run periodic check-ins to recalibrate goals, projects, preferences, and graph structure."
 when_to_use: "User asks for a check-in, reset, review, or strategic recalibration."
 when_not_to_use: "Single isolated question with no strategic update needed."
-success_criteria: "Graph reflects current reality: updated hubs, changed priorities, and explicit deltas."
+success_criteria: "Graph reflects current reality: updated contexts, changed priorities, and explicit deltas."
 ---
 
 # Calibration
@@ -14,7 +14,7 @@ Re-anchor the graph to the user's current state.
 
 ## Check-in Sequence
 
-1. Review major hub nodes and active project nodes.
+1. Review major contexts, anchor nodes, and active project nodes.
 2. Ask what changed: goals, priorities, constraints, beliefs, preferences.
 3. Identify stale nodes and missing nodes.
 4. Propose precise updates: update existing vs create new.
diff --git a/apps/mcp-server-standalone/skills/db-operations.md b/apps/mcp-server-standalone/skills/db-operations.md
index 24c265e..91185e3 100644
--- a/apps/mcp-server-standalone/skills/db-operations.md
+++ b/apps/mcp-server-standalone/skills/db-operations.md
@@ -1,9 +1,6 @@
 ---
 name: DB Operations
 description: "Use this for all graph read/write operations with strict data quality standards."
-when_to_use: "Any request to read, create, update, connect, classify, or traverse graph data."
-when_not_to_use: "Pure conversation with no graph interaction needed."
-success_criteria: "Writes are explicit and correct; descriptions are concrete; edges and dimensions are high-signal."
 ---
 
 # DB Operations
@@ -11,7 +8,7 @@ success_criteria: "Writes are explicit and correct; descriptions are concrete; e
 ## Core Rules
 
 1. Search before create to avoid duplicates.
-2. Every create/update must include an explicit description of WHAT the thing is and WHY it matters.
+2. Every create/update should aim for a natural description that makes clear what the thing is and any surrounding context available, but description quality is guidance only. RA-H should never block or rewrite a write because of description quality.
 3. Use event dates when known (when it happened, not when saved).
 4. Apply dimensions deliberately; prefer existing dimensions over creating noisy new ones.
 5. Create edges when relationships are meaningful; edge explanations should read as a sentence.
@@ -19,9 +16,10 @@ success_criteria: "Writes are explicit and correct; descriptions are concrete; e
 ## Write Quality Contract
 
 - `title`: clear and specific.
-- `description`: concrete object-level description, not vague summaries.
-- `notes/content`: extra context, analysis, supporting detail.
+- `description`: natural prose, not labels. It should still make what / why / status clear when possible.
+- `source`: full verbatim or canonical content of the node (transcript, article text, book passage, user's thoughts). This is what gets chunked and embedded for semantic search. For user-authored ideas or dictated notes, preserve the user's original wording with minimal cleanup.
 - `link`: external source URL only.
+- `metadata`: prefer canonical keys `type`, `state`, `captured_method`, `captured_by`, and `source_metadata`.
 
 ## Execution Pattern
 
@@ -29,9 +27,11 @@ success_criteria: "Writes are explicit and correct; descriptions are concrete; e
 2. Decide: create vs update vs connect.
 3. Execute minimum required writes.
 4. Verify result reflects user intent exactly.
+5. If description framing was materially inferred, complete the write first and then invite one concise user feedback pass instead of blocking creation.
 
 ## Do Not
 
 - Create duplicate nodes when an update is correct.
 - Write vague descriptions ("discusses", "explores", "is about").
+- Replace a user's raw idea/source with a thin summary.
 - Create weak or directionless edges.
diff --git a/apps/mcp-server-standalone/skills/node-context-enrichment.md b/apps/mcp-server-standalone/skills/node-context-enrichment.md
new file mode 100644
index 0000000..1d330e6
--- /dev/null
+++ b/apps/mcp-server-standalone/skills/node-context-enrichment.md
@@ -0,0 +1,36 @@
+---
+name: Node Context Enrichment
+description: "Use to rewrite thin node descriptions into natural prose that still makes what, why, and status clear, with dimension review and edge suggestions."
+---
+
+# Node Context Enrichment
+
+Use this when a node already exists but its description is thin, generic, or missing personal context.
+
+This skill should not silently rewrite and move on when contextual framing is inferred. If the enrichment depends on interpretation, update the node and then explicitly invite the user to correct or refine the contextual framing.
+
+## Goal
+
+Replace weak descriptions with a single clean natural description that captures:
+
+1. What the artifact literally is
+2. Why it is in Brad's graph
+3. Status in Brad's workflow
+
+Also review whether the node needs dimension fixes or obvious edge suggestions.
+
+## Workflow
+
+1. Load the node and inspect title, description, source, link, metadata, dimensions, and nearby edges.
+2. Search for adjacent context before rewriting.
+3. Infer the best available "why" from that context.
+4. Rewrite the full description from scratch in natural prose. Do not append to the old text or use labels like WHAT:, WHY:, or STATUS:.
+5. Review dimensions.
+6. Suggest 1-3 high-signal edges when obvious.
+7. Update the node once the description is strong enough to be useful.
+8. After the update, tell the user what changed and ask whether they want to refine the important framing:
+   - what it is
+   - why it belongs in the graph
+   - status / current relevance / workflow position
+
+The user feedback pass is required whenever the enriched "why" or status was inferred rather than directly stated in the node/source.
diff --git a/apps/mcp-server-standalone/skills/onboarding.md b/apps/mcp-server-standalone/skills/onboarding.md
index 46aa0c3..8355152 100644
--- a/apps/mcp-server-standalone/skills/onboarding.md
+++ b/apps/mcp-server-standalone/skills/onboarding.md
@@ -3,7 +3,7 @@ name: Onboarding
 description: "Onboard a new user by mapping goals, projects, worldview, and preferences into a strong initial graph."
 when_to_use: "New user setup or major reset of account context."
 when_not_to_use: "User asks for a narrow tactical operation only."
-success_criteria: "User has an initial hub-node structure and clear next steps for graph growth."
+success_criteria: "User has an initial context structure, anchor candidates, and clear next steps for graph growth."
 ---
 
 # Onboarding
@@ -22,13 +22,14 @@ Understand the user deeply enough to bootstrap a useful externalized context gra
 
 ## Graph Bootstrap
 
-1. Propose 3-6 hub nodes with clear rationale.
-2. Propose starter dimensions that reflect real domains.
-3. Create initial edges between hubs and active projects.
-4. Confirm with user before writing.
+1. Propose 3-6 primary contexts with clear rationale.
+2. Identify one strong anchor candidate per context.
+3. Propose starter dimensions as secondary metadata and filters.
+4. Create initial edges between anchor nodes and active project nodes.
+5. Confirm with user before writing.
 
 ## Output
 
-- Initial hub map
+- Initial context map
 - Suggested first write actions
 - Suggested weekly maintenance rhythm
diff --git a/apps/mcp-server/server.js b/apps/mcp-server/server.js
index ac62e41..38e07df 100644
--- a/apps/mcp-server/server.js
+++ b/apps/mcp-server/server.js
@@ -44,8 +44,9 @@ let logger = (message) => console.log(`[mcp] ${message}`);
 
 const instructions = [
   'RA-H is a personal knowledge graph — local-first, vendor-neutral.',
-  'Core concepts: nodes (knowledge units), edges (connections with explanations), dimensions (categories).',
-  'Always call rah_get_context first to orient yourself — it returns hub nodes, dimensions, stats, and available guides.',
+  'Core concepts: contexts (primary scopes), nodes (knowledge units), edges (connections with explanations), and dimensions (secondary metadata and filters).',
+  'Always call rah_get_context first to orient yourself — it returns contexts, hub nodes, dimensions, stats, and available guides.',
+  'Use contexts as the primary scope layer. Use rah_query_contexts before assigning or filtering by context when needed.',
   'When assigning dimensions, use only existing dimensions returned by rah_get_context or rah_query_dimensions.',
   'Do not invent new dimensions from node titles, concepts, or phrasing.',
   'Only call rah_create_dimension when the user explicitly instructs you to create a new dimension.',
@@ -91,9 +92,11 @@ const addNodeInputSchema = {
   content: z.string().max(20000).optional(),
   source: z.string().max(50000).optional(),
   link: z.string().url().optional(),
-  description: z.string().max(2000).optional(),
+  description: z.string().max(500).optional().describe('Description of the node. Write it as natural prose, not labels or a checklist. It must still make clear what the artifact is, why it is in the graph (infer from conversation context; ask the user if needed), and its current workflow status. Max 500 characters. If the reason is unclear, say that naturally instead of inventing it. Never use filler phrases like "insightful for understanding" or "relevant to the user\'s work".'),
+  context_id: z.number().int().positive().nullable().optional(),
+  context_name: z.string().optional(),
   dimensions: z.array(z.string()).min(1).max(5),
-  metadata: z.record(z.any()).optional(),
+  metadata: z.record(z.any()).optional().describe('Optional metadata. Prefer canonical keys: type, state, captured_method, captured_by, source_metadata.'),
   chunk: z.string().max(50000).optional()
 };
 
@@ -107,7 +110,16 @@ const addNodeOutputSchema = {
 const searchNodesInputSchema = {
   query: z.string().min(1).max(400),
   limit: z.number().min(1).max(25).optional(),
-  dimensions: z.array(z.string()).max(5).optional()
+  dimensions: z.array(z.string()).max(5).optional(),
+  contextId: z.number().int().positive().optional()
+};
+
+const queryContextsInputSchema = {
+  contextId: z.number().int().positive().optional(),
+  name: z.string().optional(),
+  search: z.string().optional(),
+  limit: z.number().min(1).max(100).optional(),
+  includeNodes: z.boolean().optional()
 };
 
 const searchNodesOutputSchema = {
@@ -130,11 +142,13 @@ const updateNodeInputSchema = {
   id: z.number().int().positive().describe('The ID of the node to update'),
   updates: z.object({
     title: z.string().optional().describe('New title'),
-    description: z.string().optional().describe('New description (overwrites existing)'),
-    content: z.string().optional().describe('Content to APPEND (not replace)'),
+    description: z.string().max(500).optional().describe('Description of the node. Write it as natural prose, not labels or a checklist. It must still make clear what the artifact is, why it is in the graph (infer from conversation context; ask the user if needed), and its current workflow status. Max 500 characters. If the reason is unclear, say that naturally instead of inventing it. Never use filler phrases like "insightful for understanding" or "relevant to the user\'s work".'),
+    content: z.string().optional().describe('Legacy alias for source. Mapped to source for backward compatibility.'),
+    source: z.string().optional().describe('Canonical source text for embedding.'),
     link: z.string().optional().describe('New link'),
+    context_id: z.number().int().positive().nullable().optional().describe('Primary context ID. Omit to preserve existing context; use null to clear.'),
     dimensions: z.array(z.string()).optional().describe('New dimensions (replaces existing)'),
-    metadata: z.record(z.any()).optional().describe('New metadata (replaces existing)')
+    metadata: z.record(z.any()).optional().describe('Metadata patch. This now merges with existing metadata. Prefer canonical keys: type, state, captured_method, captured_by, source_metadata.')
   }).describe('Fields to update')
 };
 
@@ -269,8 +283,7 @@ const extractUrlInputSchema = {
 const extractUrlOutputSchema = {
   success: z.boolean(),
   title: z.string(),
-  content: z.string(),
-  chunk: z.string(),
+  source: z.string(),
   metadata: z.record(z.any())
 };
 
@@ -283,7 +296,7 @@ const extractYoutubeOutputSchema = {
   success: z.boolean(),
   title: z.string(),
   channel: z.string(),
-  transcript: z.string(),
+  source: z.string(),
   metadata: z.record(z.any())
 };
 
@@ -295,8 +308,7 @@ const extractPdfInputSchema = {
 const extractPdfOutputSchema = {
   success: z.boolean(),
   title: z.string(),
-  content: z.string(),
-  chunk: z.string(),
+  source: z.string(),
   metadata: z.record(z.any())
 };
 
@@ -349,11 +361,11 @@ mcpServer.registerTool(
   'rah_add_node',
   {
     title: 'Add RA-H node',
-    description: 'Create a new node in the local RA-H knowledge base.',
+    description: 'Create a new node in the local RA-H knowledge base. Set context explicitly when clear; otherwise RA-H will infer the best-fit context automatically on create. Use only existing dimensions; do not invent new ones.',
     inputSchema: addNodeInputSchema,
     outputSchema: addNodeOutputSchema
   },
-  async ({ title, content, source, link, description, dimensions, metadata, chunk }) => {
+  async ({ title, content, source, link, description, context_id, context_name, dimensions, metadata, chunk }) => {
     const normalizedDimensions = sanitizeDimensions(dimensions);
     if (normalizedDimensions.length === 0) {
       throw new McpError(
@@ -364,9 +376,11 @@ mcpServer.registerTool(
 
     const payload = {
       title: title.trim(),
-      source: source?.trim() || chunk?.trim() || content?.trim() || undefined,
+      source: source?.trim() || content?.trim() || chunk?.trim() || undefined,
       link: link?.trim() || undefined,
       description: description?.trim() || undefined,
+      context_id: context_id === null ? null : context_id,
+      context_name: context_name?.trim() || undefined,
       dimensions: normalizedDimensions,
       metadata: metadata || {}
     };
@@ -399,7 +413,7 @@ mcpServer.registerTool(
     inputSchema: searchNodesInputSchema,
     outputSchema: searchNodesOutputSchema
   },
-  async ({ query, limit = 10, dimensions }) => {
+  async ({ query, limit = 10, dimensions, contextId }) => {
     const params = new URLSearchParams();
     params.set('search', query.trim());
     params.set('limit', String(Math.min(Math.max(limit, 1), 25)));
@@ -408,6 +422,9 @@ mcpServer.registerTool(
     if (dimensionList.length > 0) {
       params.set('dimensions', dimensionList.join(','));
     }
+    if (contextId) {
+      params.set('contextId', String(contextId));
+    }
 
     const result = await callRaHApi(`/api/nodes?${params.toString()}`, {
       method: 'GET'
@@ -436,11 +453,59 @@ mcpServer.registerTool(
   }
 );
 
+mcpServer.registerTool(
+  'rah_query_contexts',
+  {
+    title: 'Query RA-H contexts',
+    description: 'List contexts, inspect a specific context, or search contexts by name/description.',
+    inputSchema: queryContextsInputSchema
+  },
+  async ({ contextId, name, search, limit = 50, includeNodes = false }) => {
+    const normalizedName = typeof name === 'string' ? name.trim().toLowerCase() : '';
+    let contexts = [];
+
+    if (contextId) {
+      const result = await callRaHApi(`/api/contexts/${contextId}`, { method: 'GET' });
+      if (result?.data) {
+        contexts = [result.data];
+      }
+    } else {
+      const result = await callRaHApi('/api/contexts', { method: 'GET' });
+      const all = Array.isArray(result.data) ? result.data : [];
+      contexts = all.filter((context) => {
+        if (normalizedName && context.name?.trim().toLowerCase() !== normalizedName) {
+          return false;
+        }
+        if (search) {
+          const haystack = `${context.name || ''} ${context.description || ''}`.toLowerCase();
+          return haystack.includes(search.trim().toLowerCase());
+        }
+        return true;
+      }).slice(0, Math.min(Math.max(limit, 1), 100));
+    }
+
+    const includeContextNodes = includeNodes && contexts.length === 1 && (contextId || normalizedName);
+    const enriched = await Promise.all(contexts.map(async (context) => {
+      if (!includeContextNodes) return context;
+      const nodeResult = await callRaHApi(`/api/contexts/${context.id}/nodes`, { method: 'GET' });
+      return { ...context, nodes: Array.isArray(nodeResult.data) ? nodeResult.data : [] };
+    }));
+
+    return {
+      content: [{ type: 'text', text: enriched.length === 0 ? 'No matching contexts found.' : `Found ${enriched.length} context(s).` }],
+      structuredContent: {
+        count: enriched.length,
+        contexts: enriched
+      }
+    };
+  }
+);
+
 mcpServer.registerTool(
   'rah_update_node',
   {
     title: 'Update RA-H node',
-    description: 'Update an existing node. Content is APPENDED (not replaced). Dimensions are replaced.',
+    description: 'Update an existing node. Dimensions must be existing canonical dimensions; do not invent new ones.',
     inputSchema: updateNodeInputSchema,
     outputSchema: updateNodeOutputSchema
   },
@@ -449,15 +514,15 @@ mcpServer.registerTool(
       throw new McpError(ErrorCode.InvalidParams, 'At least one field must be provided in updates.');
     }
 
-    // Map MCP legacy fields to canonical source
+    // Backward compatibility: map legacy content/chunk → source
     const mappedUpdates = { ...updates };
-    if (mappedUpdates.content !== undefined) {
-      mappedUpdates.source = mappedUpdates.content;
-    }
     if (mappedUpdates.chunk !== undefined && mappedUpdates.source === undefined) {
       mappedUpdates.source = mappedUpdates.chunk;
     }
-    delete mappedUpdates.content;
+    if (mappedUpdates.content !== undefined) {
+      mappedUpdates.source = mappedUpdates.content;
+      delete mappedUpdates.content;
+    }
     delete mappedUpdates.chunk;
 
     const result = await callRaHApi(`/api/nodes/${id}`, {
@@ -622,7 +687,7 @@ mcpServer.registerTool(
   'rah_create_dimension',
   {
     title: 'Create RA-H dimension',
-    description: 'Create a new dimension/tag for organizing nodes.',
+    description: 'Create a new dimension/tag for organizing nodes only when the user explicitly instructs you to do so.',
     inputSchema: createDimensionInputSchema,
     outputSchema: createDimensionOutputSchema
   },
@@ -760,8 +825,7 @@ mcpServer.registerTool(
       structuredContent: {
         success: true,
         title: result.title || 'Untitled',
-        content: result.content || '',
-        chunk: result.chunk || '',
+        source: result.source || '',
         metadata: result.metadata || {}
       }
     };
@@ -789,7 +853,7 @@ mcpServer.registerTool(
         success: true,
         title: result.title || 'Untitled',
         channel: result.channel || 'Unknown',
-        transcript: result.transcript || '',
+        source: result.source || '',
         metadata: result.metadata || {}
       }
     };
@@ -816,8 +880,7 @@ mcpServer.registerTool(
       structuredContent: {
         success: true,
         title: result.title || 'Untitled PDF',
-        content: result.content || '',
-        chunk: result.chunk || '',
+        source: result.source || '',
         metadata: result.metadata || {}
       }
     };
@@ -829,11 +892,12 @@ mcpServer.registerTool(
   'rah_get_context',
   {
     title: 'Get RA-H context',
-    description: 'Get orientation context: hub nodes, dimensions, stats, and available guides. Call this first.',
+    description: 'Get orientation context: contexts, hub nodes, dimensions, stats, and available guides. Call this first.',
     inputSchema: {},
     outputSchema: {
-      stats: z.object({ nodeCount: z.number(), edgeCount: z.number(), dimensionCount: z.number() }),
+      stats: z.object({ nodeCount: z.number(), edgeCount: z.number(), dimensionCount: z.number(), contextCount: z.number().optional() }),
       hubNodes: z.array(z.object({ id: z.number(), title: z.string(), description: z.string().nullable(), edgeCount: z.number() })),
+      contexts: z.array(z.object({ id: z.number(), name: z.string(), description: z.string().nullable(), icon: z.string().nullable().optional(), count: z.number() })).optional(),
       dimensions: z.array(z.object({ name: z.string(), nodeCount: z.number(), description: z.string().nullable() })),
       guides: z.array(z.string())
     }
@@ -849,18 +913,23 @@ mcpServer.registerTool(
       name: d.name, nodeCount: d.node_count ?? 0, description: d.description ?? null
     })) : [];
 
+    const contextResult = await callRaHApi('/api/contexts', { method: 'GET' });
+    const contexts = Array.isArray(contextResult.data) ? contextResult.data.map(c => ({
+      id: c.id, name: c.name, description: c.description ?? null, icon: c.icon ?? null, count: c.count ?? 0
+    })) : [];
+
     const guideResult = await callRaHApi('/api/guides', { method: 'GET' });
     const guides = Array.isArray(guideResult.data) ? guideResult.data.map(g => g.name) : [];
 
-    const stats = { nodeCount: 0, edgeCount: 0, dimensionCount: dimensions.length };
+    const stats = { nodeCount: 0, edgeCount: 0, dimensionCount: dimensions.length, contextCount: contexts.length };
     try {
       const countResult = await callRaHApi('/api/nodes?limit=1', { method: 'GET' });
       if (countResult.total !== undefined) stats.nodeCount = countResult.total;
     } catch { /* use defaults */ }
 
     return {
-      content: [{ type: 'text', text: `Knowledge graph: ${stats.dimensionCount} dimensions, ${hubNodes.length} hub nodes. ${guides.length} guides available.` }],
-      structuredContent: { stats, hubNodes, dimensions, guides }
+      content: [{ type: 'text', text: `Knowledge graph: ${stats.contextCount} contexts, ${stats.dimensionCount} dimensions, ${hubNodes.length} hub nodes. ${guides.length} guides available.` }],
+      structuredContent: { stats, hubNodes, contexts, dimensions, guides }
     };
   }
 );
diff --git a/apps/mcp-server/stdio-server.js b/apps/mcp-server/stdio-server.js
index f290dc8..8e71988 100644
--- a/apps/mcp-server/stdio-server.js
+++ b/apps/mcp-server/stdio-server.js
@@ -11,8 +11,9 @@ const packageJson = require('../../package.json');
 
 const instructions = [
   'RA-H is a personal knowledge graph — local-first, vendor-neutral.',
-  'Core concepts: nodes (knowledge units), edges (connections with explanations), dimensions (categories).',
-  'Always call rah_get_context first to orient yourself — it returns hub nodes, dimensions, stats, and available guides.',
+  'Core concepts: contexts (primary scopes), nodes (knowledge units), edges (connections with explanations), and dimensions (secondary metadata and filters).',
+  'Always call rah_get_context first to orient yourself — it returns contexts, hub nodes, dimensions, stats, and available guides.',
+  'Use contexts as the primary scope layer. Use rah_query_contexts before assigning or filtering by context when needed.',
   'When assigning dimensions, use only existing dimensions returned by rah_get_context or rah_query_dimensions.',
   'Do not invent new dimensions from node titles, concepts, or phrasing.',
   'Only call rah_create_dimension when the user explicitly instructs you to create a new dimension.',
@@ -40,9 +41,11 @@ const addNodeInputSchema = {
   content: z.string().max(20000).optional(),
   source: z.string().max(50000).optional(),
   link: z.string().url().optional(),
-  description: z.string().max(2000).optional(),
+  description: z.string().max(500).optional().describe('Description of the node. Write it as natural prose, not labels or a checklist. It must still make clear what the artifact is, why it is in the graph (infer from conversation context; ask the user if needed), and its current workflow status. Max 500 characters. If the reason is unclear, say that naturally instead of inventing it. Never use filler phrases like "insightful for understanding" or "relevant to the user\'s work".'),
+  context_id: z.number().int().positive().nullable().optional(),
+  context_name: z.string().optional(),
   dimensions: z.array(z.string()).min(1).max(5),
-  metadata: z.record(z.any()).optional(),
+  metadata: z.record(z.any()).optional().describe('Optional metadata. Prefer canonical keys: type, state, captured_method, captured_by, source_metadata.'),
   chunk: z.string().max(50000).optional()
 };
 
@@ -56,7 +59,16 @@ const addNodeOutputSchema = {
 const searchNodesInputSchema = {
   query: z.string().min(1).max(400),
   limit: z.number().min(1).max(25).optional(),
-  dimensions: z.array(z.string()).max(5).optional()
+  dimensions: z.array(z.string()).max(5).optional(),
+  contextId: z.number().int().positive().optional()
+};
+
+const queryContextsInputSchema = {
+  contextId: z.number().int().positive().optional(),
+  name: z.string().optional(),
+  search: z.string().optional(),
+  limit: z.number().min(1).max(100).optional(),
+  includeNodes: z.boolean().optional()
 };
 
 const searchNodesOutputSchema = {
@@ -65,7 +77,7 @@ const searchNodesOutputSchema = {
     z.object({
       id: z.number(),
       title: z.string(),
-      content: z.string().nullable(),
+      source: z.string().nullable(),
       description: z.string().nullable(),
       link: z.string().nullable(),
       dimensions: z.array(z.string()),
@@ -79,10 +91,13 @@ const updateNodeInputSchema = {
   id: z.number().int().positive().describe('The ID of the node to update'),
   updates: z.object({
     title: z.string().optional().describe('New title'),
-    content: z.string().optional().describe('Content to APPEND (not replace)'),
+    description: z.string().max(500).optional().describe('Description of the node. Write it as natural prose, not labels or a checklist. It must still make clear what the artifact is, why it is in the graph (infer from conversation context; ask the user if needed), and its current workflow status. Max 500 characters. If the reason is unclear, say that naturally instead of inventing it. Never use filler phrases like "insightful for understanding" or "relevant to the user\'s work".'),
+    content: z.string().optional().describe('Legacy alias for source. Mapped to source for backward compatibility.'),
+    source: z.string().optional().describe('Canonical source text for embedding.'),
     link: z.string().optional().describe('New link'),
+    context_id: z.number().int().positive().nullable().optional().describe('Primary context ID. Omit to preserve existing context; use null to clear.'),
     dimensions: z.array(z.string()).optional().describe('New dimensions (replaces existing)'),
-    metadata: z.record(z.any()).optional().describe('New metadata (replaces existing)')
+    metadata: z.record(z.any()).optional().describe('Metadata patch. This now merges with existing metadata. Prefer canonical keys: type, state, captured_method, captured_by, source_metadata.')
   }).describe('Fields to update')
 };
 
@@ -103,7 +118,7 @@ const getNodesOutputSchema = {
     z.object({
       id: z.number(),
       title: z.string(),
-      content: z.string().nullable(),
+      source: z.string().nullable(),
       link: z.string().nullable(),
       dimensions: z.array(z.string()),
       updated_at: z.string()
@@ -217,8 +232,7 @@ const extractUrlInputSchema = {
 const extractUrlOutputSchema = {
   success: z.boolean(),
   title: z.string(),
-  content: z.string(),
-  chunk: z.string(),
+  source: z.string(),
   metadata: z.record(z.any())
 };
 
@@ -231,7 +245,7 @@ const extractYoutubeOutputSchema = {
   success: z.boolean(),
   title: z.string(),
   channel: z.string(),
-  transcript: z.string(),
+  source: z.string(),
   metadata: z.record(z.any())
 };
 
@@ -243,8 +257,7 @@ const extractPdfInputSchema = {
 const extractPdfOutputSchema = {
   success: z.boolean(),
   title: z.string(),
-  content: z.string(),
-  chunk: z.string(),
+  source: z.string(),
   metadata: z.record(z.any())
 };
 
@@ -322,11 +335,11 @@ server.registerTool(
   'rah_add_node',
   {
     title: 'Add RA-H node',
-    description: 'Create a new node in the local RA-H knowledge base.',
+    description: 'Create a new node in the local RA-H knowledge base. Set context explicitly when clear; otherwise RA-H will infer the best-fit context automatically on create. Use only existing dimensions; do not invent new ones.',
     inputSchema: addNodeInputSchema,
     outputSchema: addNodeOutputSchema
   },
-  async ({ title, content, source, link, description, dimensions, metadata, chunk }) => {
+  async ({ title, content, source, link, description, context_id, context_name, dimensions, metadata, chunk }) => {
     const normalizedDimensions = sanitizeDimensions(dimensions);
     if (normalizedDimensions.length === 0) {
       throw new Error('At least one dimension/tag is required when creating a node.');
@@ -334,9 +347,11 @@ server.registerTool(
 
     const payload = {
       title: title.trim(),
-      source: source?.trim() || chunk?.trim() || content?.trim() || undefined,
+      source: source?.trim() || content?.trim() || chunk?.trim() || undefined,
       link: link?.trim() || undefined,
       description: description?.trim() || undefined,
+      context_id: context_id === null ? null : context_id,
+      context_name: context_name?.trim() || undefined,
       dimensions: normalizedDimensions,
       metadata: metadata || {}
     };
@@ -369,7 +384,7 @@ server.registerTool(
     inputSchema: searchNodesInputSchema,
     outputSchema: searchNodesOutputSchema
   },
-  async ({ query, limit = 10, dimensions }) => {
+  async ({ query, limit = 10, dimensions, contextId }) => {
     const params = new URLSearchParams();
     params.set('search', query.trim());
     params.set('limit', String(Math.min(Math.max(limit, 1), 25)));
@@ -378,6 +393,9 @@ server.registerTool(
     if (dimensionList.length > 0) {
       params.set('dimensions', dimensionList.join(','));
     }
+    if (contextId) {
+      params.set('contextId', String(contextId));
+    }
 
     const result = await callRaHApi(`/api/nodes?${params.toString()}`, {
       method: 'GET'
@@ -407,11 +425,59 @@ server.registerTool(
   }
 );
 
+server.registerTool(
+  'rah_query_contexts',
+  {
+    title: 'Query RA-H contexts',
+    description: 'List contexts, inspect a specific context, or search contexts by name/description.',
+    inputSchema: queryContextsInputSchema
+  },
+  async ({ contextId, name, search, limit = 50, includeNodes = false }) => {
+    const normalizedName = typeof name === 'string' ? name.trim().toLowerCase() : '';
+    let contexts = [];
+
+    if (contextId) {
+      const result = await callRaHApi(`/api/contexts/${contextId}`, { method: 'GET' });
+      if (result?.data) {
+        contexts = [result.data];
+      }
+    } else {
+      const result = await callRaHApi('/api/contexts', { method: 'GET' });
+      const all = Array.isArray(result.data) ? result.data : [];
+      contexts = all.filter((context) => {
+        if (normalizedName && context.name?.trim().toLowerCase() !== normalizedName) {
+          return false;
+        }
+        if (search) {
+          const haystack = `${context.name || ''} ${context.description || ''}`.toLowerCase();
+          return haystack.includes(search.trim().toLowerCase());
+        }
+        return true;
+      }).slice(0, Math.min(Math.max(limit, 1), 100));
+    }
+
+    const includeContextNodes = includeNodes && contexts.length === 1 && (contextId || normalizedName);
+    const enriched = await Promise.all(contexts.map(async (context) => {
+      if (!includeContextNodes) return context;
+      const nodeResult = await callRaHApi(`/api/contexts/${context.id}/nodes`, { method: 'GET' });
+      return { ...context, nodes: Array.isArray(nodeResult.data) ? nodeResult.data : [] };
+    }));
+
+    return {
+      content: [{ type: 'text', text: enriched.length === 0 ? 'No matching contexts found.' : `Found ${enriched.length} context(s).` }],
+      structuredContent: {
+        count: enriched.length,
+        contexts: enriched
+      }
+    };
+  }
+);
+
 server.registerTool(
   'rah_update_node',
   {
     title: 'Update RA-H node',
-    description: 'Update an existing node. Content is APPENDED (not replaced). Dimensions are replaced.',
+    description: 'Update an existing node. Dimensions must be existing canonical dimensions; do not invent new ones.',
     inputSchema: updateNodeInputSchema,
     outputSchema: updateNodeOutputSchema
   },
@@ -420,15 +486,15 @@ server.registerTool(
       throw new Error('At least one field must be provided in updates.');
     }
 
-    // Map MCP legacy fields to canonical source
+    // Backward compatibility: map legacy content/chunk → source
     const mappedUpdates = { ...updates };
-    if (mappedUpdates.content !== undefined) {
-      mappedUpdates.source = mappedUpdates.content;
-    }
     if (mappedUpdates.chunk !== undefined && mappedUpdates.source === undefined) {
       mappedUpdates.source = mappedUpdates.chunk;
     }
-    delete mappedUpdates.content;
+    if (mappedUpdates.content !== undefined) {
+      mappedUpdates.source = mappedUpdates.content;
+      delete mappedUpdates.content;
+    }
     delete mappedUpdates.chunk;
 
     const result = await callRaHApi(`/api/nodes/${id}`, {
@@ -593,7 +659,7 @@ server.registerTool(
   'rah_create_dimension',
   {
     title: 'Create RA-H dimension',
-    description: 'Create a new dimension/tag for organizing nodes.',
+    description: 'Create a new dimension/tag for organizing nodes only when the user explicitly instructs you to do so.',
     inputSchema: createDimensionInputSchema,
     outputSchema: createDimensionOutputSchema
   },
@@ -731,8 +797,7 @@ server.registerTool(
       structuredContent: {
         success: true,
         title: result.title || 'Untitled',
-        content: result.content || '',
-        chunk: result.chunk || '',
+        source: result.source || '',
         metadata: result.metadata || {}
       }
     };
@@ -760,7 +825,7 @@ server.registerTool(
         success: true,
         title: result.title || 'Untitled',
         channel: result.channel || 'Unknown',
-        transcript: result.transcript || '',
+        source: result.source || '',
         metadata: result.metadata || {}
       }
     };
@@ -787,8 +852,7 @@ server.registerTool(
       structuredContent: {
         success: true,
         title: result.title || 'Untitled PDF',
-        content: result.content || '',
-        chunk: result.chunk || '',
+        source: result.source || '',
         metadata: result.metadata || {}
       }
     };
@@ -797,10 +861,11 @@ server.registerTool(
 
 // rah_get_context — orientation tool for external agents
 const getContextOutputSchema = {
-  schema: z.object({
+  stats: z.object({
     nodeCount: z.number(),
     edgeCount: z.number(),
-    dimensionCount: z.number()
+    dimensionCount: z.number(),
+    contextCount: z.number().optional()
   }),
   hubNodes: z.array(z.object({
     id: z.number(),
@@ -808,6 +873,13 @@ const getContextOutputSchema = {
     description: z.string().nullable(),
     edgeCount: z.number()
   })),
+  contexts: z.array(z.object({
+    id: z.number(),
+    name: z.string(),
+    description: z.string().nullable(),
+    icon: z.string().nullable().optional(),
+    count: z.number()
+  })).optional(),
   dimensions: z.array(z.object({
     name: z.string(),
     nodeCount: z.number(),
@@ -820,7 +892,7 @@ server.registerTool(
   'rah_get_context',
   {
     title: 'Get RA-H context',
-    description: 'Get orientation context: hub nodes, dimensions, stats, and available guides. Call this first.',
+    description: 'Get orientation context: contexts, hub nodes, dimensions, stats, and available guides. Call this first.',
     inputSchema: {},
     outputSchema: getContextOutputSchema
   },
@@ -842,6 +914,15 @@ server.registerTool(
       description: d.description ?? null
     })) : [];
 
+    const contextResult = await callRaHApi('/api/contexts', { method: 'GET' });
+    const contexts = Array.isArray(contextResult.data) ? contextResult.data.map(c => ({
+      id: c.id,
+      name: c.name,
+      description: c.description ?? null,
+      icon: c.icon ?? null,
+      count: c.count ?? 0
+    })) : [];
+
     // Fetch guides
     const guideResult = await callRaHApi('/api/guides', { method: 'GET' });
     const guides = Array.isArray(guideResult.data) ? guideResult.data.map(g => g.name) : [];
@@ -851,7 +932,8 @@ server.registerTool(
     const stats = {
       nodeCount: nodeCount ?? hubNodes.reduce((_, n) => 0, 0),
       edgeCount: 0,
-      dimensionCount: dimensions.length
+      dimensionCount: dimensions.length,
+      contextCount: contexts.length
     };
 
     // Try to get actual counts from a stats endpoint or compute
@@ -862,13 +944,14 @@ server.registerTool(
       }
     } catch { /* use defaults */ }
 
-    const summary = `Knowledge graph: ${stats.dimensionCount} dimensions, ${hubNodes.length} hub nodes. ${guides.length} guides available.`;
+    const summary = `Knowledge graph: ${stats.contextCount} contexts, ${stats.dimensionCount} dimensions, ${hubNodes.length} hub nodes. ${guides.length} guides available.`;
 
     return {
       content: [{ type: 'text', text: summary }],
       structuredContent: {
-        schema: stats,
+        stats,
         hubNodes,
+        contexts,
         dimensions,
         guides
       }
diff --git a/docs/4_tools-and-guides.md b/docs/4_tools-and-guides.md
index 6443c22..3d5bb89 100644
--- a/docs/4_tools-and-guides.md
+++ b/docs/4_tools-and-guides.md
@@ -14,7 +14,7 @@ RA-OS exposes these core standalone MCP tools:
 
 | Tool | Description |
 |------|-------------|
-| `getContext` | Graph overview: stats, hub nodes, dimensions, recent activity, skills |
+| `getContext` | Graph overview: stats, contexts, hub nodes, dimensions, recent activity, skills |
 | `queryNodes` | Search nodes by keyword/dimensions/date |
 | `getNodesById` | Fetch full nodes by ID |
 | `createNode` | Create a node |
diff --git a/docs/8_mcp.md b/docs/8_mcp.md
index b746529..981b461 100644
--- a/docs/8_mcp.md
+++ b/docs/8_mcp.md
@@ -76,7 +76,8 @@ If you want real-time UI updates when nodes are created:
 
 | Tool | Description |
 |------|-------------|
-| `getContext` | Get graph overview — stats, hub nodes, dimensions, recent activity. Called first automatically. |
+| `getContext` | Get graph overview — stats, contexts, hub nodes, dimensions, recent activity. Called first automatically. |
+| `queryContexts` | List contexts, inspect a context, or search contexts by name/description. |
 | `createNode` | Create a new node (title/source/dimensions) |
 | `queryNodes` | Search existing nodes by keyword |
 | `updateNode` | Update an existing node |
@@ -101,7 +102,7 @@ If you want real-time UI updates when nodes are created:
 
 Once connected, the MCP server instructs Claude to:
 
-1. **Call `getContext` first** to orient itself (hub nodes, dimensions, stats, available skills)
+1. **Call `getContext` first** to orient itself (contexts, hub nodes, dimensions, stats, available skills)
 2. **Proactively capture knowledge** — when a new insight, decision, person, or reference surfaces, it proposes a specific node (title, dimensions, description) so you can approve with minimal friction
 3. **Read skills for complex tasks** — skills provide reusable procedural instructions for graph operations and workflows
 4. **Search before creating** to avoid duplicates
diff --git a/src/components/focus/FocusPanel.tsx b/src/components/focus/FocusPanel.tsx
index 7ee9a5c..e223d5e 100644
--- a/src/components/focus/FocusPanel.tsx
+++ b/src/components/focus/FocusPanel.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useEffect, useRef, useState, type DragEvent } from 'react';
-import { Trash2, Loader, Database, RefreshCw, Pencil, X, Save, Plus, Link2, Tag, Share2, AlignLeft } from 'lucide-react';
+import { Trash2, Loader, Database, RefreshCw, Pencil, X, Save, Plus, Link2, Tag, Share2, AlignLeft, ChevronDown, ChevronRight, Check, Folder } from 'lucide-react';
 import { parseAndRenderContent } from '@/components/helpers/NodeLabelRenderer';
 import { Node, NodeConnection } from '@/types/database';
 import DimensionTags from './dimensions/DimensionTags';
@@ -11,7 +11,10 @@ import ConfirmDialog from '../common/ConfirmDialog';
 import { SourceReader } from './source';
 import SourceEditor from './source/SourceEditor';
 import { openExternalUrl, shouldOpenExternally } from '@/utils/openExternalUrl';
+import { normalizeNodeLink } from '@/utils/nodeLink';
 import NodeSearchModal from './edges/NodeSearchModal';
+import { getNodeProcessedState, parseNodeMetadata } from '@/services/nodes/metadata';
+import type { ContextSummary } from '@/types/database';
 
 interface FocusPanelProps {
   openTabs: number[];
@@ -22,9 +25,6 @@ interface FocusPanelProps {
   refreshTrigger?: number;
   onTextSelect?: (nodeId: number, nodeTitle: string, text: string) => void;
   highlightedPassage?: { nodeId: number; selectedText: string } | null;
-  onReorderTabs?: (fromIndex: number, toIndex: number) => void;
-  onOpenInOtherSlot?: (nodeId: number) => void;
-  hideTabBar?: boolean;
 }
 
 type HoverSection = 'description' | 'source' | null;
@@ -38,9 +38,6 @@ export default function FocusPanel({
   refreshTrigger,
   onTextSelect,
   highlightedPassage,
-  onReorderTabs,
-  onOpenInOtherSlot,
-  hideTabBar,
 }: FocusPanelProps) {
   const { dimensionIcons } = useDimensionIcons();
   const [nodesData, setNodesData] = useState<Record<number, Node>>({});
@@ -72,6 +69,9 @@ export default function FocusPanel({
   const [sourceEditMode, setSourceEditMode] = useState(false);
   const [sourceEditValue, setSourceEditValue] = useState('');
   const [sourceSaving, setSourceSaving] = useState(false);
+  const [availableContexts, setAvailableContexts] = useState<ContextSummary[]>([]);
+  const [contextSaving, setContextSaving] = useState(false);
+  const [contextMenuOpen, setContextMenuOpen] = useState(false);
   const [hoveredSection, setHoveredSection] = useState<HoverSection>(null);
 
   const titleInputRef = useRef<HTMLInputElement>(null);
@@ -80,8 +80,12 @@ export default function FocusPanel({
   const sourceTextareaRef = useRef<HTMLTextAreaElement>(null);
   const skipTitleBlurRef = useRef(false);
   const skipLinkBlurRef = useRef(false);
+  const contextMenuRef = useRef<HTMLDivElement>(null);
 
   const currentNode = activeTab !== null ? nodesData[activeTab] : undefined;
+  const normalizedCurrentLink = normalizeNodeLink(currentNode?.link || null);
+  const currentProcessedState = getNodeProcessedState(currentNode?.metadata);
+  const currentNodeMetadata = parseNodeMetadata(currentNode?.metadata);
   const currentEdges = activeTab !== null ? edgesData[activeTab] || [] : [];
   const currentEdgesExpanded = activeTab !== null ? Boolean(edgesExpanded[activeTab]) : false;
   const visibleEdges = currentEdgesExpanded ? currentEdges : currentEdges.slice(0, 3);
@@ -102,6 +106,33 @@ export default function FocusPanel({
     if (sourceEditMode) sourceTextareaRef.current?.focus();
   }, [sourceEditMode]);
 
+  useEffect(() => {
+    if (!contextMenuOpen) return;
+
+    const handlePointerDown = (event: MouseEvent) => {
+      if (!contextMenuRef.current?.contains(event.target as globalThis.Node)) {
+        setContextMenuOpen(false);
+      }
+    };
+
+    document.addEventListener('mousedown', handlePointerDown);
+    return () => document.removeEventListener('mousedown', handlePointerDown);
+  }, [contextMenuOpen]);
+
+  useEffect(() => {
+    void (async () => {
+      try {
+        const response = await fetch('/api/contexts');
+        const data = await response.json();
+        if (response.ok && data.success) {
+          setAvailableContexts(data.data || []);
+        }
+      } catch (error) {
+        console.error('Failed to fetch contexts:', error);
+      }
+    })();
+  }, []);
+
 
   useEffect(() => {
     openTabs.forEach((tabId) => {
@@ -135,6 +166,7 @@ export default function FocusPanel({
     setDescEditValue('');
     setSourceEditMode(false);
     setSourceEditValue('');
+    setContextMenuOpen(false);
     setEdgeSearchOpen(false);
     setEdgeEditingId(null);
     setEdgeEditingValue('');
@@ -145,6 +177,20 @@ export default function FocusPanel({
     setLoadingNodes(prev => new Set(prev).add(id));
     try {
       const response = await fetch(`/api/nodes/${id}`);
+      if (response.status === 404) {
+        setNodesData(prev => {
+          const next = { ...prev };
+          delete next[id];
+          return next;
+        });
+        setEdgesData(prev => {
+          const next = { ...prev };
+          delete next[id];
+          return next;
+        });
+        onTabClose(id);
+        return;
+      }
       const data = await response.json();
       if (response.ok && data.node) {
         setNodesData(prev => ({ ...prev, [id]: data.node }));
@@ -199,6 +245,48 @@ export default function FocusPanel({
     throw new Error('Missing updated node in response');
   };
 
+  const toggleProcessedState = async () => {
+    if (activeTab === null || !currentNode) return;
+
+    const nextState = currentProcessedState === 'processed' ? 'not_processed' : 'processed';
+
+    try {
+      await updateNode(activeTab, {
+        metadata: {
+          state: nextState,
+        },
+      });
+    } catch (error) {
+      console.error('Error updating processed state:', error);
+      window.alert('Failed to update processed state. Please try again.');
+    }
+  };
+
+  const renderMetadataSection = () => {
+    const metadataEntries = Object.entries(currentNodeMetadata).filter(([, value]) => value !== undefined);
+    const rawJson = metadataEntries.length > 0 ? JSON.stringify(currentNodeMetadata, null, 2) : '';
+
+    return (
+      <section style={{ ...S.section, minWidth: 0, width: '100%', overflow: 'hidden' }}>
+        <div style={S.sectionHeader}>
+          <span style={S.sectionLabel}>Metadata</span>
+          <div style={S.sectionRule} />
+        </div>
+
+        {metadataEntries.length === 0 ? (
+          <div style={{ color: 'var(--rah-text-muted)', fontSize: '12px', fontStyle: 'italic' }}>
+            No metadata stored for this node.
+          </div>
+        ) : (
+          <div className="metadata-group">
+            <div className="metadata-group-label">raw</div>
+            <pre className="metadata-raw">{rawJson}</pre>
+          </div>
+        )}
+      </section>
+    );
+  };
+
   const startTitleEdit = () => {
     if (!currentNode) return;
     setTitleEditValue(currentNode.title || '');
@@ -310,6 +398,20 @@ export default function FocusPanel({
     }
   };
 
+  const saveContext = async (value: string) => {
+    if (!activeTab) return;
+    setContextSaving(true);
+    try {
+      await updateNode(activeTab, { context_id: value ? Number(value) : null });
+      setContextMenuOpen(false);
+    } catch (error) {
+      console.error('Error saving context:', error);
+      window.alert('Failed to save context. Please try again.');
+    } finally {
+      setContextSaving(false);
+    }
+  };
+
   const embedContent = async (nodeId: number) => {
     setEmbeddingNode(nodeId);
     try {
@@ -597,6 +699,315 @@ export default function FocusPanel({
     },
   };
 
+  const renderDescriptionSection = () => (
+    <section
+      style={S.section}
+      onMouseEnter={() => setHoveredSection('description')}
+      onMouseLeave={() => setHoveredSection(prev => prev === 'description' ? null : prev)}
+    >
+      {/* Section header with extending rule */}
+      <div style={S.sectionHeader}>
+        <span style={S.sectionLabel}>Description</span>
+        <div style={S.sectionRule} />
+        <div style={{ display: 'inline-flex', alignItems: 'center', gap: '4px', opacity: hoveredSection === 'description' || descEditMode ? 1 : 0, transition: 'opacity 150ms ease' }}>
+          {!descEditMode && (
+            <>
+              <button type="button" style={S.iconBtn} onClick={startDescEdit} title="Edit">
+                <Pencil size={11} />
+              </button>
+              {activeTab !== null && (
+                <button
+                  type="button"
+                  style={S.iconBtn}
+                  onClick={() => void regenerateDescription(activeTab)}
+                  disabled={regeneratingDescription === activeTab}
+                  title="Regenerate"
+                >
+                  {regeneratingDescription === activeTab
+                    ? <Loader size={11} className="animate-spin" />
+                    : <RefreshCw size={11} />}
+                </button>
+              )}
+            </>
+          )}
+        </div>
+      </div>
+
+      {descEditMode ? (
+        <div style={S.editorBlock}>
+          <textarea
+            ref={descTextareaRef}
+            value={descEditValue}
+            onChange={(e) => setDescEditValue(e.target.value)}
+            onKeyDown={(e) => {
+              if ((e.metaKey || e.ctrlKey) && e.key === 'Enter') { e.preventDefault(); void saveDesc(); }
+              if (e.key === 'Escape') { e.preventDefault(); setDescEditMode(false); setDescEditValue(''); }
+            }}
+            disabled={descSaving}
+            style={{ ...S.textarea, minHeight: '90px', lineHeight: '1.6', fontSize: '13.5px' }}
+            rows={4}
+            placeholder="Add a concise description..."
+          />
+          <div style={S.editorActions}>
+            <button type="button" style={S.secondaryBtn} onClick={() => { setDescEditMode(false); setDescEditValue(''); }} disabled={descSaving}>
+              <X size={13} /> Cancel
+            </button>
+            <button type="button" style={S.primaryBtn} onClick={() => void saveDesc()} disabled={descSaving}>
+              {descSaving ? <Loader size={13} className="animate-spin" /> : <Save size={13} />} Save
+            </button>
+          </div>
+        </div>
+      ) : (
+        <div
+          onClick={startDescEdit}
+          style={{ color: 'var(--rah-text-base)', fontSize: '13.5px', lineHeight: '1.65', cursor: 'text' }}
+        >
+          {currentNode?.description
+            ? parseAndRenderContent(currentNode.description, onNodeClick || onTabSelect)
+            : <span style={{ color: 'var(--rah-text-muted)', fontStyle: 'italic' }}>Add a description...</span>}
+        </div>
+      )}
+    </section>
+  );
+
+  const renderConnectionsSection = () => (
+    <section style={S.section}>
+      {/* Section header */}
+      <div style={S.sectionHeader}>
+        <span style={S.sectionLabel}>Connections</span>
+        <div style={S.sectionRule} />
+      </div>
+
+      {loadingEdges.has(activeTab ?? -1) ? (
+        <span style={{ color: 'var(--rah-text-muted)', fontSize: '12px' }}>Loading…</span>
+      ) : currentEdges.length === 0 ? (
+        <button
+          type="button"
+          onClick={() => setEdgeSearchOpen(true)}
+          style={{
+            display: 'inline-flex', alignItems: 'center', gap: '6px',
+            alignSelf: 'flex-start',
+            background: 'transparent',
+            border: '1px dashed var(--rah-border-strong)',
+            borderRadius: '8px',
+            color: 'var(--rah-text-muted)',
+            fontSize: '12px',
+            fontFamily: 'inherit',
+            cursor: 'pointer',
+            padding: '7px 12px',
+          }}
+        >
+          <Plus size={13} />
+          Add connection
+        </button>
+      ) : (
+        <div style={{ display: 'flex', flexDirection: 'column' }}>
+          {visibleEdges.map((connection) => {
+            const isOutgoing = connection.edge.from_node_id === activeTab;
+            const explanation = typeof connection.edge.context?.explanation === 'string'
+              ? connection.edge.context.explanation
+              : '';
+            const isHovered = hoveredConnectionId === connection.id;
+
+            return (
+              <div
+                key={connection.id}
+                onMouseEnter={() => setHoveredConnectionId(connection.id)}
+                onMouseLeave={() => setHoveredConnectionId(null)}
+                style={{
+                  display: 'flex',
+                  flexDirection: 'column',
+                  gap: '2px',
+                  padding: '6px 8px',
+                  borderRadius: '6px',
+                  background: isHovered ? 'var(--rah-bg-hover)' : 'transparent',
+                  transition: 'background 120ms ease',
+                  margin: '0 -8px',
+                }}
+              >
+                {/* Title row */}
+                <div style={{ display: 'flex', alignItems: 'center', gap: '6px', minWidth: 0 }}>
+                  <span style={{
+                    fontSize: '11px',
+                    color: isOutgoing ? 'var(--rah-accent-green)' : '#f59e0b',
+                    flexShrink: 0,
+                    width: '12px',
+                    textAlign: 'center',
+                  }}>
+                    {isOutgoing ? '↗' : '↙'}
+                  </span>
+                  <span style={{ display: 'inline-flex', alignItems: 'center', flexShrink: 0 }}>
+                    {getNodeIcon(connection.connected_node, dimensionIcons, 12)}
+                  </span>
+                  <button
+                    type="button"
+                    onClick={() => (onNodeClick || onTabSelect)(connection.connected_node.id)}
+                    title={connection.connected_node.title}
+                    style={{
+                      flex: 1,
+                      minWidth: 0,
+                      background: 'transparent',
+                      border: 'none',
+                      padding: 0,
+                      color: 'var(--rah-text-base)',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      textAlign: 'left',
+                      cursor: 'pointer',
+                      overflow: 'hidden',
+                      textOverflow: 'ellipsis',
+                      whiteSpace: 'nowrap',
+                      fontFamily: 'inherit',
+                    }}
+                  >
+                    {connection.connected_node.title}
+                  </button>
+                  <button
+                    type="button"
+                    onClick={() => void deleteEdge(connection.edge.id)}
+                    disabled={deletingEdge === connection.edge.id}
+                    title="Remove"
+                    style={{
+                      display: 'inline-flex', alignItems: 'center', justifyContent: 'center',
+                      background: 'transparent',
+                      border: 'none',
+                      color: 'var(--rah-text-muted)',
+                      cursor: 'pointer',
+                      padding: '2px',
+                      borderRadius: '4px',
+                      flexShrink: 0,
+                      opacity: isHovered ? 1 : 0,
+                      transition: 'opacity 120ms ease, color 120ms ease',
+                    }}
+                  >
+                    {deletingEdge === connection.edge.id ? '…' : <Trash2 size={11} />}
+                  </button>
+                </div>
+
+                {/* Explanation row */}
+                {edgeEditingId === connection.edge.id ? (
+                  <div style={{ display: 'flex', alignItems: 'center', gap: '6px', marginLeft: '18px' }}>
+                    <input
+                      value={edgeEditingValue}
+                      onChange={(e) => setEdgeEditingValue(e.target.value)}
+                      onKeyDown={(e) => {
+                        if (e.key === 'Enter') { e.preventDefault(); void saveEdgeExplanation(connection.edge.id, connection.edge.context); }
+                        if (e.key === 'Escape') { e.preventDefault(); cancelEditEdgeExplanation(); }
+                      }}
+                      placeholder="Describe this connection..."
+                      autoFocus
+                      style={{
+                        flex: 1,
+                        minWidth: 0,
+                        background: 'var(--rah-bg-surface)',
+                        border: '1px solid var(--rah-border-strong)',
+                        borderRadius: '6px',
+                        padding: '5px 8px',
+                        color: 'var(--rah-text-base)',
+                        fontSize: '12px',
+                        outline: 'none',
+                        fontFamily: 'inherit',
+                      }}
+                    />
+                    <button
+                      type="button"
+                      onClick={() => void saveEdgeExplanation(connection.edge.id, connection.edge.context)}
+                      disabled={edgeSavingId === connection.edge.id}
+                      style={{ padding: '5px 8px', fontSize: '10px', border: 'none', background: 'var(--rah-accent-green)', color: 'var(--rah-text-inverse)', borderRadius: '5px', cursor: 'pointer', fontFamily: 'inherit', flexShrink: 0 }}
+                    >
+                      Save
+                    </button>
+                    <button
+                      type="button"
+                      onClick={cancelEditEdgeExplanation}
+                      style={{ padding: '5px 8px', fontSize: '10px', border: '1px solid var(--rah-border-strong)', background: 'transparent', color: 'var(--rah-text-soft)', borderRadius: '5px', cursor: 'pointer', fontFamily: 'inherit', flexShrink: 0 }}
+                    >
+                      Cancel
+                    </button>
+                  </div>
+                ) : (explanation || isHovered) ? (
+                  <button
+                    type="button"
+                    onClick={() => startEditEdgeExplanation(connection.edge.id, explanation)}
+                    title={explanation || 'Add a note about this connection'}
+                    style={{
+                      display: 'block',
+                      marginLeft: '18px',
+                      padding: 0,
+                      border: 'none',
+                      background: 'transparent',
+                      color: explanation ? 'var(--rah-text-muted)' : 'var(--rah-border-stronger)',
+                      fontSize: '11.5px',
+                      lineHeight: 1.4,
+                      textAlign: 'left',
+                      cursor: 'pointer',
+                      overflow: 'hidden',
+                      textOverflow: 'ellipsis',
+                      whiteSpace: 'nowrap',
+                      maxWidth: '100%',
+                      fontFamily: 'inherit',
+                      fontStyle: explanation ? 'normal' : 'italic',
+                      opacity: isHovered ? 1 : explanation ? 0.7 : 0,
+                      transition: 'opacity 120ms ease',
+                    }}
+                  >
+                    {explanation || 'Add note…'}
+                  </button>
+                ) : null}
+              </div>
+            );
+          })}
+        </div>
+      )}
+
+      {/* Expand / collapse */}
+      {currentEdges.length > 3 && (
+        <button
+          type="button"
+          onClick={() => {
+            if (activeTab === null) return;
+            setEdgesExpanded(prev => ({ ...prev, [activeTab]: !currentEdgesExpanded }));
+          }}
+          style={{
+            display: 'block',
+            background: 'transparent',
+            border: 'none',
+            color: 'var(--rah-text-muted)',
+            fontSize: '11px',
+            fontFamily: 'inherit',
+            cursor: 'pointer',
+            padding: '2px 0',
+            textAlign: 'left',
+          }}
+        >
+          {currentEdgesExpanded ? '↑ Show less' : `+ ${currentEdges.length - 3} more`}
+        </button>
+      )}
+
+      {/* Add connection */}
+      {currentEdges.length > 0 && (
+        <button
+          type="button"
+          onClick={() => setEdgeSearchOpen(true)}
+          style={{
+            display: 'inline-flex', alignItems: 'center', gap: '5px',
+            alignSelf: 'flex-start',
+            background: 'transparent',
+            border: 'none',
+            color: 'var(--rah-text-muted)',
+            fontSize: '11px',
+            fontFamily: 'inherit',
+            cursor: 'pointer',
+            padding: '2px 0',
+          }}
+        >
+          <Plus size={11} />
+          Add connection
+        </button>
+      )}
+    </section>
+  );
+
   const renderSourceSection = () => {
     const sourceContent = currentNode?.source || '';
 
@@ -680,34 +1091,55 @@ export default function FocusPanel({
         ) : !currentNode ? (
           <div className="empty-state">Node not found.</div>
         ) : (
-          <div className="document-view">
+          <div className={`document-view ${currentProcessedState === 'processed' ? 'document-view-processed' : ''}`}>
 
             {/* ── Title ── */}
             <div className="title-row">
-              {titleEditMode ? (
-                <input
-                  ref={titleInputRef}
-                  type="text"
-                  value={titleEditValue}
-                  onChange={(e) => setTitleEditValue(e.target.value)}
-                  onKeyDown={(e) => {
-                    if (e.key === 'Enter') { e.preventDefault(); void saveTitle(); }
-                    if (e.key === 'Escape') { e.preventDefault(); skipTitleBlurRef.current = true; setTitleEditMode(false); setTitleEditValue(''); }
-                  }}
-                  onBlur={() => {
-                    if (skipTitleBlurRef.current) { skipTitleBlurRef.current = false; return; }
-                    void saveTitle();
-                  }}
-                  disabled={titleSaving}
-                  className="title-input"
-                  placeholder="Enter title..."
-                />
-              ) : (
-                <button type="button" className="title-button" onClick={startTitleEdit}>
-                  {currentNode.title || 'Untitled'}
-                </button>
-              )}
+              <div className="title-stack">
+                {titleEditMode ? (
+                  <input
+                    ref={titleInputRef}
+                    type="text"
+                    value={titleEditValue}
+                    onChange={(e) => setTitleEditValue(e.target.value)}
+                    onKeyDown={(e) => {
+                      if (e.key === 'Enter') { e.preventDefault(); void saveTitle(); }
+                      if (e.key === 'Escape') { e.preventDefault(); skipTitleBlurRef.current = true; setTitleEditMode(false); setTitleEditValue(''); }
+                    }}
+                    onBlur={() => {
+                      if (skipTitleBlurRef.current) { skipTitleBlurRef.current = false; return; }
+                      void saveTitle();
+                    }}
+                    disabled={titleSaving}
+                    className="title-input"
+                    placeholder="Enter title..."
+                  />
+                ) : (
+                  <button type="button" className="title-button" onClick={startTitleEdit}>
+                    {currentNode.title || 'Untitled'}
+                  </button>
+                )}
 
+                <div className="node-status-row">
+                  <button
+                    type="button"
+                    onClick={() => void toggleProcessedState()}
+                    className={`processed-control ${currentProcessedState === 'processed' ? 'is-processed' : ''}`}
+                    title="Toggle processed state"
+                  >
+                    <span className={`processed-control-box ${currentProcessedState === 'processed' ? 'is-processed' : ''}`}>
+                      <Check size={12} strokeWidth={2.8} />
+                    </span>
+                    <span className="processed-control-copy">
+                      <span className="processed-control-label">processed</span>
+                    </span>
+                  </button>
+
+                  {currentProcessedState === 'processed' && (
+                    <span className="processed-indicator-badge">processed</span>
+                  )}
+                </div>
+              </div>
             </div>
 
             {/* ── Properties block ── */}
@@ -729,7 +1161,7 @@ export default function FocusPanel({
                     onClick={() => setPropsCollapsed(c => !c)}
                     title={propsCollapsed ? 'Expand properties' : 'Collapse properties'}
                   >
-                    {propsCollapsed ? '▸' : '▾'}
+                    {propsCollapsed ? <ChevronRight size={18} strokeWidth={2.5} /> : <ChevronDown size={18} strokeWidth={2.5} />}
                   </button>
                   <button
                     type="button"
@@ -776,19 +1208,25 @@ export default function FocusPanel({
                       placeholder="https://..."
                     />
                   ) : currentNode.link ? (
-                    <a
-                      href={currentNode.link}
-                      className="prop-link"
-                      onClick={(e) => {
-                        if (e.metaKey || e.ctrlKey) { e.preventDefault(); startLinkEdit(); return; }
-                        if (!shouldOpenExternally(currentNode.link || '')) return;
-                        e.preventDefault();
-                        void openExternalUrl(currentNode.link || '').catch(() => window.alert(`Unable to open ${currentNode.link}`));
-                      }}
-                      title={`${currentNode.link} (Cmd+Click to edit)`}
-                    >
-                      {currentNode.link}
-                    </a>
+                    normalizedCurrentLink ? (
+                      <a
+                        href={normalizedCurrentLink}
+                        className="prop-link"
+                        onClick={(e) => {
+                          if (e.metaKey || e.ctrlKey) { e.preventDefault(); startLinkEdit(); return; }
+                          if (!shouldOpenExternally(normalizedCurrentLink)) return;
+                          e.preventDefault();
+                          void openExternalUrl(normalizedCurrentLink).catch(() => window.alert(`Unable to open ${currentNode.link}`));
+                        }}
+                        title={`${normalizedCurrentLink} (Cmd+Click to edit)`}
+                      >
+                        {currentNode.link}
+                      </a>
+                    ) : (
+                      <button type="button" className="prop-empty-btn" onClick={startLinkEdit} title="Invalid link. Click to edit.">
+                        {currentNode.link}
+                      </button>
+                    )
                   ) : (
                     <button type="button" className="prop-empty-btn" onClick={startLinkEdit}>
                       Empty
@@ -797,6 +1235,57 @@ export default function FocusPanel({
                 </div>
               </div>
 
+              <div className="prop-row prop-row-top">
+                <div className="prop-label">ctx</div>
+                <div className="prop-value" style={{ overflow: 'visible' }}>
+                  <div ref={contextMenuRef} style={{ position: 'relative', width: '100%' }}>
+                    <button
+                      type="button"
+                      onClick={() => setContextMenuOpen((prev) => !prev)}
+                      disabled={contextSaving}
+                      className="context-select-trigger"
+                    >
+                      <span className="context-select-main">
+                        <span className="context-select-icon">
+                          <Folder size={13} />
+                        </span>
+                        <span className="context-select-text">
+                          {currentNode.context?.name || 'No context'}
+                        </span>
+                      </span>
+                      <ChevronDown size={13} className={`context-select-chevron ${contextMenuOpen ? 'open' : ''}`} />
+                    </button>
+
+                    {contextMenuOpen ? (
+                      <div className="context-select-menu">
+                        <button
+                          type="button"
+                          className={`context-option ${currentNode.context_id == null ? 'active' : ''}`}
+                          onClick={() => {
+                            void saveContext('');
+                          }}
+                        >
+                          No context
+                        </button>
+                        {availableContexts.map((context) => (
+                          <button
+                            key={context.id}
+                            type="button"
+                            className={`context-option ${currentNode.context_id === context.id ? 'active' : ''}`}
+                            onClick={() => {
+                              void saveContext(String(context.id));
+                            }}
+                          >
+                            <span>{context.name}</span>
+                            <span className="context-option-count">{context.count}</span>
+                          </button>
+                        ))}
+                      </div>
+                    ) : null}
+                  </div>
+                </div>
+              </div>
+
               {/* Dimensions */}
               <div className="prop-row prop-row-top">
                 <div className="prop-label">dime</div>
@@ -946,6 +1435,7 @@ export default function FocusPanel({
             </div>
 
             {renderSourceSection()}
+            {renderMetadataSection()}
           </div>
         )}
       </div>
@@ -993,6 +1483,21 @@ export default function FocusPanel({
           margin: 0 auto;
         }
 
+        .document-view-processed {
+          position: relative;
+        }
+
+        .document-view-processed::before {
+          content: '';
+          position: absolute;
+          top: 4px;
+          left: -14px;
+          bottom: 4px;
+          width: 2px;
+          border-radius: 999px;
+          background: linear-gradient(180deg, rgba(74, 222, 128, 0.85), rgba(74, 222, 128, 0.15));
+        }
+
         .empty-state {
           color: var(--rah-text-muted);
           font-size: 13px;
@@ -1008,6 +1513,21 @@ export default function FocusPanel({
           margin-bottom: 18px;
         }
 
+        .title-stack {
+          display: flex;
+          flex: 1;
+          min-width: 0;
+          flex-direction: column;
+          gap: 12px;
+        }
+
+        .node-status-row {
+          display: flex;
+          align-items: center;
+          gap: 10px;
+          flex-wrap: wrap;
+        }
+
         .node-meta-value {
           display: inline-flex;
           align-items: center;
@@ -1062,18 +1582,94 @@ export default function FocusPanel({
           outline: none;
         }
 
+        .processed-control {
+          display: inline-flex;
+          align-items: center;
+          gap: 8px;
+          background: rgba(255, 255, 255, 0.02);
+          border: 1px solid var(--rah-border);
+          border-radius: 999px;
+          padding: 7px 10px;
+          cursor: pointer;
+          color: var(--rah-text-base);
+          transition: border-color 140ms ease, background 140ms ease, transform 140ms ease, box-shadow 140ms ease;
+          min-width: 0;
+          font-family: inherit;
+        }
+
+        .processed-control:hover {
+          border-color: var(--rah-border-strong);
+          background: rgba(255, 255, 255, 0.04);
+          transform: translateY(-1px);
+          box-shadow: 0 10px 24px rgba(0, 0, 0, 0.18);
+        }
+
+        .processed-control.is-processed {
+          border-color: rgba(74, 222, 128, 0.26);
+          background: rgba(74, 222, 128, 0.07);
+        }
+
+        .processed-control-box {
+          width: 20px;
+          height: 20px;
+          border-radius: 999px;
+          border: 1px solid var(--rah-border-strong);
+          background: var(--rah-bg-surface);
+          display: inline-flex;
+          align-items: center;
+          justify-content: center;
+          color: transparent;
+          flex-shrink: 0;
+          transition: all 140ms ease;
+        }
+
+        .processed-control-box.is-processed {
+          border-color: rgba(74, 222, 128, 0.65);
+          background: rgba(74, 222, 128, 0.18);
+          color: #86efac;
+          box-shadow: inset 0 0 0 1px rgba(74, 222, 128, 0.15);
+        }
+
+        .processed-control-copy {
+          display: inline-flex;
+          min-width: 0;
+          text-align: left;
+        }
+
+        .processed-control-label {
+          font-size: 11px;
+          font-weight: 600;
+          color: var(--rah-text-active);
+          line-height: 1.2;
+          text-transform: lowercase;
+        }
+
+        .processed-indicator-badge {
+          display: inline-flex;
+          align-items: center;
+          padding: 4px 9px;
+          border-radius: 999px;
+          background: rgba(74, 222, 128, 0.10);
+          border: 1px solid rgba(74, 222, 128, 0.22);
+          color: #86efac;
+          font-size: 10px;
+          font-weight: 600;
+          letter-spacing: 0.04em;
+          text-transform: uppercase;
+        }
+
         .node-row-actions {
           display: flex;
           align-items: center;
-          gap: 4px;
+          gap: 6px;
           flex-shrink: 0;
           padding-right: 4px;
         }
 
         .delete-node-button {
-          color: #888;
+          color: #ef4444;
           background: transparent;
-          border: 1px solid #666;
+          border: none;
           width: 26px;
           height: 26px;
           display: inline-flex;
@@ -1082,13 +1678,13 @@ export default function FocusPanel({
           cursor: pointer;
           flex-shrink: 0;
           border-radius: 5px;
-          transition: color 120ms ease, background 120ms ease, border-color 120ms ease;
+          transition: color 120ms ease, background 120ms ease, transform 120ms ease;
         }
 
         .delete-node-button:hover:enabled {
           color: #ef4444;
-          border-color: #ef4444;
-          background: rgba(239, 68, 68, 0.1);
+          background: rgba(239, 68, 68, 0.12);
+          transform: scale(1.05);
         }
 
         /* ── Properties block ── */
@@ -1128,20 +1724,21 @@ export default function FocusPanel({
           display: inline-flex;
           align-items: center;
           justify-content: center;
-          width: 26px;
-          height: 26px;
+          width: 30px;
+          height: 30px;
           background: transparent;
-          border: 1px solid #666;
+          border: none;
           border-radius: 5px;
-          color: #888;
+          color: var(--rah-text-soft);
           font-size: 14px;
           cursor: pointer;
-          transition: color 120ms ease, background 120ms ease, border-color 120ms ease;
+          transition: color 120ms ease, background 120ms ease, transform 120ms ease;
         }
 
         .props-toggle:hover {
-          border-color: #999;
-          color: #bbb;
+          background: var(--rah-bg-hover);
+          color: var(--rah-text-active);
+          transform: scale(1.05);
         }
 
         /* Link */
@@ -1183,6 +1780,106 @@ export default function FocusPanel({
           font-family: inherit;
         }
 
+        .context-select-trigger {
+          width: 100%;
+          min-height: 34px;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          gap: 10px;
+          padding: 7px 10px;
+          border-radius: 9px;
+          border: 1px solid var(--rah-border);
+          background: var(--rah-bg-panel);
+          color: var(--rah-text-base);
+          cursor: pointer;
+          font-family: inherit;
+          transition: border-color 120ms ease, background 120ms ease;
+        }
+
+        .context-select-trigger:hover {
+          border-color: var(--rah-border-strong);
+          background: var(--rah-bg-hover);
+        }
+
+        .context-select-main {
+          display: flex;
+          align-items: center;
+          gap: 8px;
+          min-width: 0;
+          flex: 1;
+        }
+
+        .context-select-icon {
+          display: inline-flex;
+          align-items: center;
+          color: var(--rah-text-muted);
+          flex-shrink: 0;
+        }
+
+        .context-select-text {
+          min-width: 0;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          font-size: 12px;
+        }
+
+        .context-select-chevron {
+          color: var(--rah-text-muted);
+          transition: transform 120ms ease;
+          flex-shrink: 0;
+        }
+
+        .context-select-chevron.open {
+          transform: rotate(180deg);
+        }
+
+        .context-select-menu {
+          margin-top: 6px;
+          display: flex;
+          flex-direction: column;
+          gap: 2px;
+          padding: 6px;
+          border-radius: 10px;
+          border: 1px solid var(--rah-border);
+          background: var(--rah-bg-panel);
+          box-shadow: 0 14px 34px rgba(0, 0, 0, 0.22);
+        }
+
+        .context-option {
+          width: 100%;
+          min-height: 32px;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          gap: 10px;
+          padding: 0 10px;
+          border: none;
+          border-radius: 7px;
+          background: transparent;
+          color: var(--rah-text-secondary);
+          cursor: pointer;
+          font-size: 12px;
+          font-family: inherit;
+          text-align: left;
+        }
+
+        .context-option:hover,
+        .context-option.active {
+          background: var(--rah-bg-hover);
+          color: var(--rah-text-active);
+        }
+
+        .context-option-count {
+          color: var(--rah-text-muted);
+          font-size: 10px;
+          background: var(--rah-bg-active);
+          padding: 1px 6px;
+          border-radius: 999px;
+          flex-shrink: 0;
+        }
+
         .prop-muted {
           color: var(--rah-text-muted);
           font-size: 12px;
@@ -1313,6 +2010,82 @@ export default function FocusPanel({
 
         .conn-add-btn:hover { color: var(--rah-accent-green); }
 
+        .metadata-group {
+          display: flex;
+          flex-direction: column;
+          gap: 8px;
+          min-width: 0;
+          width: 100%;
+          overflow: hidden;
+        }
+
+        .metadata-group-label {
+          font-size: 10px;
+          color: var(--rah-text-muted);
+          text-transform: uppercase;
+          letter-spacing: 0.08em;
+          font-weight: 600;
+        }
+
+        .metadata-grid {
+          display: grid;
+          grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
+          gap: 8px;
+          width: 100%;
+          min-width: 0;
+          overflow: hidden;
+        }
+
+        .metadata-card {
+          display: flex;
+          flex-direction: column;
+          gap: 4px;
+          padding: 10px 12px;
+          border-radius: 10px;
+          background: rgba(255, 255, 255, 0.025);
+          border: 1px solid var(--rah-border);
+          min-width: 0;
+          overflow: hidden;
+        }
+
+        .metadata-key {
+          font-size: 10px;
+          color: var(--rah-text-muted);
+          text-transform: uppercase;
+          letter-spacing: 0.08em;
+          font-weight: 600;
+        }
+
+        .metadata-value {
+          font-size: 12px;
+          color: var(--rah-text-base);
+          line-height: 1.45;
+          word-break: break-word;
+          overflow-wrap: anywhere;
+          min-width: 0;
+        }
+
+        .metadata-raw {
+          margin: 0;
+          padding: 12px 14px;
+          border-radius: 12px;
+          background: rgba(0, 0, 0, 0.24);
+          border: 1px solid var(--rah-border);
+          color: var(--rah-text-soft);
+          font-size: 11px;
+          line-height: 1.55;
+          white-space: pre-wrap;
+          word-break: break-word;
+          overflow-wrap: anywhere;
+          overflow: hidden;
+          width: 100%;
+          min-width: 0;
+          max-width: 100%;
+          box-sizing: border-box;
+          display: block;
+          font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, monospace;
+        }
+
         /* ── Description in property ── */
         .desc-read-wrap {
           position: relative;
diff --git a/src/components/layout/LeftToolbar.tsx b/src/components/layout/LeftToolbar.tsx
index 0f3dfbd..6c95a06 100644
--- a/src/components/layout/LeftToolbar.tsx
+++ b/src/components/layout/LeftToolbar.tsx
@@ -8,6 +8,8 @@ import {
   LayoutList,
   Map,
   Folder,
+  ChevronDown,
+  ChevronRight,
   Table2,
   BookOpen,
   Settings,
@@ -18,6 +20,7 @@ import {
 } from 'lucide-react';
 import type { PaneType, NavigablePaneType } from '../panes/types';
 import type { Theme } from '@/hooks/useTheme';
+import type { ContextSummary } from '@/types/database';
 
 interface LeftToolbarProps {
   onSearchClick: () => void;
@@ -31,6 +34,8 @@ interface LeftToolbarProps {
   activeTabType: PaneType | null;
   theme: Theme;
   onThemeToggle: () => void;
+  contexts?: ContextSummary[];
+  onContextQuickSelect?: (contextId: number, contextName: string) => void;
 }
 
 const NAV_WIDTH_COLLAPSED = 50;
@@ -113,7 +118,11 @@ export default function LeftToolbar({
   activeTabType,
   theme,
   onThemeToggle,
+  contexts = [],
+  onContextQuickSelect,
 }: LeftToolbarProps) {
+  const [contextsExpanded, setContextsExpanded] = useState(false);
+
   return (
     <div
       style={{
@@ -148,6 +157,77 @@ export default function LeftToolbar({
         <div style={{ flex: 1, display: 'flex', flexDirection: 'column', justifyContent: 'center', minHeight: 0 }}>
           <div style={{ borderTop: '1px solid var(--rah-border)', paddingTop: '14px' }}>
             <div style={{ display: 'flex', flexDirection: 'column', gap: '4px' }}>
+              <div style={{ display: 'flex', flexDirection: 'column', gap: '4px', marginBottom: '6px' }}>
+                <div style={{ display: 'flex', alignItems: 'center', gap: '4px' }}>
+                  <div style={{ flex: 1, minWidth: 0 }}>
+                    <NavButton
+                      icon={Folder}
+                      label="Contexts"
+                      expanded={isExpanded}
+                      active={activeTabType === 'contexts' || openTabTypes.has('contexts')}
+                      onClick={() => onPaneTypeClick('contexts')}
+                      activeTone="green"
+                    />
+                  </div>
+                  {isExpanded ? (
+                    <button
+                      type="button"
+                      onClick={() => setContextsExpanded((prev) => !prev)}
+                      style={{
+                        width: '28px',
+                        height: '36px',
+                        borderRadius: '8px',
+                        border: 'none',
+                        background: contextsExpanded ? 'var(--rah-bg-hover)' : 'transparent',
+                        color: contextsExpanded ? 'var(--rah-text-active)' : 'var(--rah-text-muted)',
+                        display: 'flex',
+                        alignItems: 'center',
+                        justifyContent: 'center',
+                        cursor: 'pointer',
+                        flexShrink: 0,
+                      }}
+                      title="Toggle context list"
+                    >
+                      {contextsExpanded ? <ChevronDown size={16} /> : <ChevronRight size={16} />}
+                    </button>
+                  ) : null}
+                </div>
+
+                {isExpanded && contextsExpanded && contexts.length > 0 ? (
+                  <div style={{ marginLeft: '14px', paddingLeft: '12px', borderLeft: '1px solid var(--rah-border)', display: 'flex', flexDirection: 'column', gap: '2px' }}>
+                    {contexts.map((context) => (
+                      <button
+                        key={context.id}
+                        type="button"
+                        onClick={() => onContextQuickSelect?.(context.id, context.name)}
+                        style={{
+                          display: 'flex',
+                          alignItems: 'center',
+                          justifyContent: 'space-between',
+                          gap: '8px',
+                          width: '100%',
+                          minHeight: '28px',
+                          border: 'none',
+                          background: 'transparent',
+                          color: 'var(--rah-text-secondary)',
+                          cursor: 'pointer',
+                          padding: '0 8px',
+                          borderRadius: '8px',
+                          textAlign: 'left',
+                        }}
+                      >
+                        <span style={{ fontSize: '12px', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}>
+                          {context.name}
+                        </span>
+                        <span style={{ fontSize: '10px', color: 'var(--rah-text-muted)', flexShrink: 0 }}>
+                          {context.count}
+                        </span>
+                      </button>
+                    ))}
+                  </div>
+                ) : null}
+              </div>
+
               {VIEW_ITEMS.map((item) => (
                 <NavButton
                   key={`${item.paneType}-${item.label}`}
diff --git a/src/components/layout/ThreePanelLayout.tsx b/src/components/layout/ThreePanelLayout.tsx
index ffaa70f..31672ad 100644
--- a/src/components/layout/ThreePanelLayout.tsx
+++ b/src/components/layout/ThreePanelLayout.tsx
@@ -4,7 +4,7 @@ import { useState, useCallback, useEffect, useRef, useMemo } from 'react';
 import { PanelLeftOpen, GripVertical, X } from 'lucide-react';
 import SettingsModal, { SettingsTab } from '../settings/SettingsModal';
 import SearchModal from '../nodes/SearchModal';
-import { Node } from '@/types/database';
+import { ContextSummary, Node } from '@/types/database';
 import { DatabaseEvent } from '@/services/events';
 import { usePersistentState } from '@/hooks/usePersistentState';
 import { useTheme } from '@/hooks/useTheme';
@@ -12,7 +12,7 @@ import { useTheme } from '@/hooks/useTheme';
 import LeftToolbar from './LeftToolbar';
 import SplitHandle from './SplitHandle';
 
-import { NodePane, DimensionsPane, MapPane, ViewsPane, TablePane, SkillsPane } from '../panes';
+import { NodePane, ContextsPane, DimensionsPane, MapPane, ViewsPane, TablePane, SkillsPane } from '../panes';
 import QuickAddInput from '../agents/QuickAddInput';
 import type { PaneType, SlotState, PaneAction, SlotId } from '../panes/types';
 
@@ -35,10 +35,11 @@ const PANEL_A_WEIGHT_KEY = 'ui.panelA.weight.v1';
 const PANEL_B_WEIGHT_KEY = 'ui.panelB.weight.v1';
 const PANEL_C_WEIGHT_KEY = 'ui.panelC.weight.v1';
 const LEFT_NAV_EXPANDED_KEY = 'ui.leftNavExpanded';
+const ACTIVE_CONTEXT_KEY = 'ui.focus.activeContextId';
 const ACTIVE_DIMENSION_KEY = 'ui.focus.activeDimension';
 
 const DEFAULT_SLOT_A: SlotState = { type: 'views' };
-const VALID_PANE_TYPES = new Set<PaneType>(['node', 'dimensions', 'map', 'views', 'table', 'skills']);
+const VALID_PANE_TYPES = new Set<PaneType>(['node', 'contexts', 'dimensions', 'map', 'views', 'table', 'skills']);
 
 function normalizeSlotState(raw: SlotState | null): SlotState | null {
   if (!raw) return null;
@@ -84,7 +85,14 @@ export default function ThreePanelLayout() {
   const [nodesPanelRefresh, setNodesPanelRefresh] = useState(0);
   const [focusPanelRefresh, setFocusPanelRefresh] = useState(0);
   const [folderViewRefresh, setFolderViewRefresh] = useState(0);
+  const [availableContexts, setAvailableContexts] = useState<ContextSummary[]>([]);
+  const [activeContextId, setActiveContextId] = usePersistentState<number | null>(ACTIVE_CONTEXT_KEY, null);
   const [activeDimension, setActiveDimension] = usePersistentState<string | null>(ACTIVE_DIMENSION_KEY, null);
+  const [browseContextFilters, setBrowseContextFilters] = useState<Record<SlotId, number | null>>({
+    A: null,
+    B: null,
+    C: null,
+  });
   const [browseDimensionFilters, setBrowseDimensionFilters] = useState<Record<SlotId, string | null>>({
     A: null,
     B: null,
@@ -104,6 +112,20 @@ export default function ThreePanelLayout() {
     setSlotC((prev) => normalizeSlotState(prev));
   }, [setSlotA, setSlotB, setSlotC]);
 
+  useEffect(() => {
+    void (async () => {
+      try {
+        const response = await fetch('/api/contexts');
+        const data = await response.json();
+        if (response.ok && data.success) {
+          setAvailableContexts(data.data || []);
+        }
+      } catch (error) {
+        console.error('Failed to fetch contexts:', error);
+      }
+    })();
+  }, [nodesPanelRefresh, folderViewRefresh]);
+
   const getSlotState = useCallback((slot: SlotId): SlotState | null => {
     switch (slot) {
       case 'A':
@@ -549,6 +571,17 @@ export default function ThreePanelLayout() {
     openNodeFromSlot(nodeId, 'A');
   }, [openNodeFromSlot]);
 
+  const handleContextSelect = useCallback((slot: SlotId, contextId: number | null, _contextName?: string | null) => {
+    setBrowseContextFilters((prev) => ({ ...prev, [slot]: contextId }));
+    setActiveContextId(contextId);
+
+    if (contextId == null) return;
+
+    setPanelExpanded(slot, true);
+    getSlotSetter(slot)({ type: 'views' });
+    setActivePane(slot);
+  }, [getSlotSetter, setActiveContextId, setPanelExpanded]);
+
   const handleDimensionPaneSelect = useCallback((slot: SlotId, dimensionName: string | null) => {
     setBrowseDimensionFilters((prev) => ({ ...prev, [slot]: dimensionName }));
     setActiveDimension(dimensionName);
@@ -565,7 +598,7 @@ export default function ThreePanelLayout() {
       const response = await fetch('/api/quick-add', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ input, mode, description }),
+        body: JSON.stringify({ input, mode, description, contextId: activeContextId }),
       });
 
       if (!response.ok) {
@@ -591,7 +624,7 @@ export default function ThreePanelLayout() {
     } catch (error) {
       console.error('[ThreePanelLayout] Quick Add error:', error);
     }
-  }, [openPaneSingleton]);
+  }, [activeContextId, openPaneSingleton]);
 
   const handleCloseSlotA = useCallback(() => {
     setSlotA(null);
@@ -619,11 +652,20 @@ export default function ThreePanelLayout() {
           setActivePane(slot);
         }
         break;
+      case 'open-context':
+        handleContextSelect(action.targetSlot ?? slot, action.contextId, action.contextName);
+        break;
+      case 'open-dimension':
+        setBrowseDimensionFilters((prev) => ({ ...prev, [action.targetSlot ?? slot]: action.dimension }));
+        setActiveDimension(action.dimension);
+        setSingletonPaneInSlot(action.targetSlot ?? slot, 'views');
+        setActivePane(action.targetSlot ?? slot);
+        break;
       case 'open-node':
         openNodeFromSlot(action.nodeId, slot);
         break;
     }
-  }, [openNodeFromSlot, setSingletonPaneInSlot]);
+  }, [handleContextSelect, openNodeFromSlot, setActiveDimension, setSingletonPaneInSlot]);
 
   const handleSearchNodeSelect = useCallback((nodeId: number) => {
     handleNodeSelect(nodeId, false);
@@ -758,6 +800,18 @@ export default function ThreePanelLayout() {
           />
         );
 
+      case 'contexts':
+        return (
+          <ContextsPane
+            slot={slot}
+            isActive={isActive}
+            onPaneAction={(action) => handleSlotAction(slot, action)}
+            onCollapse={onCollapse}
+            onSwapPanes={handleSwapPanes}
+            onContextSelect={(contextId, contextName) => handleContextSelect(slot, contextId, contextName)}
+          />
+        );
+
       case 'dimensions':
         return (
           <DimensionsPane
@@ -802,7 +856,16 @@ export default function ThreePanelLayout() {
             refreshToken={nodesPanelRefresh}
             pendingNodes={pendingNodes}
             onDismissPending={(id) => setPendingNodes(prev => prev.filter(p => p.id !== id))}
+            externalContextFilterId={browseContextFilters[slot]}
             externalDimensionFilter={browseDimensionFilters[slot]}
+            onContextFilterSelect={(contextId) => {
+              setBrowseContextFilters((prev) => ({ ...prev, [slot]: contextId }));
+              setActiveContextId(contextId);
+            }}
+            onClearExternalContextFilter={() => {
+              setBrowseContextFilters((prev) => ({ ...prev, [slot]: null }));
+              setActiveContextId(null);
+            }}
             onClearExternalDimensionFilter={() => {
               setBrowseDimensionFilters((prev) => ({ ...prev, [slot]: null }));
               setActiveDimension(null);
@@ -985,6 +1048,15 @@ export default function ThreePanelLayout() {
         onRefreshClick={handleRefreshAll}
         theme={theme}
         onThemeToggle={toggleTheme}
+        contexts={availableContexts}
+        onContextQuickSelect={(contextId, contextName) => {
+          const target = openPaneSingleton('views', 'A');
+          setBrowseContextFilters((prev) => ({ ...prev, [target]: contextId }));
+          setBrowseDimensionFilters((prev) => ({ ...prev, [target]: null }));
+          setActiveContextId(contextId);
+          setActivePane(target);
+          void contextName;
+        }}
       />
 
       <div
diff --git a/src/components/panes/ContextsPane.tsx b/src/components/panes/ContextsPane.tsx
new file mode 100644
index 0000000..0f79ddf
--- /dev/null
+++ b/src/components/panes/ContextsPane.tsx
@@ -0,0 +1,124 @@
+"use client";
+
+import { useEffect, useState } from 'react';
+import { Folder } from 'lucide-react';
+import type { ContextSummary } from '@/types/database';
+import PaneHeader from './PaneHeader';
+import type { ContextsPaneProps } from './types';
+
+export default function ContextsPane({
+  slot,
+  onCollapse,
+  onSwapPanes,
+  tabBar,
+  onContextSelect,
+}: ContextsPaneProps) {
+  const [contexts, setContexts] = useState<ContextSummary[]>([]);
+  const [loading, setLoading] = useState(true);
+  const [toolbarHost, setToolbarHost] = useState<HTMLDivElement | null>(null);
+
+  useEffect(() => {
+    void (async () => {
+      setLoading(true);
+      try {
+        const response = await fetch('/api/contexts');
+        const payload = await response.json();
+        if (response.ok && payload.success) {
+          setContexts(payload.data || []);
+        }
+      } finally {
+        setLoading(false);
+      }
+    })();
+  }, []);
+
+  return (
+    <div style={{ height: '100%', display: 'flex', flexDirection: 'column', background: 'transparent', overflow: 'hidden' }}>
+      <PaneHeader
+        slot={slot}
+        onCollapse={onCollapse}
+        onSwapPanes={onSwapPanes}
+        tabBar={tabBar}
+        toolbarHostRef={setToolbarHost}
+      />
+
+      <div style={{ flex: 1, minHeight: 0, overflow: 'auto', padding: '12px' }}>
+        <div style={{ maxWidth: '980px', margin: '0 auto', display: 'flex', flexDirection: 'column', gap: '8px' }}>
+          {loading ? (
+            <div style={emptyStateStyle}>Loading contexts...</div>
+          ) : contexts.length === 0 ? (
+            <div style={emptyStateStyle}>No contexts yet.</div>
+          ) : (
+            contexts.map((context) => (
+              <button
+                key={context.id}
+                type="button"
+                onClick={() => onContextSelect?.(context.id, context.name)}
+                style={rowStyle}
+              >
+                <div style={iconWrapStyle}>
+                  <Folder size={17} />
+                </div>
+                <div style={{ minWidth: 0, flex: 1, textAlign: 'left' }}>
+                  <div style={{ display: 'flex', alignItems: 'center', gap: '10px', minWidth: 0, flexWrap: 'wrap' }}>
+                    <span style={{ fontSize: '14px', fontWeight: 600, color: 'var(--rah-text-primary)' }}>{context.name}</span>
+                    <span style={countStyle}>{context.count}</span>
+                  </div>
+                  {context.description ? (
+                    <div style={{ marginTop: '4px', fontSize: '12px', color: 'var(--rah-text-secondary)', lineHeight: 1.45 }}>
+                      {context.description}
+                    </div>
+                  ) : null}
+                </div>
+              </button>
+            ))
+          )}
+        </div>
+      </div>
+    </div>
+  );
+}
+
+const rowStyle: React.CSSProperties = {
+  width: '100%',
+  display: 'flex',
+  alignItems: 'center',
+  gap: '12px',
+  padding: '12px 14px',
+  border: '1px solid var(--rah-border)',
+  borderRadius: '12px',
+  background: 'var(--rah-bg-card)',
+  cursor: 'pointer',
+};
+
+const iconWrapStyle: React.CSSProperties = {
+  width: '32px',
+  height: '32px',
+  display: 'inline-flex',
+  alignItems: 'center',
+  justifyContent: 'center',
+  borderRadius: '10px',
+  border: '1px solid var(--rah-border)',
+  background: 'var(--rah-bg-panel)',
+  color: 'var(--rah-text-muted)',
+  flexShrink: 0,
+};
+
+const countStyle: React.CSSProperties = {
+  fontSize: '10px',
+  lineHeight: 1.2,
+  padding: '3px 7px',
+  borderRadius: '999px',
+  border: '1px solid var(--rah-border)',
+  background: 'var(--rah-bg-panel)',
+  color: 'var(--rah-text-muted)',
+};
+
+const emptyStateStyle: React.CSSProperties = {
+  border: '1px dashed var(--rah-border-strong)',
+  borderRadius: '12px',
+  padding: '16px',
+  color: 'var(--rah-text-muted)',
+  fontSize: '13px',
+  background: 'var(--rah-bg-card)',
+};
diff --git a/src/components/panes/NodePane.tsx b/src/components/panes/NodePane.tsx
index 6c2ceff..9cd754f 100644
--- a/src/components/panes/NodePane.tsx
+++ b/src/components/panes/NodePane.tsx
@@ -17,6 +17,7 @@ export default function NodePane({
   onPaneAction,
   onCollapse,
   onSwapPanes,
+  tabBar,
   openTabs,
   activeTab,
   onTabSelect,
@@ -92,76 +93,76 @@ export default function NodePane({
       background: 'transparent',
       overflow: 'hidden',
     }}>
-      <PaneHeader slot={slot} onCollapse={onCollapse} onSwapPanes={onSwapPanes}>
-        {/* Tabs rendered inline */}
-        {openTabs.length === 0 ? (
-          <span style={{ fontSize: '12px', color: 'var(--rah-text-muted)' }}>No tabs open</span>
-        ) : (
-          openTabs.map((tabId) => {
-            const title = nodeTitles[tabId] || 'Loading...';
-            const isActiveTab = activeTab === tabId;
-            return (
-              <div
-                key={tabId}
-                draggable
-                onDragStart={(e) => {
-                  e.dataTransfer.effectAllowed = 'copyMove';
-                  e.dataTransfer.setData('application/x-rah-tab', JSON.stringify({ id: tabId, title, sourceSlot: slot }));
-                  e.dataTransfer.setData('text/plain', `[NODE:${tabId}:"${title}"]`);
-                }}
-                onContextMenu={(e) => {
-                  e.preventDefault();
-                  setContextMenu({ x: e.clientX, y: e.clientY, tabId });
-                }}
-                style={{
-                  display: 'flex',
-                  alignItems: 'center',
-                  gap: '4px',
-                  padding: '4px 8px',
-                  background: isActiveTab ? 'var(--rah-bg-active)' : 'transparent',
-                  borderRadius: '4px',
-                  cursor: 'grab',
-                  flexShrink: 0,
-                }}
-              >
-                <button
-                  onClick={() => onTabSelect(tabId)}
-                  style={{
-                    fontSize: '11px',
-                    color: isActiveTab ? 'var(--rah-text-active)' : 'var(--rah-text-muted)',
-                    background: 'transparent',
-                    border: 'none',
-                    cursor: 'pointer',
-                    padding: 0,
-                    whiteSpace: 'nowrap',
+      <PaneHeader slot={slot} onCollapse={onCollapse} onSwapPanes={onSwapPanes} tabBar={tabBar ? tabBar : (
+          /* Legacy node tabs (fallback when no tabBar prop) */
+          openTabs.length === 0 ? (
+            <span style={{ fontSize: '12px', color: '#666' }}>No tabs open</span>
+          ) : (
+            openTabs.map((tabId) => {
+              const title = nodeTitles[tabId] || 'Loading...';
+              const isActiveTab = activeTab === tabId;
+              return (
+                <div
+                  key={tabId}
+                  draggable
+                  onDragStart={(e) => {
+                    e.dataTransfer.effectAllowed = 'copyMove';
+                    e.dataTransfer.setData('application/x-rah-tab', JSON.stringify({ id: tabId, title, sourceSlot: slot }));
+                    e.dataTransfer.setData('text/plain', `[NODE:${tabId}:"${title}"]`);
                   }}
-                >
-                  {truncateTitle(title)}
-                </button>
-                <button
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    onTabClose(tabId);
+                  onContextMenu={(e) => {
+                    e.preventDefault();
+                    setContextMenu({ x: e.clientX, y: e.clientY, tabId });
                   }}
                   style={{
-                    fontSize: '12px',
-                    color: 'var(--rah-text-muted)',
-                    background: 'transparent',
-                    border: 'none',
-                    cursor: 'pointer',
-                    padding: '0 2px',
-                    lineHeight: 1,
+                    display: 'flex',
+                    alignItems: 'center',
+                    gap: '4px',
+                    padding: '4px 8px',
+                    background: isActiveTab ? '#1f1f1f' : 'transparent',
+                    borderRadius: '4px',
+                    cursor: 'grab',
+                    flexShrink: 0,
                   }}
-                  onMouseEnter={(e) => { e.currentTarget.style.color = 'var(--rah-text-active)'; }}
-                  onMouseLeave={(e) => { e.currentTarget.style.color = 'var(--rah-text-muted)'; }}
                 >
-                  ×
-                </button>
-              </div>
-            );
-          })
-        )}
-      </PaneHeader>
+                  <button
+                    onClick={() => onTabSelect(tabId)}
+                    style={{
+                      fontSize: '11px',
+                      color: isActiveTab ? '#fff' : '#888',
+                      background: 'transparent',
+                      border: 'none',
+                      cursor: 'pointer',
+                      padding: 0,
+                      whiteSpace: 'nowrap',
+                    }}
+                  >
+                    {truncateTitle(title)}
+                  </button>
+                  <button
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      onTabClose(tabId);
+                    }}
+                    style={{
+                      fontSize: '12px',
+                      color: '#666',
+                      background: 'transparent',
+                      border: 'none',
+                      cursor: 'pointer',
+                      padding: '0 2px',
+                      lineHeight: 1,
+                    }}
+                    onMouseEnter={(e) => { e.currentTarget.style.color = '#fff'; }}
+                    onMouseLeave={(e) => { e.currentTarget.style.color = '#666'; }}
+                  >
+                    ×
+                  </button>
+                </div>
+              );
+            })
+          )
+        )} />
 
       <div style={{ flex: 1, minHeight: 0, overflow: 'hidden' }}>
         <FocusPanel
@@ -171,11 +172,8 @@ export default function NodePane({
           onNodeClick={onNodeClick}
           onTabClose={onTabClose}
           refreshTrigger={refreshTrigger}
-          onReorderTabs={onReorderTabs}
-          onOpenInOtherSlot={onOpenInOtherSlot}
           onTextSelect={onTextSelect}
           highlightedPassage={highlightedPassage}
-          hideTabBar
         />
       </div>
 
@@ -186,8 +184,8 @@ export default function NodePane({
             position: 'fixed',
             top: contextMenu.y,
             left: contextMenu.x,
-            background: 'var(--rah-bg-active)',
-            border: '1px solid var(--rah-border-strong)',
+            background: '#1a1a1a',
+            border: '1px solid #2a2a2a',
             borderRadius: '6px',
             padding: '4px',
             zIndex: 9999,
@@ -211,18 +209,18 @@ export default function NodePane({
                 background: 'transparent',
                 border: 'none',
                 borderRadius: '4px',
-                color: 'var(--rah-text-secondary)',
+                color: '#ccc',
                 fontSize: '12px',
                 cursor: 'pointer',
                 textAlign: 'left',
               }}
               onMouseEnter={(e) => {
-                e.currentTarget.style.background = 'var(--rah-bg-active)';
-                e.currentTarget.style.color = 'var(--rah-text-active)';
+                e.currentTarget.style.background = '#2a2a2a';
+                e.currentTarget.style.color = '#fff';
               }}
               onMouseLeave={(e) => {
                 e.currentTarget.style.background = 'transparent';
-                e.currentTarget.style.color = 'var(--rah-text-secondary)';
+                e.currentTarget.style.color = '#ccc';
               }}
             >
               <span style={{ fontSize: '14px' }}>↗</span>
@@ -243,18 +241,18 @@ export default function NodePane({
               background: 'transparent',
               border: 'none',
               borderRadius: '4px',
-              color: 'var(--rah-text-secondary)',
+              color: '#ccc',
               fontSize: '12px',
               cursor: 'pointer',
               textAlign: 'left',
             }}
             onMouseEnter={(e) => {
-              e.currentTarget.style.background = 'var(--rah-bg-active)';
-              e.currentTarget.style.color = 'var(--rah-text-active)';
+              e.currentTarget.style.background = '#2a2a2a';
+              e.currentTarget.style.color = '#fff';
             }}
             onMouseLeave={(e) => {
               e.currentTarget.style.background = 'transparent';
-              e.currentTarget.style.color = 'var(--rah-text-secondary)';
+              e.currentTarget.style.color = '#ccc';
             }}
           >
             <span style={{ fontSize: '14px' }}>×</span>
diff --git a/src/components/panes/ViewsPane.tsx b/src/components/panes/ViewsPane.tsx
index b866032..fcc8f86 100644
--- a/src/components/panes/ViewsPane.tsx
+++ b/src/components/panes/ViewsPane.tsx
@@ -12,7 +12,10 @@ export interface ViewsPaneProps extends BasePaneProps {
   refreshToken?: number;
   pendingNodes?: PendingNode[];
   onDismissPending?: (id: string) => void;
+  externalContextFilterId?: number | null;
   externalDimensionFilter?: string | null;
+  onContextFilterSelect?: (contextId: number | null, contextName?: string | null) => void;
+  onClearExternalContextFilter?: () => void;
   onClearExternalDimensionFilter?: () => void;
 }
 
@@ -28,7 +31,10 @@ export default function ViewsPane({
   refreshToken,
   pendingNodes,
   onDismissPending,
+  externalContextFilterId,
   externalDimensionFilter,
+  onContextFilterSelect,
+  onClearExternalContextFilter,
   onClearExternalDimensionFilter,
 }: ViewsPaneProps) {
   const [toolbarHost, setToolbarHost] = useState<HTMLDivElement | null>(null);
@@ -58,7 +64,10 @@ export default function ViewsPane({
           refreshToken={refreshToken}
           pendingNodes={pendingNodes}
           onDismissPending={onDismissPending}
+          externalContextFilterId={externalContextFilterId}
           externalDimensionFilter={externalDimensionFilter}
+          onContextFilterSelect={onContextFilterSelect}
+          onClearExternalContextFilter={onClearExternalContextFilter}
           onClearExternalDimensionFilter={onClearExternalDimensionFilter}
           toolbarHost={toolbarHost}
         />
diff --git a/src/components/panes/index.ts b/src/components/panes/index.ts
index 4d3ca36..4875bce 100644
--- a/src/components/panes/index.ts
+++ b/src/components/panes/index.ts
@@ -1,4 +1,5 @@
 export { default as NodePane } from './NodePane';
+export { default as ContextsPane } from './ContextsPane';
 export { default as DimensionsPane } from './DimensionsPane';
 export { default as MapPane } from './MapPane';
 export { default as ViewsPane } from './ViewsPane';
diff --git a/src/components/panes/types.ts b/src/components/panes/types.ts
index d94ffe0..39a2572 100644
--- a/src/components/panes/types.ts
+++ b/src/components/panes/types.ts
@@ -18,7 +18,7 @@ export type AgentDelegation = {
 };
 
 // Pane types (chat removed in rah-light)
-export type PaneType = 'node' | 'dimensions' | 'map' | 'views' | 'table' | 'skills';
+export type PaneType = 'node' | 'contexts' | 'dimensions' | 'map' | 'views' | 'table' | 'skills';
 
 // State for each slot
 export interface SlotState {
@@ -34,6 +34,7 @@ export interface SlotState {
 // Actions panes can emit to the layout
 export type PaneAction =
   | { type: 'open-node'; nodeId: number; targetSlot?: SlotId }
+  | { type: 'open-context'; contextId: number | null; contextName?: string | null; targetSlot?: SlotId }
   | { type: 'open-dimension'; dimension: string; targetSlot?: SlotId }
   | { type: 'switch-pane-type'; paneType: PaneType }
   | { type: 'close-pane' };
@@ -90,10 +91,17 @@ export interface ViewsPaneProps extends BasePaneProps {
   onNodeClick: (nodeId: number) => void;
   onNodeOpenInOtherPane?: (nodeId: number) => void;
   refreshToken?: number;
+  externalContextFilterId?: number | null;
   externalDimensionFilter?: string | null;
+  onContextFilterSelect?: (contextId: number | null, contextName?: string | null) => void;
+  onClearExternalContextFilter?: () => void;
   onClearExternalDimensionFilter?: () => void;
 }
 
+export interface ContextsPaneProps extends BasePaneProps {
+  onContextSelect?: (contextId: number | null, contextName?: string | null) => void;
+}
+
 // TablePane specific props
 export interface TablePaneProps extends BasePaneProps {
   onNodeClick: (nodeId: number) => void;
@@ -113,6 +121,7 @@ export interface PaneHeaderProps {
 // Labels for pane types
 export const PANE_LABELS: Record<PaneType, string> = {
   node: 'Nodes',
+  contexts: 'Contexts',
   dimensions: 'Dimensions',
   map: 'Map',
   views: 'Feed',
diff --git a/src/components/settings/ContextViewer.tsx b/src/components/settings/ContextViewer.tsx
index d5e969f..9a44af5 100644
--- a/src/components/settings/ContextViewer.tsx
+++ b/src/components/settings/ContextViewer.tsx
@@ -73,7 +73,7 @@ export default function ContextViewer() {
   return (
     <div style={containerStyle}>
       <p style={descStyle}>
-        Top 10 most-connected nodes are added to background context for tool execution.
+        Context summaries and anchor nodes are used first. Global hub nodes remain secondary diagnostics in background context.
       </p>
 
       {/* Toggle */}
diff --git a/src/components/views/GridView.tsx b/src/components/views/GridView.tsx
index 3a35fae..fb780c5 100644
--- a/src/components/views/GridView.tsx
+++ b/src/components/views/GridView.tsx
@@ -3,6 +3,7 @@
 import { Node } from '@/types/database';
 import { getNodeIcon } from '@/utils/nodeIcons';
 import { useDimensionIcons } from '@/context/DimensionIconsContext';
+import { getNodeProcessedState } from '@/services/nodes/metadata';
 
 interface GridViewProps {
   nodes: Node[];
@@ -43,7 +44,11 @@ export default function GridView({ nodes, onNodeClick }: GridViewProps) {
         gridTemplateColumns: 'repeat(auto-fill, minmax(240px, 1fr))',
         gap: '12px'
       }}>
-        {nodes.map(node => (
+        {nodes.map(node => {
+          const processedState = getNodeProcessedState(node.metadata);
+          const isProcessed = processedState === 'processed';
+
+          return (
             <button
               key={node.id}
               onClick={() => onNodeClick(node.id)}
@@ -51,13 +56,14 @@ export default function GridView({ nodes, onNodeClick }: GridViewProps) {
                 display: 'flex',
                 flexDirection: 'column',
                 padding: '16px',
-                background: '#0a0a0a',
-                border: '1px solid #1a1a1a',
+                background: isProcessed ? 'rgba(34, 58, 42, 0.45)' : '#0a0a0a',
+                border: `1px solid ${isProcessed ? 'rgba(74, 222, 128, 0.28)' : '#1a1a1a'}`,
                 borderRadius: '8px',
                 cursor: 'pointer',
                 textAlign: 'left',
                 transition: 'all 0.2s',
-                minHeight: '140px'
+                minHeight: '140px',
+                opacity: isProcessed ? 0.84 : 1
               }}
               onMouseEnter={(e) => {
                 e.currentTarget.style.background = '#111';
@@ -103,6 +109,15 @@ export default function GridView({ nodes, onNodeClick }: GridViewProps) {
                 </div>
               </div>
 
+              <div style={{
+                marginBottom: '10px',
+                fontSize: '10px',
+                color: isProcessed ? '#86efac' : '#888',
+                textTransform: 'lowercase'
+              }}>
+                {processedState}
+              </div>
+
               {/* Description or Content Preview */}
               {(node.description || node.source) && (
                 <div style={{
@@ -154,7 +169,8 @@ export default function GridView({ nodes, onNodeClick }: GridViewProps) {
                 </div>
               )}
             </button>
-        ))}
+          );
+        })}
       </div>
     </div>
   );
diff --git a/src/components/views/ListView.tsx b/src/components/views/ListView.tsx
index dd8fc4c..87e83dc 100644
--- a/src/components/views/ListView.tsx
+++ b/src/components/views/ListView.tsx
@@ -5,6 +5,7 @@ import { Node } from '@/types/database';
 import { getNodeIcon } from '@/utils/nodeIcons';
 import { useDimensionIcons } from '@/context/DimensionIconsContext';
 import { formatRelativeDate } from '@/utils/formatDate';
+import { getNodeProcessedState } from '@/services/nodes/metadata';
 
 interface ListViewProps {
   nodes: Node[];
@@ -48,7 +49,11 @@ export default function ListView({ nodes, onNodeClick }: ListViewProps) {
       overflowY: 'auto',
       padding: '8px'
     }}>
-      {nodes.map(node => (
+      {nodes.map(node => {
+        const processedState = getNodeProcessedState(node.metadata);
+        const isProcessed = processedState === 'processed';
+
+        return (
           <button
             key={node.id}
             onClick={() => onNodeClick(node.id)}
@@ -59,13 +64,14 @@ export default function ListView({ nodes, onNodeClick }: ListViewProps) {
               gap: '12px',
               padding: '12px',
               marginBottom: '4px',
-              background: 'var(--rah-bg-base)',
+              background: isProcessed ? 'var(--rah-bg-subtle, var(--rah-bg-base))' : 'var(--rah-bg-base)',
               border: '1px solid var(--rah-border)',
-              borderLeft: '2px solid var(--rah-border-stronger)',
+              borderLeft: `2px solid ${isProcessed ? 'var(--rah-accent-green, #4ade80)' : 'var(--rah-border-stronger)'}`,
               borderRadius: '6px',
               cursor: 'pointer',
               textAlign: 'left',
-              transition: 'all 0.15s ease'
+              transition: 'all 0.15s ease',
+              opacity: isProcessed ? 0.82 : 1
             }}
             onMouseEnter={(e) => {
               e.currentTarget.style.background = 'var(--rah-bg-surface)';
@@ -132,6 +138,16 @@ export default function ListView({ nodes, onNodeClick }: ListViewProps) {
                 gap: '12px',
                 flexWrap: 'wrap'
               }}>
+                <span style={{
+                  padding: '2px 8px',
+                  background: isProcessed ? 'rgba(74, 222, 128, 0.10)' : 'var(--rah-bg-active)',
+                  border: `1px solid ${isProcessed ? 'rgba(74, 222, 128, 0.35)' : 'var(--rah-border-strong)'}`,
+                  borderRadius: '999px',
+                  fontSize: '11px',
+                  color: isProcessed ? 'var(--rah-accent-green, #4ade80)' : 'var(--rah-text-muted)'
+                }}>
+                  {processedState}
+                </span>
                 {/* Dimensions */}
                 {node.dimensions && node.dimensions.length > 0 && (
                   <div style={{
@@ -186,7 +202,8 @@ export default function ListView({ nodes, onNodeClick }: ListViewProps) {
               </div>
             </div>
           </button>
-      ))}
+        );
+      })}
     </div>
   );
 }
diff --git a/src/components/views/ViewsOverlay.tsx b/src/components/views/ViewsOverlay.tsx
index 217f881..b702d00 100644
--- a/src/components/views/ViewsOverlay.tsx
+++ b/src/components/views/ViewsOverlay.tsx
@@ -2,25 +2,51 @@
 
 import { useEffect, useMemo, useState, useRef, useCallback } from 'react';
 import { createPortal } from 'react-dom';
-import { Filter, ChevronDown, X, ArrowUpDown, GripVertical, Inbox } from 'lucide-react';
-import type { Node } from '@/types/database';
+import { Filter, ChevronDown, X, ArrowUpDown, GripVertical, Inbox, Check } from 'lucide-react';
+import type { ContextSummary, Node } from '@/types/database';
 import { getNodeIcon } from '@/utils/nodeIcons';
 import { useDimensionIcons } from '@/context/DimensionIconsContext';
 import { usePersistentState } from '@/hooks/usePersistentState';
-import type { PendingNode } from '../layout/ThreePanelLayout';
-import { formatRelativeDate } from '@/utils/formatDate';
+import type { PendingNode } from '@/components/layout/ThreePanelLayout';
+import { getNodeProcessedState } from '@/services/nodes/metadata';
 
-type SortOrder = 'updated' | 'edges' | 'created' | 'custom';
+type SortOrder = 'updated' | 'edges' | 'created' | 'custom' | 'processed' | 'not_processed';
+type ProcessedFilter = 'all' | 'processed' | 'not_processed';
 
 const SORT_LABELS: Record<SortOrder, string> = {
   updated: 'Updated',
   edges: 'Edges',
   created: 'Created',
   custom: 'Custom',
+  processed: 'Processed',
+  not_processed: 'Not Processed',
 };
 
 const DOCUMENT_MAX_WIDTH = '980px';
 
+const pickerRowStyle: React.CSSProperties = {
+  display: 'flex',
+  alignItems: 'center',
+  justifyContent: 'space-between',
+  width: '100%',
+  padding: '7px 10px',
+  background: 'transparent',
+  border: 'none',
+  borderRadius: '5px',
+  color: 'var(--rah-text-secondary)',
+  fontSize: '12px',
+  cursor: 'pointer',
+  textAlign: 'left',
+};
+
+const pickerCountStyle: React.CSSProperties = {
+  color: 'var(--rah-text-muted)',
+  fontSize: '10px',
+  background: 'var(--rah-bg-active)',
+  padding: '1px 6px',
+  borderRadius: '10px',
+};
+
 interface ColumnFilter {
   id: string;
   dimension: string;
@@ -33,91 +59,127 @@ interface DimensionSummary {
   description?: string | null;
 }
 
+interface ViewsOverlayProps {
+  onNodeClick: (nodeId: number) => void;
+  onNodeOpenInOtherPane?: (nodeId: number) => void;
+  refreshToken?: number;
+  pendingNodes?: PendingNode[];
+  onDismissPending?: (id: string) => void;
+  externalContextFilterId?: number | null;
+  externalDimensionFilter?: string | null;
+  onContextFilterSelect?: (contextId: number | null, contextName?: string | null) => void;
+  onClearExternalContextFilter?: () => void;
+  onClearExternalDimensionFilter?: () => void;
+  toolbarHost?: HTMLDivElement | null;
+}
+
 const INPUT_TYPE_LABELS: Record<string, string> = {
   youtube: 'Extracting YouTube video...',
   website: 'Extracting webpage...',
-  pdf: 'Extracting PDF...',
+  pdf: 'Processing PDF...',
   note: 'Creating note...',
   chat: 'Importing transcript...',
 };
 
 function PendingNodeCard({ pending, onDismiss }: { pending: PendingNode; onDismiss?: () => void }) {
   const isError = pending.status === 'error';
+  const label = isError
+    ? pending.error || 'Processing failed'
+    : INPUT_TYPE_LABELS[pending.inputType] || 'Processing...';
+
+  // Truncate input for display
+  const displayInput = pending.input.length > 80
+    ? pending.input.slice(0, 77) + '...'
+    : pending.input;
+
   return (
-    <div style={{
-      padding: '10px 12px',
-      background: 'transparent',
-      borderBottom: '1px solid var(--rah-bg-panel)',
-      borderLeft: `3px solid ${isError ? '#ef4444' : '#22c55e'}`,
-      opacity: 0.8,
-    }}>
+    <div
+      style={{
+        padding: '10px 12px',
+        background: isError ? 'rgba(239, 68, 68, 0.04)' : 'rgba(34, 197, 94, 0.03)',
+        borderBottom: '1px solid var(--rah-border)',
+        borderLeft: isError ? '3px solid rgba(239, 68, 68, 0.4)' : '3px solid rgba(34, 197, 94, 0.3)',
+        borderTop: '2px solid transparent',
+      }}
+    >
       <div style={{ display: 'flex', alignItems: 'flex-start', gap: '10px' }}>
         <div style={{
           width: '32px',
           height: '32px',
           borderRadius: '8px',
-          background: 'var(var(--rah-bg-panel))',
-          border: `1px solid ${isError ? 'rgba(239,68,68,0.3)' : '#1f1f1f'}`,
+          background: isError ? 'rgba(239, 68, 68, 0.1)' : 'var(--rah-bg-panel)',
+          border: isError ? '1px solid rgba(239, 68, 68, 0.2)' : '1px solid var(--rah-border)',
           display: 'flex',
           alignItems: 'center',
           justifyContent: 'center',
           flexShrink: 0,
         }}>
           {isError ? (
-            <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="#ef4444" strokeWidth="2">
-              <path d="M18 6L6 18M6 6l12 12" strokeLinecap="round" strokeLinejoin="round" />
+            <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="#ef4444" strokeWidth="2">
+              <circle cx="12" cy="12" r="10" />
+              <line x1="15" y1="9" x2="9" y2="15" />
+              <line x1="9" y1="9" x2="15" y2="15" />
             </svg>
           ) : (
-            <span className="pending-spinner" />
+            <span className="pending-node-spinner" />
           )}
         </div>
         <div style={{ flex: 1, minWidth: 0 }}>
           <div style={{
-            fontSize: '13px',
-            fontWeight: 500,
-            color: isError ? '#ef4444' : '#888',
-            whiteSpace: 'nowrap',
-            overflow: 'hidden',
-            textOverflow: 'ellipsis',
+            display: 'flex',
+            alignItems: 'center',
+            gap: '8px',
+            marginBottom: '2px',
           }}>
-            {isError ? 'Failed' : (INPUT_TYPE_LABELS[pending.inputType] || 'Processing...')}
+            <span style={{
+              fontSize: '13px',
+              fontWeight: 500,
+              color: isError ? '#ef4444' : 'var(--rah-text-active)',
+              whiteSpace: 'nowrap',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis',
+              flex: 1,
+              minWidth: 0,
+            }}>
+              {displayInput}
+            </span>
+            {isError && onDismiss && (
+              <button
+                onClick={(e) => { e.stopPropagation(); onDismiss(); }}
+                style={{
+                  background: 'transparent',
+                  border: 'none',
+                  color: 'var(--rah-text-muted)',
+                  cursor: 'pointer',
+                  padding: '2px',
+                  display: 'flex',
+                  fontSize: '11px',
+                  flexShrink: 0,
+                }}
+                onMouseEnter={(e) => { e.currentTarget.style.color = '#ef4444'; }}
+                onMouseLeave={(e) => { e.currentTarget.style.color = 'var(--rah-text-muted)'; }}
+              >
+                <X size={12} />
+              </button>
+            )}
           </div>
           <div style={{
             fontSize: '11px',
-            color: 'var(var(--rah-text-muted))',
-            marginTop: '2px',
-            whiteSpace: 'nowrap',
-            overflow: 'hidden',
-            textOverflow: 'ellipsis',
+            color: isError ? 'rgba(239, 68, 68, 0.7)' : 'var(--rah-accent-green)',
+            lineHeight: '1.4',
+            display: 'flex',
+            alignItems: 'center',
+            gap: '6px',
           }}>
-            {isError && pending.error ? pending.error : pending.input}
+            {label}
           </div>
         </div>
-        {isError && onDismiss && (
-          <button
-            onClick={(e) => { e.stopPropagation(); onDismiss(); }}
-            style={{
-              padding: '4px',
-              background: 'transparent',
-              border: 'none',
-              color: 'var(var(--rah-text-muted))',
-              cursor: 'pointer',
-              borderRadius: '4px',
-              display: 'flex',
-              flexShrink: 0,
-            }}
-            onMouseEnter={(e) => { e.currentTarget.style.color = '#ef4444'; }}
-            onMouseLeave={(e) => { e.currentTarget.style.color = '#555'; }}
-          >
-            <X size={14} />
-          </button>
-        )}
       </div>
       <style jsx>{`
-        .pending-spinner {
+        .pending-node-spinner {
           width: 14px;
           height: 14px;
-          border: 2px solid #22c55e;
+          border: 2px solid var(--rah-accent-green);
           border-top-color: transparent;
           border-radius: 50%;
           animation: pendingSpin 0.8s linear infinite;
@@ -163,24 +225,16 @@ function SkeletonCard() {
   );
 }
 
-interface ViewsOverlayProps {
-  onNodeClick: (nodeId: number) => void;
-  onNodeOpenInOtherPane?: (nodeId: number) => void;
-  refreshToken?: number;
-  pendingNodes?: PendingNode[];
-  onDismissPending?: (id: string) => void;
-  externalDimensionFilter?: string | null;
-  onClearExternalDimensionFilter?: () => void;
-  toolbarHost?: HTMLDivElement | null;
-}
-
 export default function ViewsOverlay({
   onNodeClick,
   onNodeOpenInOtherPane,
   refreshToken = 0,
   pendingNodes,
   onDismissPending,
+  externalContextFilterId = null,
   externalDimensionFilter = null,
+  onContextFilterSelect,
+  onClearExternalContextFilter,
   onClearExternalDimensionFilter,
   toolbarHost,
 }: ViewsOverlayProps) {
@@ -189,6 +243,8 @@ export default function ViewsOverlay({
   // Dimensions for filter picker
   const [dimensions, setDimensions] = useState<DimensionSummary[]>([]);
   const [dimensionsLoading, setDimensionsLoading] = useState(true);
+  const [contexts, setContexts] = useState<ContextSummary[]>([]);
+  const [contextsLoading, setContextsLoading] = useState(true);
 
   // Sort order (persisted)
   const [sortOrder, setSortOrder] = usePersistentState<SortOrder>('ui.feedSortOrder', 'updated');
@@ -205,14 +261,22 @@ export default function ViewsOverlay({
   const [filteredNodes, setFilteredNodes] = useState<Node[]>([]);
   const [filteredNodesLoading, setFilteredNodesLoading] = useState(false);
   const [showFilterPicker, setShowFilterPicker] = useState(false);
+  const [showDimensionPicker, setShowDimensionPicker] = useState(false);
   const [filterSearchQuery, setFilterSearchQuery] = useState('');
   const [showSortDropdown, setShowSortDropdown] = useState(false);
 
+  const processedFilter: ProcessedFilter = sortOrder === 'processed'
+    ? 'processed'
+    : sortOrder === 'not_processed'
+      ? 'not_processed'
+      : 'all';
+
   // Derive selectedFilters for backward compatibility (unique dimensions)
   const selectedFilters = useMemo(() => {
     if (externalDimensionFilter) {
       return [externalDimensionFilter];
     }
+
     return [...new Set(columns.map(c => c.dimension))];
   }, [columns, externalDimensionFilter]);
 
@@ -242,12 +306,35 @@ export default function ViewsOverlay({
     }
   }, []);
 
+  const fetchContexts = useCallback(async () => {
+    setContextsLoading(true);
+    try {
+      const response = await fetch('/api/contexts');
+      const data = await response.json();
+      if (!response.ok || !data.success) {
+        throw new Error(data.error || 'Failed to fetch contexts');
+      }
+      setContexts(data.data || []);
+    } catch (error) {
+      console.error('Error fetching contexts:', error);
+    } finally {
+      setContextsLoading(false);
+    }
+  }, []);
+
+  const applyProcessedFilter = useCallback((nodes: Node[]) => {
+    if (processedFilter === 'all') return nodes;
+    return nodes.filter((node) => getNodeProcessedState(node.metadata) === processedFilter);
+  }, [processedFilter]);
+
   const fetchAllNodes = useCallback(async () => {
     setFilteredNodesLoading(true);
     try {
       // Custom sort fetches with 'updated' then reorders client-side
-      const apiSort = sortOrder === 'custom' ? 'updated' : sortOrder;
-      const response = await fetch(`/api/nodes?limit=500&sortBy=${apiSort}`);
+      const apiSort = sortOrder === 'custom' || sortOrder === 'processed' || sortOrder === 'not_processed'
+        ? 'updated'
+        : sortOrder;
+      const response = await fetch(`/api/nodes?limit=500&sortBy=${apiSort}${externalContextFilterId ? `&contextId=${externalContextFilterId}` : ''}`);
       const data = await response.json();
       if (!response.ok || !data.success) {
         throw new Error(data.error || 'Failed to fetch nodes');
@@ -266,16 +353,16 @@ export default function ViewsOverlay({
           }
         }
         ordered.sort((a, b) => (orderMap.get(a.id) ?? 0) - (orderMap.get(b.id) ?? 0));
-        setFilteredNodes([...ordered, ...unordered]);
+        setFilteredNodes(applyProcessedFilter([...ordered, ...unordered]));
       } else {
-        setFilteredNodes(nodes);
+        setFilteredNodes(applyProcessedFilter(nodes));
       }
     } catch (error) {
       console.error('Error fetching nodes:', error);
     } finally {
       setFilteredNodesLoading(false);
     }
-  }, [sortOrder, customOrder]);
+  }, [sortOrder, customOrder, applyProcessedFilter, externalContextFilterId]);
 
   const fetchFilteredNodes = useCallback(async (filters: string[]) => {
     if (filters.length === 0) {
@@ -284,8 +371,10 @@ export default function ViewsOverlay({
     }
     setFilteredNodesLoading(true);
     try {
-      const apiSort = sortOrder === 'custom' ? 'updated' : sortOrder;
-      const response = await fetch(`/api/nodes?limit=500&sortBy=${apiSort}&dimensions=${encodeURIComponent(filters.join(','))}&dimensionsMatch=all`);
+      const apiSort = sortOrder === 'custom' || sortOrder === 'processed' || sortOrder === 'not_processed'
+        ? 'updated'
+        : sortOrder;
+      const response = await fetch(`/api/nodes?limit=500&sortBy=${apiSort}&dimensions=${encodeURIComponent(filters.join(','))}&dimensionsMatch=all${externalContextFilterId ? `&contextId=${externalContextFilterId}` : ''}`);
       const data = await response.json();
       if (!response.ok || !data.success) {
         throw new Error(data.error || 'Failed to fetch nodes');
@@ -303,16 +392,16 @@ export default function ViewsOverlay({
           }
         }
         ordered.sort((a, b) => (orderMap.get(a.id) ?? 0) - (orderMap.get(b.id) ?? 0));
-        setFilteredNodes([...ordered, ...unordered]);
+        setFilteredNodes(applyProcessedFilter([...ordered, ...unordered]));
       } else {
-        setFilteredNodes(nodes);
+        setFilteredNodes(applyProcessedFilter(nodes));
       }
     } catch (error) {
       console.error('Error fetching filtered nodes:', error);
     } finally {
       setFilteredNodesLoading(false);
     }
-  }, [fetchAllNodes, sortOrder, customOrder]);
+  }, [fetchAllNodes, sortOrder, customOrder, applyProcessedFilter, externalContextFilterId]);
 
   // Stringify filters for stable dependency
   const filtersKey = selectedFilters.join(',');
@@ -322,6 +411,10 @@ export default function ViewsOverlay({
     fetchDimensions();
   }, [fetchDimensions]);
 
+  useEffect(() => {
+    fetchContexts();
+  }, [fetchContexts]);
+
   // Fetch nodes on mount and when filters/sort/refreshToken change
   useEffect(() => {
     if (refreshToken > 0) {
@@ -333,20 +426,22 @@ export default function ViewsOverlay({
       fetchAllNodes();
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [filtersKey, sortOrder, refreshToken]);
+  }, [filtersKey, sortOrder, refreshToken, externalContextFilterId]);
 
   // Also refresh dimensions when data changes (for filter picker counts)
   useEffect(() => {
     if (refreshToken > 0) {
       fetchDimensions();
+      fetchContexts();
     }
-  }, [refreshToken, fetchDimensions]);
+  }, [refreshToken, fetchDimensions, fetchContexts]);
 
   // Column management
   const addColumn = (dimension: string) => {
     if (externalDimensionFilter) {
       return;
     }
+
     const newColumn: ColumnFilter = {
       id: `col-${Date.now()}-${Math.random().toString(36).slice(2, 7)}`,
       dimension
@@ -361,6 +456,7 @@ export default function ViewsOverlay({
       onClearExternalDimensionFilter?.();
       return;
     }
+
     const idx = columns.findIndex(c => c.dimension === dimension);
     if (idx !== -1) {
       setColumns(columns.filter((_, i) => i !== idx));
@@ -368,9 +464,14 @@ export default function ViewsOverlay({
   };
 
   const clearFilters = () => {
+    if (externalContextFilterId) {
+      onClearExternalContextFilter?.();
+    }
+
     if (externalDimensionFilter) {
       onClearExternalDimensionFilter?.();
     }
+
     setColumns([]);
   };
 
@@ -381,6 +482,7 @@ export default function ViewsOverlay({
 
   // Close dropdowns on outside click
   const filterPickerRef = useRef<HTMLDivElement>(null);
+  const dimensionPickerRef = useRef<HTMLDivElement>(null);
   const sortDropdownRef = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
@@ -389,13 +491,16 @@ export default function ViewsOverlay({
         setShowFilterPicker(false);
         setFilterSearchQuery('');
       }
+      if (showDimensionPicker && dimensionPickerRef.current && !dimensionPickerRef.current.contains(e.target as HTMLElement)) {
+        setShowDimensionPicker(false);
+      }
       if (showSortDropdown && sortDropdownRef.current && !sortDropdownRef.current.contains(e.target as HTMLElement)) {
         setShowSortDropdown(false);
       }
     };
     document.addEventListener('mousedown', handleClickOutside);
     return () => document.removeEventListener('mousedown', handleClickOutside);
-  }, [showFilterPicker, showSortDropdown]);
+  }, [showDimensionPicker, showFilterPicker, showSortDropdown]);
 
   // Reorder handlers
   const handleReorderDrop = useCallback((dropIdx: number) => {
@@ -414,12 +519,60 @@ export default function ViewsOverlay({
     setReorderDropIndex(null);
   }, [reorderDragIndex, filteredNodes, setCustomOrder]);
 
+  const toggleNodeProcessed = useCallback(async (node: Node) => {
+    const nextState = getNodeProcessedState(node.metadata) === 'processed' ? 'not_processed' : 'processed';
+
+    setFilteredNodes((prev) => prev.map((candidate) => (
+      candidate.id === node.id
+        ? {
+            ...candidate,
+            metadata: {
+              ...(candidate.metadata && typeof candidate.metadata === 'object' ? candidate.metadata : {}),
+              state: nextState,
+            },
+          }
+        : candidate
+    )));
+
+    try {
+      const response = await fetch(`/api/nodes/${node.id}`, {
+        method: 'PUT',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          metadata: {
+            state: nextState,
+          },
+        }),
+      });
+
+      if (!response.ok) {
+        throw new Error('Failed to update processed state');
+      }
+
+      const result = await response.json();
+      if (result.node) {
+        setFilteredNodes((prev) => prev.map((candidate) => (
+          candidate.id === node.id ? result.node as Node : candidate
+        )));
+      }
+    } catch (error) {
+      console.error('Error updating processed state from feed:', error);
+      if (selectedFilters.length > 0) {
+        void fetchFilteredNodes(selectedFilters);
+      } else {
+        void fetchAllNodes();
+      }
+    }
+  }, [fetchAllNodes, fetchFilteredNodes, selectedFilters]);
+
   // Render node card
   const renderNodeCard = (node: Node, index: number) => {
-    const nodeIcon = getNodeIcon(node, dimensionIcons, 18);
+    const nodeIcon = getNodeIcon(node, dimensionIcons, 14);
     const isCustomSort = sortOrder === 'custom';
     const isDragSource = reorderDragIndex === index;
     const isDropTarget = reorderDropIndex === index;
+    const processedState = getNodeProcessedState(node.metadata);
+    const isProcessed = processedState === 'processed';
 
     // Description preview — first meaningful line, truncated
     const descPreview = node.description && node.description.length > 10
@@ -454,11 +607,11 @@ export default function ViewsOverlay({
         }}
         style={{
           padding: '10px 12px',
-          background: 'var(--rah-bg-base)',
+          background: isProcessed ? 'rgba(74, 222, 128, 0.045)' : 'var(--rah-bg-base)',
           cursor: 'pointer',
           transition: 'all 0.15s ease',
           border: '1px solid var(--rah-border)',
-          borderLeft: '2px solid var(--rah-border-stronger)',
+          borderLeft: `2px solid ${isProcessed ? 'rgba(74, 222, 128, 0.6)' : 'var(--rah-border-stronger)'}`,
           borderRadius: '10px',
           opacity: isDragSource ? 0.4 : 1,
           borderTop: isDropTarget ? '2px solid var(--rah-accent-green)' : '2px solid transparent',
@@ -482,70 +635,127 @@ export default function ViewsOverlay({
           }
         }}
       >
-        <div style={{ display: 'flex', alignItems: 'flex-start', gap: '10px' }}>
+        <div style={{ display: 'flex', flexDirection: 'column', gap: '6px', minWidth: 0 }}>
           {/* Grip handle — only in custom sort mode */}
-          {isCustomSort && (
-            <div
-              draggable
-              onDragStart={(e) => {
+          <div style={{ display: 'flex', alignItems: 'center', gap: '8px', minWidth: 0 }}>
+            {isCustomSort && (
+              <div
+                draggable
+                onDragStart={(e) => {
+                  e.stopPropagation();
+                  setReorderDragIndex(index);
+                  e.dataTransfer.effectAllowed = 'move';
+                  e.dataTransfer.setData('application/x-rah-reorder', String(index));
+                }}
+                onDragEnd={() => {
+                  setReorderDragIndex(null);
+                  setReorderDropIndex(null);
+                }}
+                style={{
+                  display: 'flex',
+                  alignItems: 'center',
+                  justifyContent: 'center',
+                  width: '16px',
+                  cursor: 'grab',
+                  color: 'var(--rah-text-muted)',
+                  flexShrink: 0,
+                  transition: 'color 0.15s ease',
+                }}
+                onMouseEnter={(e) => { e.currentTarget.style.color = 'var(--rah-text-soft)'; }}
+                onMouseLeave={(e) => { e.currentTarget.style.color = 'var(--rah-text-muted)'; }}
+                onClick={(e) => e.stopPropagation()}
+              >
+                <GripVertical size={14} />
+              </div>
+            )}
+            <button
+              type="button"
+              onClick={(e) => {
                 e.stopPropagation();
-                setReorderDragIndex(index);
-                e.dataTransfer.effectAllowed = 'move';
-                e.dataTransfer.setData('application/x-rah-reorder', String(index));
-              }}
-              onDragEnd={() => {
-                setReorderDragIndex(null);
-                setReorderDropIndex(null);
+                void toggleNodeProcessed(node);
               }}
+              title="Toggle processed"
+              aria-label="Toggle processed"
               style={{
-                display: 'flex',
+                width: '20px',
+                height: '20px',
+                borderRadius: '999px',
+                border: `1px solid ${isProcessed ? 'rgba(74, 222, 128, 0.55)' : 'var(--rah-border-strong)'}`,
+                background: isProcessed ? 'rgba(74, 222, 128, 0.16)' : 'var(--rah-bg-panel)',
+                color: isProcessed ? '#86efac' : 'transparent',
+                display: 'inline-flex',
                 alignItems: 'center',
                 justifyContent: 'center',
-                width: '16px',
-                cursor: 'grab',
-                color: 'var(--rah-text-muted)',
                 flexShrink: 0,
-                alignSelf: 'center',
-                transition: 'color 0.15s ease',
+                cursor: 'pointer',
+                transition: 'all 0.15s ease',
               }}
-              onMouseEnter={(e) => { e.currentTarget.style.color = 'var(--rah-text-soft)'; }}
-              onMouseLeave={(e) => { e.currentTarget.style.color = 'var(--rah-text-muted)'; }}
-              onClick={(e) => e.stopPropagation()}
             >
-              <GripVertical size={14} />
-            </div>
-          )}
-          <div style={{
-            width: '32px',
-            height: '32px',
-            borderRadius: '8px',
-            background: 'var(--rah-bg-panel)',
-            border: '1px solid var(--rah-border)',
-            display: 'flex',
-            alignItems: 'center',
-            justifyContent: 'center',
-            flexShrink: 0
-          }}>
-            {nodeIcon}
-          </div>
-          <div style={{ flex: 1, minWidth: 0 }}>
+              <Check size={11} strokeWidth={2.8} />
+            </button>
             <div style={{
               display: 'flex',
               alignItems: 'center',
               gap: '8px',
-              marginBottom: descPreview ? '2px' : '4px'
+              minWidth: 0,
+              flex: 1,
             }}>
-              <span style={{
-                fontSize: '14px',
-                fontWeight: 500,
-                color: 'var(--rah-text-active)',
-                whiteSpace: 'nowrap',
-                overflow: 'hidden',
-                textOverflow: 'ellipsis',
-                flex: 1,
-                minWidth: 0,
+              <div style={{ display: 'flex', alignItems: 'center', gap: '8px', minWidth: 0, flex: 1 }}>
+                <span style={{
+                  fontSize: '13px',
+                  fontWeight: 500,
+                  color: 'var(--rah-text-active)',
+                  whiteSpace: 'nowrap',
+                  overflow: 'hidden',
+                  textOverflow: 'ellipsis',
+                  flex: 1,
+                  minWidth: 0,
+                }}>
+                  {node.title || 'Untitled'}
+                </span>
+                {node.context?.name ? (
+                  <span style={{
+                    fontSize: '10px',
+                    lineHeight: 1.2,
+                    padding: '3px 7px',
+                    borderRadius: '999px',
+                    background: 'rgba(34, 197, 94, 0.08)',
+                    border: '1px solid rgba(34, 197, 94, 0.18)',
+                    color: 'var(--rah-accent-green)',
+                    flexShrink: 0,
+                    maxWidth: '40%',
+                    whiteSpace: 'nowrap',
+                    overflow: 'hidden',
+                    textOverflow: 'ellipsis',
+                  }}>
+                    {node.context.name}
+                  </span>
+                ) : null}
+              </div>
+              <div style={{
+                width: '20px',
+                height: '20px',
+                borderRadius: '6px',
+                background: 'var(--rah-bg-panel)',
+                border: '1px solid var(--rah-border)',
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'center',
+                flexShrink: 0
               }}>
-                {node.title || 'Untitled'}
+                {nodeIcon}
+              </div>
+              <span style={{
+                fontSize: '10px',
+                color: 'var(--rah-text-muted)',
+                background: 'var(--rah-bg-panel)',
+                padding: '2px 6px',
+                borderRadius: '999px',
+                fontFamily: 'monospace',
+                flexShrink: 0,
+                lineHeight: 1.2,
+              }}>
+                #{node.id}
               </span>
               {node.edge_count != null && node.edge_count > 0 && (
                 <span style={{
@@ -566,72 +776,57 @@ export default function ViewsOverlay({
                   {node.edge_count}
                 </span>
               )}
-              <span style={{
-                fontSize: '11px',
-                color: 'var(--rah-text-muted)',
-                background: 'var(--rah-bg-panel)',
-                padding: '2px 6px',
-                borderRadius: '4px',
-                fontFamily: 'monospace',
-                flexShrink: 0,
-              }}>
-                #{node.id}
-              </span>
             </div>
-            {descPreview && (
-              <div style={{
-                fontSize: '13px',
-                color: 'var(--rah-text-muted)',
-                lineHeight: '1.4',
-                marginBottom: '4px',
-                overflow: 'hidden',
-                textOverflow: 'ellipsis',
-                whiteSpace: 'nowrap',
-              }}>
-                {descPreview}
-              </div>
-            )}
+          </div>
+          <div style={{
+            display: 'flex',
+            alignItems: 'center',
+            gap: '8px',
+            minWidth: 0,
+          }}>
+            <div style={{
+              fontSize: '12px',
+              color: 'var(--rah-text-muted)',
+              lineHeight: '1.35',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis',
+              whiteSpace: 'nowrap',
+              flex: 1,
+              minWidth: 0,
+            }}>
+              {descPreview || 'No description'}
+            </div>
             <div style={{
               display: 'flex',
-              flexWrap: 'wrap',
+              alignItems: 'center',
               gap: '3px',
+              minWidth: 0,
+              maxWidth: '46%',
+              overflow: 'hidden',
+              flexShrink: 1,
+              whiteSpace: 'nowrap',
             }}>
               {node.dimensions && node.dimensions.length > 0 ? (
                 <>
-                  {node.dimensions.slice(0, 3).map(d => (
+                  {node.dimensions.map(d => (
                     <span
                       key={d}
                       style={{
-                        fontSize: '11px',
-                        padding: '2px 8px',
+                        fontSize: '10px',
+                        padding: '2px 7px',
                         background: 'var(--rah-bg-active)',
                         border: '1px solid var(--rah-border-strong)',
                         color: 'var(--rah-text-base)',
-                        borderRadius: '8px'
+                        borderRadius: '999px',
+                        flexShrink: 0,
                       }}
                     >
                       {d}
                     </span>
                   ))}
-                  {node.dimensions.length > 3 && (
-                    <span style={{ fontSize: '11px', color: 'var(--rah-text-muted)' }}>
-                      +{node.dimensions.length - 3}
-                    </span>
-                  )}
                 </>
               ) : null}
             </div>
-            <div style={{
-              display: 'flex',
-              alignItems: 'center',
-              gap: '8px',
-              marginTop: '6px',
-              fontSize: '11px',
-              color: 'var(--rah-text-muted)',
-            }}>
-              <span>{formatRelativeDate(node.updated_at || node.created_at)}</span>
-              {node.edge_count != null && node.edge_count > 0 ? <span>{node.edge_count} connections</span> : null}
-            </div>
           </div>
         </div>
       </div>
@@ -648,6 +843,119 @@ export default function ViewsOverlay({
         flexWrap: 'wrap'
       }}>
         <div style={{ display: 'flex', alignItems: 'center', gap: '6px', flexWrap: 'wrap', flex: 1 }}>
+          <div style={{ position: 'relative' }} ref={filterPickerRef}>
+            <button
+              onClick={() => setShowFilterPicker(!showFilterPicker)}
+              title="Context"
+              style={{
+                display: 'flex',
+                alignItems: 'center',
+                gap: '4px',
+                padding: '4px 8px',
+                background: 'transparent',
+                border: '1px solid var(--rah-border)',
+                borderRadius: '5px',
+                color: 'var(--rah-text-soft)',
+                fontSize: '11px',
+                cursor: 'pointer',
+                transition: 'all 0.15s ease'
+              }}
+            >
+              <Filter size={11} />
+              {externalContextFilterId
+                ? (contexts.find((context) => context.id === externalContextFilterId)?.name || 'Context')
+                : 'Context'}
+              <ChevronDown size={10} />
+            </button>
+
+            {showFilterPicker && (
+              <div style={{
+                position: 'absolute',
+                top: '100%',
+                left: 0,
+                marginTop: '4px',
+                background: 'var(--rah-bg-panel)',
+                border: '1px solid var(--rah-border)',
+                borderRadius: '10px',
+                padding: '6px',
+                minWidth: '220px',
+                maxHeight: '320px',
+                overflowY: 'auto',
+                zIndex: 1000,
+                boxShadow: '0 8px 24px rgba(0,0,0,0.4)'
+              }}>
+                {contextsLoading ? (
+                  <div style={{ padding: '12px', color: 'var(--rah-text-muted)', fontSize: '12px', textAlign: 'center' }}>
+                    Loading contexts...
+                  </div>
+                ) : (
+                  <>
+                    <button
+                      onClick={() => {
+                        onContextFilterSelect?.(null, null);
+                        setShowFilterPicker(false);
+                      }}
+                      style={pickerRowStyle}
+                    >
+                      <span>All contexts</span>
+                    </button>
+                    {contexts.map((context) => (
+                      <button
+                        key={context.id}
+                        onClick={() => {
+                          onContextFilterSelect?.(context.id, context.name);
+                          setShowFilterPicker(false);
+                        }}
+                        style={{
+                          ...pickerRowStyle,
+                          background: externalContextFilterId === context.id ? 'rgba(255,255,255,0.04)' : 'transparent',
+                          color: externalContextFilterId === context.id ? 'var(--rah-text-active)' : 'var(--rah-text-secondary)',
+                        }}
+                      >
+                        <span style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', paddingRight: '8px' }}>
+                          {context.name}
+                        </span>
+                        <span style={pickerCountStyle}>{context.count}</span>
+                      </button>
+                    ))}
+                  </>
+                )}
+              </div>
+            )}
+          </div>
+
+          {externalContextFilterId ? (
+            <div
+              style={{
+                display: 'flex',
+                alignItems: 'center',
+                gap: '5px',
+                padding: '3px 8px',
+                background: 'rgba(34, 197, 94, 0.06)',
+                border: '1px solid rgba(34, 197, 94, 0.12)',
+                borderRadius: '5px',
+                fontSize: '11px',
+                color: '#5a9'
+              }}
+            >
+              {contexts.find((context) => context.id === externalContextFilterId)?.name || 'Context'}
+              <button
+                onClick={() => onClearExternalContextFilter?.()}
+                style={{
+                  background: 'transparent',
+                  border: 'none',
+                  color: '#5a9',
+                  cursor: 'pointer',
+                  padding: '0',
+                  display: 'flex',
+                  alignItems: 'center'
+                }}
+              >
+                <X size={11} />
+              </button>
+            </div>
+          ) : null}
+
           {selectedFilters.map(filter => (
             <div
               key={filter}
@@ -683,21 +991,12 @@ export default function ViewsOverlay({
             </div>
           ))}
 
-          {externalDimensionFilter && (
-            <span style={{ fontSize: '11px', color: 'var(--rah-text-muted)' }}>
-              Sidebar filter
-            </span>
-          )}
-
-          <div style={{ position: 'relative' }} ref={filterPickerRef}>
+          <div style={{ position: 'relative' }} ref={dimensionPickerRef}>
             <button
               onClick={() => {
-                if (!externalDimensionFilter) {
-                  setShowFilterPicker(!showFilterPicker);
-                }
+                setShowDimensionPicker(!showDimensionPicker);
               }}
-              disabled={!!externalDimensionFilter}
-              title="Filter (⌘F)"
+              title="Dimensions"
               style={{
                 display: 'flex',
                 alignItems: 'center',
@@ -706,16 +1005,14 @@ export default function ViewsOverlay({
                 background: 'transparent',
                 border: '1px solid var(--rah-border)',
                 borderRadius: '5px',
-                color: externalDimensionFilter ? 'var(--rah-text-muted)' : 'var(--rah-text-soft)',
+                color: 'var(--rah-text-soft)',
                 fontSize: '11px',
-                cursor: externalDimensionFilter ? 'not-allowed' : 'pointer',
+                cursor: 'pointer',
                 transition: 'all 0.15s ease'
               }}
               onMouseEnter={(e) => {
-                if (!externalDimensionFilter) {
-                  e.currentTarget.style.background = 'rgba(255,255,255,0.04)';
-                  e.currentTarget.style.borderColor = 'var(--rah-border-strong)';
-                }
+                e.currentTarget.style.background = 'rgba(255,255,255,0.04)';
+                e.currentTarget.style.borderColor = 'var(--rah-border-strong)';
               }}
               onMouseLeave={(e) => {
                 e.currentTarget.style.background = 'transparent';
@@ -723,11 +1020,11 @@ export default function ViewsOverlay({
               }}
             >
               <Filter size={11} />
-              Filter
+              Dimension
+              <ChevronDown size={10} />
             </button>
 
-            {/* Filter picker dropdown */}
-            {showFilterPicker && !externalDimensionFilter && (
+            {showDimensionPicker && (
               <div style={{
                 position: 'absolute',
                 top: '100%',
@@ -776,75 +1073,54 @@ export default function ViewsOverlay({
                     <button
                       key={d.dimension}
                       onClick={() => addColumn(d.dimension)}
-                      style={{
-                        display: 'flex',
-                        alignItems: 'center',
-                        justifyContent: 'space-between',
-                        width: '100%',
-                        padding: '7px 10px',
-                        background: 'transparent',
-                        border: 'none',
-                        borderRadius: '5px',
-                        color: 'var(--rah-text-secondary)',
-                        fontSize: '12px',
-                        cursor: 'pointer',
-                        textAlign: 'left'
-                      }}
+                      style={pickerRowStyle}
                       onMouseEnter={(e) => { e.currentTarget.style.background = 'rgba(255,255,255,0.04)'; }}
                       onMouseLeave={(e) => { e.currentTarget.style.background = 'transparent'; }}
                     >
                       <span>{d.dimension}</span>
-                      <span style={{
-                        color: 'var(--rah-text-muted)',
-                        fontSize: '10px',
-                        background: 'var(--rah-bg-active)',
-                        padding: '1px 6px',
-                        borderRadius: '10px',
-                      }}>
-                        {d.count}
-                      </span>
+                      <span style={pickerCountStyle}>{d.count}</span>
                     </button>
                   ))
                 )}
               </div>
             )}
           </div>
-
-          {selectedFilters.length > 0 && (
-            <button
-              onClick={clearFilters}
-              style={{
-                padding: '4px 8px',
-                background: 'transparent',
-                border: 'none',
-                color: 'var(--rah-text-muted)',
-                fontSize: '11px',
-                cursor: 'pointer'
-              }}
-              onMouseEnter={(e) => { e.currentTarget.style.color = '#ef4444'; }}
-              onMouseLeave={(e) => { e.currentTarget.style.color = 'var(--rah-text-muted)'; }}
-            >
-              Clear all
-            </button>
-          )}
         </div>
 
+        {(selectedFilters.length > 0 || externalContextFilterId) && (
+          <button
+            onClick={clearFilters}
+            style={{
+              padding: '4px 8px',
+              background: 'transparent',
+              border: 'none',
+              color: 'var(--rah-text-muted)',
+              fontSize: '11px',
+              cursor: 'pointer'
+            }}
+            onMouseEnter={(e) => { e.currentTarget.style.color = '#ef4444'; }}
+            onMouseLeave={(e) => { e.currentTarget.style.color = 'var(--rah-text-muted)'; }}
+          >
+            Clear all
+          </button>
+        )}
+
         {/* Sort dropdown */}
         <div style={{ position: 'relative' }} ref={sortDropdownRef}>
-            <button
-              onClick={() => setShowSortDropdown(!showSortDropdown)}
-              style={{
-                display: 'flex',
-                alignItems: 'center',
-                gap: '4px',
-                padding: '5px 8px',
-                background: 'transparent',
-                border: '1px solid var(--rah-border)',
-                borderRadius: '5px',
-                color: 'var(--rah-text-soft)',
-                fontSize: '11px',
-                cursor: 'pointer',
-                transition: 'all 0.15s ease',
+          <button
+            onClick={() => setShowSortDropdown(!showSortDropdown)}
+            style={{
+              display: 'flex',
+              alignItems: 'center',
+              gap: '4px',
+              padding: '5px 8px',
+              background: 'transparent',
+              border: '1px solid var(--rah-border)',
+              borderRadius: '5px',
+              color: 'var(--rah-text-soft)',
+              fontSize: '11px',
+              cursor: 'pointer',
+              transition: 'all 0.15s ease',
               whiteSpace: 'nowrap',
             }}
             onMouseEnter={(e) => {
diff --git a/src/config/skills/audit.md b/src/config/skills/audit.md
index e257704..3b6d2c5 100644
--- a/src/config/skills/audit.md
+++ b/src/config/skills/audit.md
@@ -1,9 +1,6 @@
 ---
 name: Audit
-description: "Run a structured audit of graph quality, skill quality, and operational consistency."
-when_to_use: "User asks for review, QA, cleanup, or governance checks."
-when_not_to_use: "Simple one-off write/read requests."
-success_criteria: "Findings are prioritized, concrete, and tied to actionable fixes."
+description: "Use for structured review, QA, cleanup, or governance checks across graph quality, skill quality, and operational consistency."
 ---
 
 # Audit
@@ -27,3 +24,5 @@ success_criteria: "Findings are prioritized, concrete, and tied to actionable fi
 - Prefer specific evidence over generic commentary.
 - Propose the smallest high-leverage fixes first.
 - Separate defects from optional polish.
+- Node descriptions must read like natural prose while still making what / why / status clear.
+- Flag any node description missing a clear why or status component as a high-priority quality issue.
diff --git a/src/config/skills/calibration.md b/src/config/skills/calibration.md
index b39e12c..1691127 100644
--- a/src/config/skills/calibration.md
+++ b/src/config/skills/calibration.md
@@ -3,7 +3,7 @@ name: Calibration
 description: "Run periodic check-ins to recalibrate goals, projects, preferences, and graph structure."
 when_to_use: "User asks for a check-in, reset, review, or strategic recalibration."
 when_not_to_use: "Single isolated question with no strategic update needed."
-success_criteria: "Graph reflects current reality: updated hubs, changed priorities, and explicit deltas."
+success_criteria: "Graph reflects current reality: updated contexts, changed priorities, and explicit deltas."
 ---
 
 # Calibration
@@ -14,7 +14,7 @@ Re-anchor the graph to the user's current state.
 
 ## Check-in Sequence
 
-1. Review major hub nodes and active project nodes.
+1. Review major contexts, anchor nodes, and active project nodes.
 2. Ask what changed: goals, priorities, constraints, beliefs, preferences.
 3. Identify stale nodes and missing nodes.
 4. Propose precise updates: update existing vs create new.
diff --git a/src/config/skills/db-operations.md b/src/config/skills/db-operations.md
index ae03da3..cca978a 100644
--- a/src/config/skills/db-operations.md
+++ b/src/config/skills/db-operations.md
@@ -8,7 +8,7 @@ description: "Use for graph read, write, connect, classify, or traverse operatio
 ## Core Rules
 
 1. Search before create to avoid duplicates.
-2. Every create/update must include an explicit description of WHAT the thing is and WHY it matters.
+2. Every create/update should aim for a natural description that makes clear what the thing is, why it belongs in the graph, and workflow status.
 3. Use event dates when known (when it happened, not when saved).
 4. Apply dimensions deliberately; prefer existing dimensions over creating noisy new ones.
 5. Create edges when relationships are meaningful; edge explanations should read as a sentence.
@@ -16,9 +16,10 @@ description: "Use for graph read, write, connect, classify, or traverse operatio
 ## Write Quality Contract
 
 - `title`: clear and specific.
-- `description`: concrete object-level description, not vague summaries.
-- `source`: full verbatim or canonical content of the node (transcript, article text, book passage, user's thoughts). This is what gets chunked and embedded for semantic search.
+- `description`: natural prose, not labels. It should still make what / why / status clear when possible.
+- `source`: full verbatim or canonical content of the node (transcript, article text, book passage, user's thoughts). This is what gets chunked and embedded for semantic search. For user-authored ideas or dictated notes, preserve the user's original wording with minimal cleanup.
 - `link`: external source URL only.
+- `metadata`: prefer canonical keys `type`, `state`, `captured_method`, `captured_by`, and `source_metadata`.
 - Derived analysis, briefs, and research notes should be stored in a separate linked node, not appended to the source node.
 
 ## Execution Pattern
@@ -27,9 +28,11 @@ description: "Use for graph read, write, connect, classify, or traverse operatio
 2. Decide: create vs update vs connect.
 3. Execute minimum required writes.
 4. Verify result reflects user intent exactly.
+5. If description framing was materially inferred, complete the write first and then invite one concise user feedback pass instead of blocking creation.
 
 ## Do Not
 
 - Create duplicate nodes when an update is correct.
 - Write vague descriptions ("discusses", "explores", "is about").
+- Replace a user's raw idea/source with a thin summary.
 - Create weak or directionless edges.
diff --git a/src/config/skills/node-context-enrichment.md b/src/config/skills/node-context-enrichment.md
new file mode 100644
index 0000000..1d330e6
--- /dev/null
+++ b/src/config/skills/node-context-enrichment.md
@@ -0,0 +1,36 @@
+---
+name: Node Context Enrichment
+description: "Use to rewrite thin node descriptions into natural prose that still makes what, why, and status clear, with dimension review and edge suggestions."
+---
+
+# Node Context Enrichment
+
+Use this when a node already exists but its description is thin, generic, or missing personal context.
+
+This skill should not silently rewrite and move on when contextual framing is inferred. If the enrichment depends on interpretation, update the node and then explicitly invite the user to correct or refine the contextual framing.
+
+## Goal
+
+Replace weak descriptions with a single clean natural description that captures:
+
+1. What the artifact literally is
+2. Why it is in Brad's graph
+3. Status in Brad's workflow
+
+Also review whether the node needs dimension fixes or obvious edge suggestions.
+
+## Workflow
+
+1. Load the node and inspect title, description, source, link, metadata, dimensions, and nearby edges.
+2. Search for adjacent context before rewriting.
+3. Infer the best available "why" from that context.
+4. Rewrite the full description from scratch in natural prose. Do not append to the old text or use labels like WHAT:, WHY:, or STATUS:.
+5. Review dimensions.
+6. Suggest 1-3 high-signal edges when obvious.
+7. Update the node once the description is strong enough to be useful.
+8. After the update, tell the user what changed and ask whether they want to refine the important framing:
+   - what it is
+   - why it belongs in the graph
+   - status / current relevance / workflow position
+
+The user feedback pass is required whenever the enriched "why" or status was inferred rather than directly stated in the node/source.
diff --git a/src/config/skills/onboarding.md b/src/config/skills/onboarding.md
index 46aa0c3..8355152 100644
--- a/src/config/skills/onboarding.md
+++ b/src/config/skills/onboarding.md
@@ -3,7 +3,7 @@ name: Onboarding
 description: "Onboard a new user by mapping goals, projects, worldview, and preferences into a strong initial graph."
 when_to_use: "New user setup or major reset of account context."
 when_not_to_use: "User asks for a narrow tactical operation only."
-success_criteria: "User has an initial hub-node structure and clear next steps for graph growth."
+success_criteria: "User has an initial context structure, anchor candidates, and clear next steps for graph growth."
 ---
 
 # Onboarding
@@ -22,13 +22,14 @@ Understand the user deeply enough to bootstrap a useful externalized context gra
 
 ## Graph Bootstrap
 
-1. Propose 3-6 hub nodes with clear rationale.
-2. Propose starter dimensions that reflect real domains.
-3. Create initial edges between hubs and active projects.
-4. Confirm with user before writing.
+1. Propose 3-6 primary contexts with clear rationale.
+2. Identify one strong anchor candidate per context.
+3. Propose starter dimensions as secondary metadata and filters.
+4. Create initial edges between anchor nodes and active project nodes.
+5. Confirm with user before writing.
 
 ## Output
 
-- Initial hub map
+- Initial context map
 - Suggested first write actions
 - Suggested weekly maintenance rhythm
diff --git a/src/services/agents/quickAdd.ts b/src/services/agents/quickAdd.ts
index 76d9162..7044e4b 100644
--- a/src/services/agents/quickAdd.ts
+++ b/src/services/agents/quickAdd.ts
@@ -5,6 +5,7 @@ import { paperExtractTool } from '@/tools/other/paperExtract';
 import { formatNodeForChat } from '@/tools/infrastructure/nodeFormatter';
 import { summarizeTranscript } from './transcriptSummarizer';
 import { eventBroadcaster } from '@/services/events';
+import { getInternalApiBaseUrl } from '@/services/runtime/apiBase';
 
 export type QuickAddMode = 'link' | 'text';
 
@@ -242,7 +243,7 @@ async function handleExtractionQuickAdd(type: ExtractionQuickAddType, url: strin
       `Attempted pipeline: ${type}`,
     ].join('\n');
 
-    const response = await fetch(`${process.env.NEXT_PUBLIC_BASE_URL || 'http://localhost:3000'}/api/nodes`, {
+    const response = await fetch(`${getInternalApiBaseUrl()}/api/nodes`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({
@@ -251,11 +252,16 @@ async function handleExtractionQuickAdd(type: ExtractionQuickAddType, url: strin
         source,
         link: url,
         metadata: {
-          source: 'quick-add-link-fallback',
-          attempted_pipeline: type,
-          extraction_failed: true,
-          extraction_error: message,
-          refined_at: new Date().toISOString(),
+          type: 'website',
+          state: 'not_processed',
+          captured_method: 'quick_add_link_fallback',
+          captured_by: 'human',
+          source_metadata: {
+            attempted_pipeline: type,
+            extraction_failed: true,
+            extraction_error: message,
+            refined_at: new Date().toISOString(),
+          },
         },
       }),
     });
@@ -294,8 +300,13 @@ async function handleNoteQuickAdd(rawInput: string, task: string, userDescriptio
     title,
     source: content,
     metadata: {
-      source: 'quick-add-note',
-      refined_at: new Date().toISOString(),
+      type: 'note',
+      state: 'not_processed',
+      captured_method: 'quick_add_note',
+      captured_by: 'human',
+      source_metadata: {
+        refined_at: new Date().toISOString(),
+      },
     },
   };
 
@@ -303,7 +314,7 @@ async function handleNoteQuickAdd(rawInput: string, task: string, userDescriptio
     nodePayload.description = userDescription.trim();
   }
 
-  const response = await fetch(`${process.env.NEXT_PUBLIC_BASE_URL || 'http://localhost:3000'}/api/nodes`, {
+  const response = await fetch(`${getInternalApiBaseUrl()}/api/nodes`, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify(nodePayload),
@@ -356,48 +367,42 @@ async function handleChatTranscriptQuickAdd(rawInput: string, task: string): Pro
     ? ['Where things felt stuck:', ...stickingPoints.map((item) => `- ${item}`)].join('\n')
     : null;
 
-  const contentParts = [
-    `Overview:\n${baseSummary}`,
-  ];
-
-  if (intentLine) {
-    contentParts.push(`What you were trying to do:\n${intentLine}`);
-  }
-  if (progressLine) {
-    contentParts.push(`Where you made progress:\n${progressLine}`);
-  }
-  if (stickingSection) {
-    contentParts.push(stickingSection);
-  }
-  if (highlightSection) contentParts.push(highlightSection);
-  if (followUpSection) contentParts.push(followUpSection);
-  const content = contentParts.join('\n\n');
-
   const title = deriveChatTitle(transcript, summaryResult.subject);
   const wordCount = transcript.split(/\s+/).filter(Boolean).length;
+  const compactSummary = baseSummary.replace(/\s+/g, ' ').trim();
+  const whyDetail = intentLine
+    ? `It belongs in the graph because it preserves context around ${intentLine.toLowerCase()}.`
+    : 'It belongs in the graph because it preserves context from this conversation.';
+  const statusDetail = 'It has not been reviewed yet.';
+  const nodeDescription = `${compactSummary} ${whyDetail} ${statusDetail}`.slice(0, 500);
 
   const metadata = {
-    source: 'quick-add-chat',
-    summary_subject: summaryResult.subject,
-    summary_intent: summaryResult.intent,
-    summary_progress: summaryResult.progress,
-    highlights: summaryResult.highlights ?? [],
-    open_questions: summaryResult.openQuestions ?? [],
-    participants: summaryResult.participants ?? [],
-    sticking_points: summaryResult.stickingPoints ?? [],
-    transcript_length_chars: transcript.length,
-    transcript_length_words: wordCount,
-    transcript_truncated_for_summary: summaryResult.truncated ?? false,
-    summary_generated_at: new Date().toISOString(),
+    type: 'chat',
+    state: 'not_processed',
+    captured_method: 'quick_add_chat',
+    captured_by: 'human',
+    source_metadata: {
+      summary_subject: summaryResult.subject,
+      summary_intent: summaryResult.intent,
+      summary_progress: summaryResult.progress,
+      highlights: summaryResult.highlights ?? [],
+      open_questions: summaryResult.openQuestions ?? [],
+      participants: summaryResult.participants ?? [],
+      sticking_points: summaryResult.stickingPoints ?? [],
+      transcript_length_chars: transcript.length,
+      transcript_length_words: wordCount,
+      transcript_truncated_for_summary: summaryResult.truncated ?? false,
+      summary_generated_at: new Date().toISOString(),
+    },
   };
 
-  const response = await fetch(`${process.env.NEXT_PUBLIC_BASE_URL || 'http://localhost:3000'}/api/nodes`, {
+  const response = await fetch(`${getInternalApiBaseUrl()}/api/nodes`, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify({
       title,
       source: transcript,
-      description: content,
+      description: nodeDescription,
       metadata,
     }),
   });
diff --git a/src/services/context/autoContext.ts b/src/services/context/autoContext.ts
index 0ca96d7..3adb142 100644
--- a/src/services/context/autoContext.ts
+++ b/src/services/context/autoContext.ts
@@ -1,72 +1,233 @@
 import { getSQLiteClient } from '@/services/database/sqlite-client';
 import { getAutoContextSettings } from '@/services/settings/autoContextSettings';
 
-interface AutoContextRow {
-  id: number;
-  title: string | null;
-  updated_at: string;
-  edge_count: number | null;
-}
-
 export interface AutoContextSummary {
   id: number;
   title: string;
-  edgeCount: number;
+  description: string;
   updatedAt: string;
+  edgeCount: number;
+}
+
+export interface ContextAnchorSummary {
+  id: number;
+  title: string;
+  description: string;
+  updatedAt: string;
+  edgeCount: number;
+}
+
+export interface PromptContextSummary {
+  id: number;
+  name: string;
+  description: string | null;
+  icon: string | null;
+  count: number;
+  anchor: ContextAnchorSummary | null;
+}
+
+function truncate(value: string | null | undefined, maxChars: number): string {
+  const trimmed = (value || '').trim();
+  if (trimmed.length <= maxChars) return trimmed;
+  return `${trimmed.slice(0, maxChars)}...`;
 }
 
 function fetchAutoContextRows(limit: number): AutoContextSummary[] {
   const db = getSQLiteClient();
-  const rows = db
-    .query<AutoContextRow>(
-      `
-        SELECT n.id,
-               n.title,
-               n.updated_at,
-               COUNT(DISTINCT e.id) AS edge_count
-          FROM nodes n
-          LEFT JOIN edges e
-            ON (e.from_node_id = n.id OR e.to_node_id = n.id)
-         WHERE 1=1
-         GROUP BY n.id
-         ORDER BY edge_count DESC, n.updated_at DESC
-         LIMIT ?
-      `,
-      [limit]
-    )
-    .rows;
+  const rows = db.query<{
+    id: number;
+    title: string | null;
+    description: string | null;
+    updated_at: string;
+    edge_count: number | null;
+  }>(
+    `
+      SELECT n.id,
+             n.title,
+             n.description,
+             n.updated_at,
+             COUNT(DISTINCT e.id) AS edge_count
+        FROM nodes n
+        LEFT JOIN edges e
+          ON (e.from_node_id = n.id OR e.to_node_id = n.id)
+       GROUP BY n.id
+       ORDER BY edge_count DESC, n.updated_at DESC, n.id ASC
+       LIMIT ?
+    `,
+    [limit]
+  ).rows;
 
   return rows.map((row) => ({
     id: row.id,
     title: row.title || 'Untitled node',
+    description: row.description || '',
     updatedAt: row.updated_at,
     edgeCount: Number(row.edge_count ?? 0),
   }));
 }
 
-export function getAutoContextSummaries(limit = 10): AutoContextSummary[] {
-  const settings = getAutoContextSettings();
-  if (!settings.autoContextEnabled) {
-    return [];
-  }
+export function getHubNodes(limit = 5): AutoContextSummary[] {
   return fetchAutoContextRows(limit);
 }
 
-export function buildAutoContextBlock(limit = 10): string | null {
-  const summaries = getAutoContextSummaries(limit);
+export function getContextSummaries(limit = 12): PromptContextSummary[] {
+  const db = getSQLiteClient();
+  const rows = db.query<{
+    id: number;
+    name: string;
+    description: string | null;
+    icon: string | null;
+    count: number;
+    anchor_id: number | null;
+    anchor_title: string | null;
+    anchor_description: string | null;
+    anchor_updated_at: string | null;
+    anchor_edge_count: number | null;
+  }>(`
+    WITH context_counts AS (
+      SELECT c.id, c.name, c.description, c.icon, COUNT(n.id) AS count
+      FROM contexts c
+      LEFT JOIN nodes n ON n.context_id = c.id
+      GROUP BY c.id
+    ),
+    ranked_anchors AS (
+      SELECT
+        c.id AS context_id,
+        n.id AS node_id,
+        n.title,
+        n.description,
+        n.updated_at,
+        COUNT(e.id) AS edge_count,
+        ROW_NUMBER() OVER (
+          PARTITION BY c.id
+          ORDER BY COUNT(e.id) DESC, n.updated_at DESC, n.id ASC
+        ) AS anchor_rank
+      FROM contexts c
+      LEFT JOIN nodes n ON n.context_id = c.id
+      LEFT JOIN edges e ON (e.from_node_id = n.id OR e.to_node_id = n.id)
+      GROUP BY c.id, n.id
+    )
+    SELECT
+      cc.id,
+      cc.name,
+      cc.description,
+      cc.icon,
+      cc.count,
+      ra.node_id AS anchor_id,
+      ra.title AS anchor_title,
+      ra.description AS anchor_description,
+      ra.updated_at AS anchor_updated_at,
+      ra.edge_count AS anchor_edge_count
+    FROM context_counts cc
+    LEFT JOIN ranked_anchors ra
+      ON ra.context_id = cc.id
+     AND ra.anchor_rank = 1
+    ORDER BY cc.name COLLATE NOCASE ASC
+    LIMIT ?
+  `, [limit]).rows;
+
+  return rows.map((row) => ({
+    id: row.id,
+    name: row.name,
+    description: row.description ?? null,
+    icon: row.icon ?? null,
+    count: Number(row.count ?? 0),
+    anchor: row.anchor_id == null ? null : {
+      id: Number(row.anchor_id),
+      title: row.anchor_title || 'Untitled node',
+      description: row.anchor_description || '',
+      updatedAt: row.anchor_updated_at || '',
+      edgeCount: Number(row.anchor_edge_count ?? 0),
+    },
+  }));
+}
+
+export function buildContextsBlock(limit = 12): string | null {
+  const contexts = getContextSummaries(limit);
+  if (contexts.length === 0) {
+    return null;
+  }
+
+  const lines: string[] = [
+    'User Contexts',
+    'Use contexts as the primary scope layer. Dimensions are secondary metadata and filters.',
+    '',
+  ];
+
+  contexts.forEach((context, index) => {
+    const description = truncate(context.description, 140) || 'No description.';
+    const iconPrefix = context.icon ? `${context.icon} ` : '';
+    lines.push(`${index + 1}. ${iconPrefix}${context.name} (${context.count} nodes)`);
+    lines.push(`   ${description}`);
+  });
+
+  return lines.join('\n');
+}
+
+export function buildContextAnchorsBlock(limit = 12): string | null {
+  const contexts = getContextSummaries(limit).filter((context) => context.anchor);
+  if (contexts.length === 0) {
+    return null;
+  }
+
+  const lines: string[] = [
+    'Context Anchors',
+    'Each context anchor is the highest-edge node in that context. Use it as the starting graph waypoint for that scope.',
+    '',
+  ];
+
+  contexts.forEach((context, index) => {
+    const anchor = context.anchor!;
+    lines.push(`${index + 1}. ${context.name}: [NODE:${anchor.id}:"${anchor.title}"] (${anchor.edgeCount} edges)`);
+    if (anchor.description) {
+      lines.push(`   ${truncate(anchor.description, 160)}`);
+    }
+  });
+
+  return lines.join('\n');
+}
+
+export function buildHubNodesBlock(limit = 5): string | null {
+  const summaries = getHubNodes(limit);
   if (summaries.length === 0) {
     return null;
   }
 
   const lines: string[] = [
-    '=== BACKGROUND CONTEXT ===',
-    'Top 10 most-connected nodes (important knowledge hubs). Use queryNodes/getNodesById if relevant.',
+    'Global Hub Diagnostics',
+    'These are secondary graph diagnostics only. Do not use them as the primary scope layer when contexts are available.',
     '',
   ];
 
-  for (const summary of summaries) {
-    lines.push(`[NODE:${summary.id}:"${summary.title}"] (edges: ${summary.edgeCount})`);
-  }
+  summaries.forEach((summary, i) => {
+    lines.push(`${i + 1}. [NODE:${summary.id}:"${summary.title}"] (${summary.edgeCount} edges)`);
+    if (summary.description) {
+      lines.push(`   ${truncate(summary.description, 140)}`);
+    }
+  });
 
   return lines.join('\n');
 }
+
+export function getAutoContextSummaries(limit = 5): AutoContextSummary[] {
+  const settings = getAutoContextSettings();
+  if (!settings.autoContextEnabled) {
+    return [];
+  }
+  return getHubNodes(limit);
+}
+
+export function buildAutoContextBlock(limit = 12): string | null {
+  const settings = getAutoContextSettings();
+  if (!settings.autoContextEnabled) {
+    return null;
+  }
+
+  const sections = [
+    buildContextsBlock(limit),
+    buildContextAnchorsBlock(limit),
+    buildHubNodesBlock(5),
+  ].filter(Boolean);
+
+  return sections.length > 0 ? sections.join('\n\n') : null;
+}
diff --git a/src/services/context/contextAssignment.ts b/src/services/context/contextAssignment.ts
new file mode 100644
index 0000000..9c18d33
--- /dev/null
+++ b/src/services/context/contextAssignment.ts
@@ -0,0 +1,168 @@
+import { getSQLiteClient } from '@/services/database/sqlite-client';
+
+type ContextCandidate = {
+  id: number;
+  name: string;
+  description: string | null;
+  count: number;
+  anchor_title: string | null;
+  anchor_description: string | null;
+};
+
+type InferContextInput = {
+  title?: string | null;
+  description?: string | null;
+  source?: string | null;
+  dimensions?: string[] | null;
+  metadata?: unknown;
+};
+
+const STOP_WORDS = new Set([
+  'a', 'an', 'and', 'are', 'as', 'at', 'be', 'by', 'for', 'from', 'has', 'i',
+  'in', 'is', 'it', 'its', 'of', 'on', 'or', 'that', 'the', 'their', 'this',
+  'to', 'was', 'with', 'you', 'your'
+]);
+
+function normalizeText(value: string): string {
+  return value.toLowerCase().replace(/[^a-z0-9\s]+/g, ' ').replace(/\s+/g, ' ').trim();
+}
+
+function tokenize(value: string | null | undefined): string[] {
+  if (!value) return [];
+  return normalizeText(value)
+    .split(' ')
+    .map((token) => token.trim())
+    .filter((token) => token.length >= 2 && !STOP_WORDS.has(token));
+}
+
+function uniqueTokens(values: Array<string | null | undefined>): string[] {
+  return Array.from(new Set(values.flatMap((value) => tokenize(value))));
+}
+
+function safeStringify(value: unknown): string {
+  try {
+    return JSON.stringify(value ?? {});
+  } catch {
+    return '';
+  }
+}
+
+function fetchContextCandidates(): ContextCandidate[] {
+  const sqlite = getSQLiteClient();
+  return sqlite.query<ContextCandidate>(`
+    WITH context_counts AS (
+      SELECT c.id, c.name, c.description, COUNT(n.id) AS count
+      FROM contexts c
+      LEFT JOIN nodes n ON n.context_id = c.id
+      GROUP BY c.id
+    ),
+    ranked_anchors AS (
+      SELECT
+        c.id AS context_id,
+        n.title AS anchor_title,
+        n.description AS anchor_description,
+        ROW_NUMBER() OVER (
+          PARTITION BY c.id
+          ORDER BY COUNT(e.id) DESC, n.updated_at DESC, n.id ASC
+        ) AS anchor_rank
+      FROM contexts c
+      LEFT JOIN nodes n ON n.context_id = c.id
+      LEFT JOIN edges e ON (e.from_node_id = n.id OR e.to_node_id = n.id)
+      GROUP BY c.id, n.id
+    )
+    SELECT
+      cc.id,
+      cc.name,
+      cc.description,
+      cc.count,
+      ra.anchor_title,
+      ra.anchor_description
+    FROM context_counts cc
+    LEFT JOIN ranked_anchors ra
+      ON ra.context_id = cc.id
+     AND ra.anchor_rank = 1
+    ORDER BY cc.name COLLATE NOCASE ASC
+  `).rows.map((row) => ({
+    id: Number(row.id),
+    name: row.name,
+    description: row.description ?? null,
+    count: Number(row.count ?? 0),
+    anchor_title: row.anchor_title ?? null,
+    anchor_description: row.anchor_description ?? null,
+  }));
+}
+
+function scoreContextCandidate(candidate: ContextCandidate, input: InferContextInput): number {
+  const titleText = normalizeText(input.title || '');
+  const descriptionText = normalizeText(input.description || '');
+  const sourceText = normalizeText((input.source || '').slice(0, 4000));
+  const metadataText = normalizeText(safeStringify(input.metadata));
+  const dimensionTokens = uniqueTokens(input.dimensions ?? []);
+  const contextName = normalizeText(candidate.name);
+  const contextNameTokens = tokenize(candidate.name);
+  const contextDescriptorTokens = uniqueTokens([
+    candidate.description,
+    candidate.anchor_title,
+    candidate.anchor_description,
+  ]);
+
+  let score = 0;
+
+  if (contextName && (titleText.includes(contextName) || descriptionText.includes(contextName))) {
+    score += 80;
+  }
+  if (contextName && sourceText.includes(contextName)) {
+    score += 40;
+  }
+
+  for (const token of contextNameTokens) {
+    if (dimensionTokens.includes(token)) score += 30;
+    if (titleText.includes(token)) score += 16;
+    if (descriptionText.includes(token)) score += 12;
+    if (sourceText.includes(token)) score += 6;
+    if (metadataText.includes(token)) score += 4;
+  }
+
+  for (const token of contextDescriptorTokens) {
+    if (dimensionTokens.includes(token)) score += 8;
+    if (titleText.includes(token)) score += 4;
+    if (descriptionText.includes(token)) score += 3;
+    if (sourceText.includes(token)) score += 2;
+  }
+
+  return score;
+}
+
+export async function inferBestContextIdForNode(input: InferContextInput): Promise<number | null> {
+  const contexts = fetchContextCandidates();
+  if (contexts.length === 0) {
+    return null;
+  }
+
+  const ranked = contexts
+    .map((context) => ({
+      context,
+      score: scoreContextCandidate(context, input),
+    }))
+    .sort((a, b) =>
+      b.score - a.score ||
+      (b.context.count - a.context.count) ||
+      a.context.id - b.context.id
+    );
+
+  const best = ranked[0];
+  if (!best) {
+    return null;
+  }
+
+  if (best.score > 0) {
+    return best.context.id;
+  }
+
+  const research = contexts.find((context) => context.name.trim().toLowerCase() === 'research');
+  if (research) {
+    return research.id;
+  }
+
+  return ranked[0].context.id;
+}
diff --git a/src/services/database/contextService.ts b/src/services/database/contextService.ts
new file mode 100644
index 0000000..4d45350
--- /dev/null
+++ b/src/services/database/contextService.ts
@@ -0,0 +1,225 @@
+import { getSQLiteClient } from './sqlite-client';
+import type { Context, ContextSummary, Node } from '@/types/database';
+import { nodeService } from './nodes';
+
+type ContextRow = Context;
+
+function normalizeContextName(name: string): string {
+  return name.trim().replace(/\s+/g, ' ');
+}
+
+function assertContextName(name: unknown): string {
+  if (typeof name !== 'string') {
+    throw new Error('Context name is required.');
+  }
+  const normalized = normalizeContextName(name);
+  if (!normalized) {
+    throw new Error('Context name is required.');
+  }
+  return normalized;
+}
+
+function assertContextDescription(description: unknown): string {
+  if (typeof description !== 'string') {
+    throw new Error('Context description is required.');
+  }
+  const normalized = description.trim();
+  if (!normalized) {
+    throw new Error('Context description is required.');
+  }
+  return normalized;
+}
+
+function mapContextRow(row: ContextRow): Context {
+  return {
+    id: Number(row.id),
+    name: row.name,
+    description: row.description ?? null,
+    icon: row.icon ?? null,
+    created_at: row.created_at,
+    updated_at: row.updated_at,
+  };
+}
+
+export class ContextService {
+  async listContexts(): Promise<ContextSummary[]> {
+    const sqlite = getSQLiteClient();
+    const rows = sqlite.query<ContextSummary>(`
+      SELECT c.id, c.name, c.description, c.icon, COUNT(n.id) as count
+      FROM contexts c
+      LEFT JOIN nodes n ON n.context_id = c.id
+      GROUP BY c.id
+      ORDER BY c.name COLLATE NOCASE ASC
+    `).rows;
+
+    return rows.map((row) => ({
+      id: Number(row.id),
+      name: row.name,
+      description: row.description ?? null,
+      icon: row.icon ?? null,
+      count: Number(row.count ?? 0),
+    }));
+  }
+
+  async getContextById(id: number): Promise<ContextSummary | null> {
+    const sqlite = getSQLiteClient();
+    const row = sqlite.query<ContextSummary>(`
+      SELECT c.id, c.name, c.description, c.icon, COUNT(n.id) as count
+      FROM contexts c
+      LEFT JOIN nodes n ON n.context_id = c.id
+      WHERE c.id = ?
+      GROUP BY c.id
+    `, [id]).rows[0];
+
+    if (!row) return null;
+
+    return {
+      id: Number(row.id),
+      name: row.name,
+      description: row.description ?? null,
+      icon: row.icon ?? null,
+      count: Number(row.count ?? 0),
+    };
+  }
+
+  async getContextByName(name: string): Promise<Context | null> {
+    const normalized = assertContextName(name);
+    const sqlite = getSQLiteClient();
+    const row = sqlite.query<ContextRow>(`
+      SELECT id, name, description, icon, created_at, updated_at
+      FROM contexts
+      WHERE LOWER(TRIM(name)) = LOWER(TRIM(?))
+      LIMIT 1
+    `, [normalized]).rows[0];
+
+    return row ? mapContextRow(row) : null;
+  }
+
+  async createContext(input: { name: string; description: string; icon?: string | null }): Promise<Context> {
+    const name = assertContextName(input.name);
+    const description = assertContextDescription(input.description);
+    const icon = typeof input.icon === 'string' && input.icon.trim() ? input.icon.trim() : null;
+    const sqlite = getSQLiteClient();
+    const now = new Date().toISOString();
+
+    const existing = await this.getContextByName(name);
+    if (existing) {
+      throw new Error(`Context "${name}" already exists.`);
+    }
+
+    const result = sqlite.prepare(`
+      INSERT INTO contexts (name, description, icon, created_at, updated_at)
+      VALUES (?, ?, ?, ?, ?)
+    `).run(name, description, icon, now, now);
+
+    const created = await this.getContextById(Number(result.lastInsertRowid));
+    if (!created) {
+      throw new Error('Failed to create context.');
+    }
+
+    return {
+      ...created,
+      created_at: now,
+      updated_at: now,
+    };
+  }
+
+  async updateContext(input: { id: number; name?: string; description?: string; icon?: string | null }): Promise<Context> {
+    const sqlite = getSQLiteClient();
+    const existing = sqlite.query<ContextRow>(`
+      SELECT id, name, description, icon, created_at, updated_at
+      FROM contexts
+      WHERE id = ?
+    `, [input.id]).rows[0];
+
+    if (!existing) {
+      throw new Error(`Context ${input.id} not found.`);
+    }
+
+    const nextName = input.name !== undefined ? assertContextName(input.name) : existing.name;
+    const nextDescription = input.description !== undefined
+      ? assertContextDescription(input.description)
+      : existing.description;
+    const nextIcon = input.icon !== undefined
+      ? (typeof input.icon === 'string' && input.icon.trim() ? input.icon.trim() : null)
+      : existing.icon;
+
+    const conflicting = sqlite.query<{ id: number }>(`
+      SELECT id FROM contexts
+      WHERE LOWER(TRIM(name)) = LOWER(TRIM(?))
+        AND id != ?
+      LIMIT 1
+    `, [nextName, input.id]).rows[0];
+
+    if (conflicting) {
+      throw new Error(`Context "${nextName}" already exists.`);
+    }
+
+    const now = new Date().toISOString();
+    sqlite.prepare(`
+      UPDATE contexts
+      SET name = ?, description = ?, icon = ?, updated_at = ?
+      WHERE id = ?
+    `).run(nextName, nextDescription, nextIcon, now, input.id);
+
+    return {
+      id: input.id,
+      name: nextName,
+      description: nextDescription ?? null,
+      icon: nextIcon ?? null,
+      created_at: existing.created_at,
+      updated_at: now,
+    };
+  }
+
+  async getNodesForContext(id: number): Promise<Node[]> {
+    return nodeService.getNodes({ contextId: id, limit: 500 });
+  }
+
+  async resolveContextId(input: { context_id?: number | null; context_name?: string | null }): Promise<number | null | undefined> {
+    const hasContextId = Object.prototype.hasOwnProperty.call(input, 'context_id');
+    const hasContextName = typeof input.context_name === 'string' && input.context_name.trim().length > 0;
+
+    if (!hasContextId && !hasContextName) {
+      return undefined;
+    }
+
+    if (hasContextId && input.context_id === null) {
+      if (hasContextName) {
+        throw new Error('context_name cannot be combined with context_id: null.');
+      }
+      return null;
+    }
+
+    let resolvedById: Context | null = null;
+    if (hasContextId) {
+      if (typeof input.context_id !== 'number' || !Number.isInteger(input.context_id) || input.context_id <= 0) {
+        throw new Error('context_id must be a positive integer or null.');
+      }
+      const byId = await this.getContextById(input.context_id);
+      if (!byId) {
+        throw new Error(`Context ${input.context_id} not found.`);
+      }
+      resolvedById = {
+        ...byId,
+        created_at: '',
+        updated_at: '',
+      };
+    }
+
+    if (hasContextName) {
+      const byName = await this.getContextByName(input.context_name!);
+      if (!byName) {
+        throw new Error(`Context "${input.context_name}" not found.`);
+      }
+      if (resolvedById && resolvedById.id !== byName.id) {
+        throw new Error('context_id and context_name refer to different contexts.');
+      }
+      return byName.id;
+    }
+
+    return resolvedById?.id;
+  }
+}
+
+export const contextService = new ContextService();
diff --git a/src/services/database/descriptionService.ts b/src/services/database/descriptionService.ts
index dd7746e..1a6c4be 100644
--- a/src/services/database/descriptionService.ts
+++ b/src/services/database/descriptionService.ts
@@ -1,12 +1,13 @@
 import { openai as openaiProvider } from '@ai-sdk/openai';
 import { generateText } from 'ai';
 import { hasValidOpenAiKey } from '../storage/apiKeys';
+import type { CanonicalNodeMetadata } from '@/types/database';
 
 export interface DescriptionInput {
   title: string;
   source?: string;
   link?: string;
-  metadata?: {
+  metadata?: CanonicalNodeMetadata & {
     source?: string;
     channel_name?: string;
     author?: string;
@@ -18,52 +19,12 @@ export interface DescriptionInput {
   dimensions?: string[];
 }
 
-// Re-export for backwards compatibility — canonical source is ../storage/apiKeys
 export { hasValidOpenAiKey } from '../storage/apiKeys';
 
-/**
- * Generate a simple fallback description without AI.
- * Used when no API key is available or for simple inputs.
- */
-export function generateFallbackDescription(input: DescriptionInput): string {
-  const { title, metadata, dimensions } = input;
-
-  // Build a contextual fallback
-  const parts: string[] = [];
-
-  if (metadata?.author || metadata?.channel_name) {
-    parts.push(`By ${metadata.author || metadata.channel_name}`);
-  }
-
-  if (dimensions?.length) {
-    parts.push(`in ${dimensions.slice(0, 2).join(', ')}`);
-  }
-
-  if (parts.length > 0) {
-    return `${parts.join(' — ')}: ${title.slice(0, 200)}`;
-  }
-
-  return title.slice(0, 280);
-}
-
-/**
- * Generate a 280-character description for a knowledge node.
- * Contextually grounded - adapts to node type (person, concept, article, etc.)
- *
- * IMPORTANT: Returns fallback immediately if no valid API key is configured.
- * This prevents slow node creation (9-13s timeout) when OpenAI is unavailable.
- */
 export async function generateDescription(input: DescriptionInput): Promise<string> {
-  // Fast path: skip AI if no valid API key
   if (!hasValidOpenAiKey()) {
     console.log(`[DescriptionService] No valid OpenAI key, using fallback for: "${input.title}"`);
-    return generateFallbackDescription(input);
-  }
-
-  // Fast path: skip AI for very short inputs (likely just notes)
-  if (!input.source && !input.link && input.title.length < 30) {
-    console.log(`[DescriptionService] Short input, using fallback for: "${input.title}"`);
-    return generateFallbackDescription(input);
+    return `${input.title}. Added via Quick Add with no further context yet, so the reason it belongs in the graph is not fully inferred. It has not been reviewed yet.`.slice(0, 500);
   }
 
   try {
@@ -78,31 +39,38 @@ export async function generateDescription(input: DescriptionInput): Promise<stri
       temperature: 0.3,
     });
 
-    const finalDescription = sanitizeDescription(response.text, input);
+    const description = sanitizeDescription(response.text, input);
 
-    console.log(`[DescriptionService] Generated: "${finalDescription}"`);
+    console.log(`[DescriptionService] Generated: "${description}"`);
 
-    return finalDescription;
+    return description;
   } catch (error) {
     console.error('[DescriptionService] Error generating description:', error);
-    // Return a fallback description
-    return generateFallbackDescription(input);
+    return `${input.title}. Added via Quick Add with no further context yet, so the reason it belongs in the graph is not fully inferred. It has not been reviewed yet.`.slice(0, 500);
   }
 }
 
 function buildDescriptionPrompt(input: DescriptionInput): string {
-  const normalizedSource = (input.metadata?.source || '').toLowerCase();
+  const sourceMetadata = input.metadata?.source_metadata as Record<string, unknown> | undefined;
+  const sourceType = typeof input.metadata?.type === 'string'
+    ? input.metadata.type
+    : typeof input.metadata?.source === 'string'
+      ? input.metadata.source
+      : '';
+  const normalizedSource = sourceType.toLowerCase();
   const url = typeof input.link === 'string' ? input.link.trim() : '';
 
-  // Best-effort creator hint from structured metadata (when available),
-  // but never assume a particular extraction source (YouTube vs paper vs website vs note).
   const creatorHint =
-    input.metadata?.author?.trim() ||
-    input.metadata?.channel_name?.trim() ||
+    (typeof sourceMetadata?.author === 'string' ? sourceMetadata.author.trim() : '') ||
+    (typeof sourceMetadata?.channel_name === 'string' ? sourceMetadata.channel_name.trim() : '') ||
+    (typeof input.metadata?.author === 'string' ? input.metadata.author.trim() : '') ||
+    (typeof input.metadata?.channel_name === 'string' ? input.metadata.channel_name.trim() : '') ||
     '';
 
-  // Best-effort publisher / container hint (less ideal than a true author, but better than nothing).
-  const publisherHint = input.metadata?.site_name?.trim() || '';
+  const publisherHint =
+    (typeof sourceMetadata?.site_name === 'string' ? sourceMetadata.site_name.trim() : '') ||
+    (typeof input.metadata?.site_name === 'string' ? input.metadata.site_name.trim() : '') ||
+    '';
 
   const likelyExternal =
     Boolean(url) ||
@@ -123,38 +91,41 @@ function buildDescriptionPrompt(input: DescriptionInput): string {
 
   if (input.link) lines.push(`URL: ${input.link}`);
   if (input.dimensions?.length) lines.push(`Dimensions: ${input.dimensions.join(', ')}`);
-  if (input.metadata?.channel_name) lines.push(`Channel: ${input.metadata.channel_name}`);
-  if (input.metadata?.author) lines.push(`Author: ${input.metadata.author}`);
-  if (input.metadata?.site_name) lines.push(`Site: ${input.metadata.site_name}`);
-  if (input.metadata?.source) lines.push(`Source type: ${input.metadata.source}`);
-  if (input.metadata?.original_filename) lines.push(`Original filename: ${input.metadata.original_filename}`);
-  if (typeof input.metadata?.pages === 'number') lines.push(`Pages: ${input.metadata.pages}`);
-  if (typeof input.metadata?.text_length === 'number') lines.push(`Text length: ${input.metadata.text_length}`);
+  if (sourceMetadata?.channel_name || input.metadata?.channel_name) lines.push(`Channel: ${sourceMetadata?.channel_name || input.metadata?.channel_name}`);
+  if (sourceMetadata?.author || input.metadata?.author) lines.push(`Author: ${sourceMetadata?.author || input.metadata?.author}`);
+  if (sourceMetadata?.site_name || input.metadata?.site_name) lines.push(`Site: ${sourceMetadata?.site_name || input.metadata?.site_name}`);
+  if (sourceType) lines.push(`Source type: ${sourceType}`);
+  if (sourceMetadata?.original_filename || input.metadata?.original_filename) lines.push(`Original filename: ${sourceMetadata?.original_filename || input.metadata?.original_filename}`);
+  if (typeof sourceMetadata?.pages === 'number' || typeof input.metadata?.pages === 'number') lines.push(`Pages: ${sourceMetadata?.pages || input.metadata?.pages}`);
+  if (typeof sourceMetadata?.text_length === 'number' || typeof input.metadata?.text_length === 'number') lines.push(`Text length: ${sourceMetadata?.text_length || input.metadata?.text_length}`);
   if (creatorHint) lines.push(`Creator hint: ${creatorHint}`);
   if (publisherHint) lines.push(`Publisher hint: ${publisherHint}`);
   lines.push(`Likely user-authored: ${likelyUserAuthored ? 'yes' : 'no'}`);
 
-  const contentPreview = input.source?.slice(0, 800) || '';
-  if (contentPreview) lines.push(`Source excerpt: ${contentPreview}${input.source && input.source.length > 800 ? '...' : ''}`);
+  const sourcePreview = input.source?.slice(0, 800) || '';
+  if (sourcePreview) lines.push(`Source excerpt: ${sourcePreview}${input.source && input.source.length > 800 ? '...' : ''}`);
 
-  return `Write a description for this knowledge node. Max 280 characters.
+  return `Write a natural description for this knowledge node. Max 500 characters.
 
-Say WHAT this literally is and WHY it matters. Be concrete and specific — like you're telling a friend what this thing is in one breath.
+The description should read like normal prose, not a template or checklist. In one compact paragraph or a few natural sentences, make sure it clearly conveys:
+1) what this literally is
+2) why it is in Brad's graph
+3) its current status in Brad's workflow
 
 RULES:
 1) Name the format only if the context clearly supports it: "Podcast episode where…", "Blog post arguing…", "Personal note capturing…", "Research paper showing…", "Resume/CV for…", "Document likely containing…", "Idea that…"
 2) Name people by role — channel/host is the creator, title figures are guests/subjects. Use the Creator hint if available.
 3) State the actual claim, finding, or insight from the content — not a vague summary of the topic.
-4) End with why it's interesting or important — one concrete phrase.
-5) ABSOLUTELY FORBIDDEN — these words will be rejected: "discusses", "explores", "examines", "talks about", "is about", "delves into", "emphasizing the need for". State things directly instead.
-6) Do NOT start with "Your note —" or "This note —". Use a concrete opener tied to the actual artifact.
-7) If the artifact type is unclear, say so explicitly using words like "likely", "appears to be", or "unclear" rather than guessing a confident format.
+4) If the reason it belongs in the graph cannot be inferred from title, source excerpt, URL, metadata, or dimensions, say that naturally rather than inventing context.
+5) If workflow status is unknown, say that naturally, for example by noting it has not been reviewed yet.
+6) Do NOT use labels or headings like "WHAT:", "WHY:", or "STATUS:".
+7) ABSOLUTELY FORBIDDEN — these words and phrases will be rejected: "discusses", "explores", "examines", "talks about", "is about", "delves into", "emphasizing the need for", "insightful for understanding", "relevant to", "important for", "useful for understanding". State things directly instead.
+8) Do NOT start with "Your note —" or "This note —". Use a concrete opener tied to the actual artifact.
+9) If the artifact type is unclear, say so explicitly using words like "likely", "appears to be", or "unclear" rather than guessing a confident format.
 
-GOOD: "Karpathy blog post — AI agents make software fluid, ripping functionality from repos instead of taking dependencies. Signals the end of monolithic libraries."
-GOOD: "Dwarkesh Patel interview with Anthropic CEO Dario Amodei — argues we're nearing the end of exponential AI scaling. Key signal for what comes next."
-GOOD: "Personal note capturing a recurring pattern: morning optimism reverses to evening pessimism. Indicates a belief-level swing worth tracking."
-GOOD: "Resume/CV for Brad Morris outlining work in AI systems, context engineering, and RA-H. Useful as a compact record of background, projects, and expertise."
-GOOD: "Document likely related to Brad Morris's work history and AI consulting, but the exact artifact type is unclear from the available context. Still useful as a reference profile."
+GOOD: "CS153 lecture by ElevenLabs co-founder Mati Staniszewski on production AI voice systems. Brad likely saved it as a follow-on to his interest in the ElevenLabs voice pipeline after CS153 ep.1, and it has not been reviewed yet."
+GOOD: "YouTube talk by Lex Fridman with Sam Altman on AGI timelines and OpenAI strategy. It was added via Quick Add and the exact reason it belongs in the graph is not yet inferred from the available context, and it has not been reviewed yet."
+GOOD: "Personal note capturing a recurring pattern: morning optimism reverses to evening pessimism. It belongs in the graph because it points to a belief-level pattern worth tracking against Brad's decision quality, and it has already been processed."
 BAD: "By Dario Amodei — discusses reaching the limits of exponential growth in AI, emphasizing the need for a critical perspective on future advancements."
 BAD: "This article explores ideas about how software is changing."
 
@@ -170,7 +141,7 @@ function sanitizeDescription(rawText: string, input: DescriptionInput): string {
     .replace(/^["']|["']$/g, '');
 
   if (!singleLine) {
-    return input.title.slice(0, 280);
+    return `${input.title}. Added via Quick Add with no further context yet, so the reason it belongs in the graph is not fully inferred. It has not been reviewed yet.`.slice(0, 500);
   }
 
   const noGenericPrefix = singleLine.replace(
@@ -178,7 +149,7 @@ function sanitizeDescription(rawText: string, input: DescriptionInput): string {
     'Personal note capturing '
   );
 
-  return noGenericPrefix.slice(0, 280);
+  return noGenericPrefix.slice(0, 500);
 }
 
 export const descriptionService = {
diff --git a/src/services/database/index.ts b/src/services/database/index.ts
index d3243de..2876a2a 100644
--- a/src/services/database/index.ts
+++ b/src/services/database/index.ts
@@ -3,6 +3,7 @@ export { nodeService, NodeService } from './nodes';
 export { chunkService, ChunkService } from './chunks';
 export { edgeService, EdgeService } from './edges';
 export { dimensionService, DimensionService } from './dimensionService';
+export { contextService, ContextService } from './contextService';
 // export { HelperService } from './helpers'; // Removed - migrated to JSON-based service
 
 // Types
diff --git a/src/services/database/nodes.ts b/src/services/database/nodes.ts
index dda6e4c..da5682f 100644
--- a/src/services/database/nodes.ts
+++ b/src/services/database/nodes.ts
@@ -3,8 +3,9 @@ import { Node, NodeFilters } from '@/types/database';
 import { eventBroadcaster } from '../events';
 import { EmbeddingService } from '@/services/embeddings';
 import { scoreNodeSearchMatch } from './searchRanking';
+import { buildCanonicalNodeMetadata, mergeNodeMetadata } from '@/services/nodes/metadata';
 
-type NodeRow = Node & { dimensions_json: string };
+type NodeRow = Node & { dimensions_json: string; context_json: string | null };
 type NodeSearchRow = NodeRow & { rank?: number; similarity?: number };
 
 function sanitizeFtsQuery(input: string): string {
@@ -81,7 +82,7 @@ export class NodeService {
 
   async countNodes(filters: NodeFilters = {}): Promise<number> {
     const { dimensions, search, dimensionsMatch = 'any',
-            createdAfter, createdBefore, eventAfter, eventBefore, chunkStatus } = filters;
+            createdAfter, createdBefore, eventAfter, eventBefore, chunkStatus, contextId } = filters;
 
     if (search?.trim()) {
       return this.countSearchNodesSQLite(filters);
@@ -120,6 +121,7 @@ export class NodeService {
     if (eventAfter) { query += ` AND n.event_date >= ?`; params.push(eventAfter); }
     if (eventBefore) { query += ` AND n.event_date < ?`; params.push(eventBefore); }
     if (chunkStatus) { query += ` AND n.chunk_status = ?`; params.push(chunkStatus); }
+    if (contextId !== undefined) { query += ` AND n.context_id = ?`; params.push(contextId); }
 
     const result = sqlite.query<{ total: number }>(query, params);
     return result.rows[0]?.total ?? 0;
@@ -129,7 +131,7 @@ export class NodeService {
 
   private async getNodesSQLite(filters: NodeFilters = {}): Promise<Node[]> {
     const { dimensions, search, limit = 100, offset = 0, sortBy, dimensionsMatch = 'any',
-            createdAfter, createdBefore, eventAfter, eventBefore, chunkStatus } = filters;
+            createdAfter, createdBefore, eventAfter, eventBefore, chunkStatus, contextId } = filters;
 
     if (search?.trim()) {
       return this.searchNodesSQLite(filters);
@@ -141,11 +143,16 @@ export class NodeService {
     let query = `
       SELECT n.id, n.title, n.description, n.source, n.link, n.event_date, n.metadata,
              n.chunk_status, n.embedding_updated_at, n.embedding_text,
-             n.created_at, n.updated_at,
+             n.created_at, n.updated_at, n.context_id,
              COALESCE((SELECT JSON_GROUP_ARRAY(d.dimension)
                        FROM node_dimensions d WHERE d.node_id = n.id), '[]') as dimensions_json,
+             CASE
+               WHEN c.id IS NULL THEN NULL
+               ELSE json_object('id', c.id, 'name', c.name, 'description', c.description, 'icon', c.icon)
+             END as context_json,
              (SELECT COUNT(*) FROM edges WHERE from_node_id = n.id OR to_node_id = n.id) as edge_count
       FROM nodes n
+      LEFT JOIN contexts c ON c.id = n.context_id
       WHERE 1=1
     `;
     const params: any[] = [];
@@ -198,6 +205,10 @@ export class NodeService {
       query += ` AND n.chunk_status = ?`;
       params.push(chunkStatus);
     }
+    if (contextId !== undefined) {
+      query += ` AND n.context_id = ?`;
+      params.push(contextId);
+    }
 
     // Sorting logic
     if (search) {
@@ -255,10 +266,15 @@ export class NodeService {
     const query = `
       SELECT n.id, n.title, n.description, n.source, n.link, n.event_date, n.metadata,
              n.chunk_status, n.embedding_updated_at, n.embedding_text,
-             n.created_at, n.updated_at,
+             n.created_at, n.updated_at, n.context_id,
              COALESCE((SELECT JSON_GROUP_ARRAY(d.dimension) 
-                       FROM node_dimensions d WHERE d.node_id = n.id), '[]') as dimensions_json
+                       FROM node_dimensions d WHERE d.node_id = n.id), '[]') as dimensions_json,
+             CASE
+               WHEN c.id IS NULL THEN NULL
+               ELSE json_object('id', c.id, 'name', c.name, 'description', c.description, 'icon', c.icon)
+             END as context_json
       FROM nodes n
+      LEFT JOIN contexts c ON c.id = n.context_id
       WHERE n.id = ?
     `;
     const result = sqlite.query<NodeRow>(query, [id]);
@@ -284,24 +300,27 @@ export class NodeService {
       event_date,
       dimensions = [],
       chunk_status,
-      metadata = {}
+      metadata = {},
+      context_id,
     } = nodeData;
+    const canonicalMetadata = buildCanonicalNodeMetadata({ metadata });
     const now = new Date().toISOString();
     const sqlite = getSQLiteClient();
 
     const nodeId = sqlite.transaction(() => {
       // Insert node using prepare/run for lastInsertRowid access
       const nodeResult = sqlite.prepare(`
-        INSERT INTO nodes (title, description, source, link, event_date, metadata, chunk_status, created_at, updated_at)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+        INSERT INTO nodes (title, description, source, link, event_date, metadata, chunk_status, context_id, created_at, updated_at)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
       `).run(
         title,
         description ?? null,
         source ?? null,
         link ?? null,
         event_date ?? null,
-        JSON.stringify(metadata),
+        JSON.stringify(canonicalMetadata),
         chunk_status ?? null,
+        context_id ?? null,
         now,
         now
       );
@@ -349,13 +368,17 @@ export class NodeService {
     const sqlite = getSQLiteClient();
 
     const existingRow = sqlite
-      .query<{ id: number }>('SELECT id FROM nodes WHERE id = ?', [id])
+      .query<{ id: number; metadata: string | null }>('SELECT id, metadata FROM nodes WHERE id = ?', [id])
       .rows[0];
 
     if (!existingRow) {
       throw new Error(`Node with ID ${id} not found`);
     }
 
+    const mergedMetadata = metadata !== undefined
+      ? mergeNodeMetadata(existingRow.metadata, metadata)
+      : undefined;
+
     sqlite.transaction(() => {
       // Update node columns (only update provided fields)
       const setFields: string[] = [];
@@ -366,13 +389,17 @@ export class NodeService {
       if (source !== undefined) { setFields.push('source = ?'); params.push(source); }
       if (link !== undefined) { setFields.push('link = ?'); params.push(link); }
       if (event_date !== undefined) { setFields.push('event_date = ?'); params.push(event_date); }
+      if (Object.prototype.hasOwnProperty.call(updates, 'context_id')) {
+        setFields.push('context_id = ?');
+        params.push(updates.context_id ?? null);
+      }
       if (Object.prototype.hasOwnProperty.call(updates, 'chunk_status')) {
         setFields.push('chunk_status = ?');
         params.push(updates.chunk_status ?? null);
       }
-      if (metadata !== undefined) { 
+      if (mergedMetadata !== undefined) {
         setFields.push('metadata = ?'); 
-        params.push(JSON.stringify(metadata)); 
+        params.push(JSON.stringify(mergedMetadata));
       }
       
       // Always update timestamp
@@ -445,6 +472,7 @@ export class NodeService {
       ...row,
       dimensions: JSON.parse(row.dimensions_json || '[]'),
       metadata: row.metadata ? (typeof row.metadata === 'string' ? JSON.parse(row.metadata) : row.metadata) : null,
+      context: row.context_json ? JSON.parse(row.context_json) : null,
     };
   }
 
@@ -456,6 +484,7 @@ export class NodeService {
       createdBefore,
       eventAfter,
       eventBefore,
+      contextId,
     } = filters;
 
     const clauses: string[] = [];
@@ -483,6 +512,7 @@ export class NodeService {
     if (createdBefore) { clauses.push(`${alias}.created_at < ?`); params.push(createdBefore); }
     if (eventAfter) { clauses.push(`${alias}.event_date >= ?`); params.push(eventAfter); }
     if (eventBefore) { clauses.push(`${alias}.event_date < ?`); params.push(eventBefore); }
+    if (contextId !== undefined) { clauses.push(`${alias}.context_id = ?`); params.push(contextId); }
 
     return { clauses, params };
   }
diff --git a/src/services/database/quality.ts b/src/services/database/quality.ts
index 353554b..7d9e6d2 100644
--- a/src/services/database/quality.ts
+++ b/src/services/database/quality.ts
@@ -1,6 +1,8 @@
 const WEAK_DESCRIPTION_PATTERNS = /\b(discusses|explores|examines|talks about|is about|delves into)\b/i;
 const EXPLICIT_ENTITY_PATTERNS = /\b(article|artifact|book|brief|claim|company|concept|conversation|dataset|decision|dimension|document|episode|essay|event|guide|idea|insight|interview|lesson|link|node|note|paper|person|plan|placeholder|podcast|post|presentation|project|question|record|research|resource|skill|source|status|summary|talk|target|test node|thread|tool|transcript|tweet|update|video|website|workflow)\b/i;
 const UNCERTAINTY_PATTERNS = /\b(likely|probably|possibly|appears to be|seems to be|unclear|uncertain)\b/i;
+const WHY_PATTERNS = /(why added:|added (?:after|as|for|because|to)|follow-?on|queued for|saved for|relevant because|connected to|not inferred|belongs in the graph because|belongs here because|captures .* idea|ties directly into|ties into)/i;
+const STATUS_PATTERNS = /(status:|queued|not yet reviewed|in progress|processed|reviewed|saved for later|to review|to read|to watch|to listen|draft|not yet published|unpublished)/i;
 const GENERIC_EDGE_PATTERNS = /^(related|related to|connected|connected to|association|associated with)$/i;
 
 export function normalizeDimensionName(value: string): string {
@@ -29,6 +31,9 @@ export function normalizeDimensions(values: unknown, max = 5): string[] {
 
 export function validateExplicitDescription(description: string): string | null {
   const text = description.trim();
+  if (text.length > 500) {
+    return 'Description must be 500 characters or less.';
+  }
   if (text.length < 24) {
     return 'Description must be explicit and substantial (at least 24 characters).';
   }
@@ -38,9 +43,37 @@ export function validateExplicitDescription(description: string): string | null
   if (!EXPLICIT_ENTITY_PATTERNS.test(text) && !UNCERTAINTY_PATTERNS.test(text)) {
     return 'Description must explicitly identify what this thing is, or state uncertainty explicitly.';
   }
+  if (!WHY_PATTERNS.test(text)) {
+    return 'Description must clearly indicate why this belongs in the graph. If that reason is unknown, say so naturally instead of inventing it.';
+  }
+  if (!STATUS_PATTERNS.test(text)) {
+    return 'Description must make the workflow status clear. If status is unknown, say naturally that it has not been reviewed yet or is still in progress.';
+  }
   return null;
 }
 
+interface DescriptionFallbackInput {
+  title: string;
+  description?: string | null;
+}
+
+export function coerceDescriptionForStorage(input: DescriptionFallbackInput): string {
+  const candidate = typeof input.description === 'string' ? input.description.trim() : '';
+  const clippedCandidate = candidate.slice(0, 500);
+  const validationError = clippedCandidate ? validateExplicitDescription(clippedCandidate) : 'missing';
+
+  if (!validationError && clippedCandidate) {
+    return clippedCandidate;
+  }
+
+  const title = input.title.trim() || 'Untitled node';
+  const opening = clippedCandidate || `${title}.`;
+  const normalizedOpening = opening.endsWith('.') ? opening : `${opening}.`;
+  const fallbackTail = ' It was added to the graph with incomplete context, so the exact reason it belongs here is not yet inferred, and it has not been reviewed yet.';
+
+  return `${normalizedOpening}${fallbackTail}`.replace(/\s+/g, ' ').trim().slice(0, 500);
+}
+
 export function validateEdgeExplanation(explanation: string): string | null {
   const text = explanation.trim();
   if (text.length < 8) {
diff --git a/src/services/database/sqlite-client.ts b/src/services/database/sqlite-client.ts
index 6d6944d..db17c5b 100644
--- a/src/services/database/sqlite-client.ts
+++ b/src/services/database/sqlite-client.ts
@@ -69,6 +69,7 @@ class SQLiteClient {
 
       // Ensure logging schema (rename memory->logs if needed, create triggers/views)
       this.ensureLoggingAndMemorySchema();
+      this.ensureContextsSchema();
     }
 
     console.log('SQLite client initialized successfully');
@@ -219,6 +220,11 @@ class SQLiteClient {
       return;
     }
     try {
+      const hasReadyLogs = this.db.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name='logs'").get();
+      if (hasReadyLogs) {
+        return;
+      }
+
       // 1) If logs table missing but legacy memory table exists, migrate
       const hasLogs = this.db.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name='logs'").get();
       const hasLegacyMemory = this.db.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name='memory'").get();
@@ -748,6 +754,58 @@ class SQLiteClient {
     }
   }
 
+  private ensureContextsSchema(): void {
+    if (this.readOnly) {
+      return;
+    }
+
+    try {
+      this.db.exec(`
+        CREATE TABLE IF NOT EXISTS contexts (
+          id INTEGER PRIMARY KEY AUTOINCREMENT,
+          name TEXT NOT NULL,
+          description TEXT NOT NULL DEFAULT '',
+          icon TEXT,
+          created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+          updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
+        );
+      `);
+
+      const nodeCols = this.db.prepare('PRAGMA table_info(nodes)').all() as Array<{ name: string }>;
+      const nodeColNames = nodeCols.map((column) => column.name);
+      if (!nodeColNames.includes('context_id')) {
+        this.db.exec('ALTER TABLE nodes ADD COLUMN context_id INTEGER REFERENCES contexts(id) ON DELETE SET NULL;');
+      }
+
+      const contextCols = this.db.prepare('PRAGMA table_info(contexts)').all() as Array<{ name: string }>;
+      const contextColNames = contextCols.map((column) => column.name);
+      if (!contextColNames.includes('description')) {
+        this.db.exec("ALTER TABLE contexts ADD COLUMN description TEXT NOT NULL DEFAULT '';");
+      }
+      if (!contextColNames.includes('icon')) {
+        this.db.exec('ALTER TABLE contexts ADD COLUMN icon TEXT;');
+      }
+      if (!contextColNames.includes('created_at')) {
+        this.db.exec("ALTER TABLE contexts ADD COLUMN created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP;");
+      }
+      if (!contextColNames.includes('updated_at')) {
+        this.db.exec("ALTER TABLE contexts ADD COLUMN updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP;");
+      }
+
+      this.db.exec(`
+        UPDATE contexts
+        SET description = COALESCE(NULLIF(TRIM(description), ''), name)
+        WHERE description IS NULL OR LENGTH(TRIM(description)) = 0;
+
+        CREATE UNIQUE INDEX IF NOT EXISTS idx_contexts_name_normalized
+          ON contexts(LOWER(TRIM(name)));
+        CREATE INDEX IF NOT EXISTS idx_nodes_context_id ON nodes(context_id);
+      `);
+    } catch (error) {
+      console.warn('Failed to ensure contexts schema:', error);
+    }
+  }
+
   private healVectorTablesIfCorrupt(): void {
     if (this.readOnly || !this.vectorCapability.available) {
       return;
diff --git a/src/services/nodes/metadata.ts b/src/services/nodes/metadata.ts
new file mode 100644
index 0000000..8a35fdd
--- /dev/null
+++ b/src/services/nodes/metadata.ts
@@ -0,0 +1,100 @@
+import type {
+  CanonicalNodeMetadata,
+  NodeCapturedBy,
+  NodeMetadataState,
+} from '@/types/database';
+
+type MetadataLike = CanonicalNodeMetadata | Record<string, unknown> | string | null | undefined;
+
+export interface BuildCanonicalMetadataInput {
+  existing?: MetadataLike;
+  metadata?: MetadataLike;
+  type?: string | null;
+  state?: NodeMetadataState | null;
+  captured_method?: string | null;
+  captured_by?: NodeCapturedBy | null;
+  source_metadata?: Record<string, unknown> | null;
+}
+
+function isObject(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+
+export function parseNodeMetadata(metadata: MetadataLike): CanonicalNodeMetadata {
+  if (!metadata) return {};
+
+  if (typeof metadata === 'string') {
+    try {
+      const parsed = JSON.parse(metadata);
+      return isObject(parsed) ? { ...parsed } : {};
+    } catch {
+      return {};
+    }
+  }
+
+  return isObject(metadata) ? { ...metadata } : {};
+}
+
+function normalizeSourceMetadata(sourceMetadata: unknown): Record<string, unknown> {
+  return isObject(sourceMetadata) ? { ...sourceMetadata } : {};
+}
+
+function normalizedString(value: unknown): string | undefined {
+  if (typeof value !== 'string') return undefined;
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : undefined;
+}
+
+export function buildCanonicalNodeMetadata(input: BuildCanonicalMetadataInput): CanonicalNodeMetadata {
+  const existing = parseNodeMetadata(input.existing);
+  const incoming = parseNodeMetadata(input.metadata);
+
+  const type = normalizedString(input.type) ?? normalizedString(incoming.type) ?? normalizedString(existing.type);
+  const state = input.state ?? (incoming.state as NodeMetadataState | undefined) ?? (existing.state as NodeMetadataState | undefined) ?? 'not_processed';
+  const capturedMethod =
+    normalizedString(input.captured_method)
+    ?? normalizedString(incoming.captured_method)
+    ?? normalizedString(existing.captured_method);
+  const capturedBy =
+    input.captured_by
+    ?? (incoming.captured_by as NodeCapturedBy | undefined)
+    ?? (existing.captured_by as NodeCapturedBy | undefined)
+    ?? 'human';
+
+  const sourceMetadata = {
+    ...normalizeSourceMetadata(existing.source_metadata),
+    ...normalizeSourceMetadata(incoming.source_metadata),
+    ...normalizeSourceMetadata(input.source_metadata),
+  };
+
+  const merged: CanonicalNodeMetadata = {
+    ...existing,
+    ...incoming,
+    source_metadata: sourceMetadata,
+    state,
+    captured_by: capturedBy,
+  };
+
+  if (type) {
+    merged.type = type;
+  } else {
+    delete merged.type;
+  }
+
+  if (capturedMethod) {
+    merged.captured_method = capturedMethod;
+  } else {
+    delete merged.captured_method;
+  }
+
+  return merged;
+}
+
+export function mergeNodeMetadata(existing: MetadataLike, incoming: MetadataLike): CanonicalNodeMetadata {
+  return buildCanonicalNodeMetadata({ existing, metadata: incoming });
+}
+
+export function getNodeProcessedState(metadata: MetadataLike): NodeMetadataState {
+  const parsed = parseNodeMetadata(metadata);
+  return parsed.state === 'processed' ? 'processed' : 'not_processed';
+}
diff --git a/src/services/skills/skillService.ts b/src/services/skills/skillService.ts
index 346c02d..9f10dbe 100644
--- a/src/services/skills/skillService.ts
+++ b/src/services/skills/skillService.ts
@@ -38,6 +38,7 @@ const SEEDED_SKILL_IDS = new Set([
   'persona',
   'calibration',
   'connect',
+  'node-context-enrichment',
 ]);
 
 const DEPRECATED_SKILL_IDS = new Set([
diff --git a/src/tools/database/createNode.ts b/src/tools/database/createNode.ts
index ee05a0f..5e693b0 100644
--- a/src/tools/database/createNode.ts
+++ b/src/tools/database/createNode.ts
@@ -2,46 +2,91 @@ import { tool } from 'ai';
 import { z } from 'zod';
 import { getInternalApiBaseUrl } from '@/services/runtime/apiBase';
 import { formatNodeForChat } from '../infrastructure/nodeFormatter';
-import { normalizeDimensions, validateExplicitDescription } from '@/services/database/quality';
+import { normalizeDimensions } from '@/services/database/quality';
+
+function extractTextFromMessageContent(content: unknown): string {
+  if (typeof content === 'string') {
+    return content;
+  }
+
+  if (!Array.isArray(content)) {
+    return '';
+  }
+
+  return content
+    .map((part) => {
+      if (!part || typeof part !== 'object') return '';
+      const candidate = part as Record<string, unknown>;
+      if (typeof candidate.text === 'string') return candidate.text;
+      if (candidate.type === 'text' && typeof candidate.value === 'string') return candidate.value;
+      return '';
+    })
+    .filter(Boolean)
+    .join('\n');
+}
+
+function inferSourceFromContext(params: { title: string; description?: string; source?: string }, context: any): string | undefined {
+  if (typeof params.source === 'string' && params.source.trim()) {
+    return params.source.trim();
+  }
+
+  const messages = Array.isArray(context?.messages) ? context.messages : [];
+  const latestUserMessage = [...messages].reverse().find((message: any) => message?.role === 'user');
+  if (!latestUserMessage) {
+    return undefined;
+  }
+
+  const rawUserText = extractTextFromMessageContent(latestUserMessage.content).trim();
+  if (!rawUserText) {
+    return undefined;
+  }
+
+  if (/^https?:\/\//i.test(rawUserText)) {
+    return undefined;
+  }
+
+  const normalized = rawUserText.replace(/\r\n/g, '\n').trim();
+  const descriptionLength = typeof params.description === 'string' ? params.description.trim().length : 0;
+  const isSubstantialCapture = normalized.length >= Math.max(280, descriptionLength + 120) || normalized.includes('\n');
+
+  if (!isSubstantialCapture) {
+    return undefined;
+  }
+
+  return normalized;
+}
 
 export const createNodeTool = tool({
-  description: 'Create node. Description is REQUIRED and must be explicit about what the thing is (podcast, chat summary, idea, etc).',
+  description: 'Create node. Set the primary context explicitly when it is clear; otherwise the server will infer the best-fit context automatically so the node is not left unscoped. Infer a clean title, dimensions, and natural description with best effort. When the node comes from the user\'s own idea, note, or dictated thought, preserve their actual wording in source with only minimal cleanup instead of flattening it into a summary. Do not block creation if the description is incomplete. If the description framing is materially inferred, create the node first and then invite one concise user correction pass.',
   inputSchema: z.object({
     title: z.string().describe('The title of the node'),
-    description: z.string().max(280).describe('REQUIRED. Explicitly state WHAT this is (e.g. podcast episode, conversation summary, user insight) + WHY it matters for context grounding.'),
-    source: z.string().optional().describe('Raw content for embedding: transcript, article text, book passages, or user thoughts. If omitted, falls back to title + description.'),
+    description: z.string().max(500).optional().describe('Optional natural description. If you have enough context, describe what this is, why it belongs in Brad\'s graph, and its current workflow status in normal prose. Do not use labels like WHAT:, WHY:, or STATUS:.'),
+    source: z.string().optional().describe('Canonical source content for embedding. For external content, store the actual transcript/article/document text. For user-authored ideas or dictated notes, store the user\'s original wording as fully as possible with only minimal cleanup such as obvious whitespace or transcription artifacts. Do not replace raw user thinking with a thin summary.'),
     link: z.string().optional().describe('A URL link to the source'),
     event_date: z.string().optional().describe('When the thing actually happened (ISO 8601). Not when it was added to the graph.'),
+    context_id: z.number().int().positive().nullable().optional().describe('Optional primary context ID. Use when the node clearly belongs to a known context.'),
+    context_name: z.string().optional().describe('Optional convenience context name. Resolved to a stable context_id before persistence.'),
     dimensions: z
       .array(z.string())
       .max(5)
       .optional()
-      .describe('Optional dimension tags to apply to this node (0-5 items).'),
-    metadata: z.record(z.any()).optional().describe('Additional metadata like source info, extraction details, etc.')
+      .describe('Optional secondary dimension tags to apply to this node (0-5 items).'),
+    metadata: z.record(z.any()).optional().describe('Optional node metadata. Use canonical keys when known: type, state, captured_method, captured_by, and source_metadata. Source-specific facts belong inside source_metadata.')
   }),
-  execute: async (params) => {
+  execute: async (params, context) => {
     console.log('🎯 CreateNode tool called with params:', JSON.stringify(params, null, 2));
     try {
-      const descriptionError = validateExplicitDescription(params.description);
-      if (descriptionError) {
-        return {
-          success: false,
-          error: `${descriptionError} Do not retry with minor rephrasing in the same turn. Rewrite the description so it explicitly names the entity type, such as note, node, person, episode, article, project, test node, or skill, and states why it matters.`,
-          data: null
-        };
-      }
-
       const trimmedDimensions = normalizeDimensions(params.dimensions || [], 5);
+      const canonicalSource = inferSourceFromContext(params, context);
 
-      // Call the nodes API endpoint
       const response = await fetch(`${getInternalApiBaseUrl()}/api/nodes`, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ ...params, dimensions: trimmedDimensions })
+        body: JSON.stringify({ ...params, source: canonicalSource, dimensions: trimmedDimensions })
       });
 
       const result = await response.json();
-      
+
       if (!response.ok) {
         return {
           success: false,
@@ -50,20 +95,10 @@ export const createNodeTool = tool({
         };
       }
 
-      // Format the created node for chat display
-      const formattedDisplay = formatNodeForChat({
-        id: result.data.id,
-        title: result.data.title,
-        dimensions: result.data.dimensions || trimmedDimensions
-      });
-
       return {
         success: true,
-        data: {
-          ...result.data,
-          formatted_display: formattedDisplay
-        },
-        message: `Created node ${formattedDisplay} with dimensions: ${result.data.dimensions ? result.data.dimensions.join(', ') : 'none'}`
+        data: result.data,
+        message: `Created: ${formatNodeForChat(result.data)}`
       };
     } catch (error) {
       return {
@@ -75,5 +110,4 @@ export const createNodeTool = tool({
   }
 });
 
-// Legacy export for backwards compatibility
 export const createItemTool = createNodeTool;
diff --git a/src/tools/database/queryContexts.ts b/src/tools/database/queryContexts.ts
new file mode 100644
index 0000000..11850e4
--- /dev/null
+++ b/src/tools/database/queryContexts.ts
@@ -0,0 +1,90 @@
+import { tool } from 'ai';
+import { z } from 'zod';
+import { contextService } from '@/services/database/contextService';
+
+type QueryContextFilters = {
+  id?: number;
+  name?: string;
+  search?: string;
+  limit?: number;
+  includeNodes?: boolean;
+};
+
+function matchesSearch(value: string | null | undefined, search: string): boolean {
+  if (!value) return false;
+  return value.toLowerCase().includes(search);
+}
+
+export const queryContextsTool = tool({
+  description: 'List and inspect contexts. Use this to discover available primary scopes before filtering nodes or assigning node context.',
+  inputSchema: z.object({
+    filters: z.object({
+      id: z.number().int().positive().optional(),
+      name: z.string().optional(),
+      search: z.string().optional(),
+      limit: z.number().min(1).max(100).default(50).optional(),
+      includeNodes: z.boolean().default(false).optional(),
+    }).optional(),
+  }),
+  execute: async ({ filters = {} }: { filters?: QueryContextFilters }) => {
+    try {
+      const limit = filters.limit || 50;
+      const normalizedName = filters.name?.trim();
+      const normalizedSearch = filters.search?.trim().toLowerCase();
+
+      let contexts = await contextService.listContexts();
+      if (filters.id !== undefined) {
+        contexts = contexts.filter((context) => context.id === filters.id);
+      }
+      if (normalizedName) {
+        contexts = contexts.filter((context) => context.name.toLowerCase() === normalizedName.toLowerCase());
+      }
+      if (normalizedSearch) {
+        contexts = contexts.filter((context) =>
+          matchesSearch(context.name, normalizedSearch) ||
+          matchesSearch(context.description, normalizedSearch)
+        );
+      }
+
+      const limitedContexts = contexts.slice(0, limit);
+      const includeNodes = filters.includeNodes === true && limitedContexts.length === 1 && (filters.id !== undefined || Boolean(normalizedName));
+
+      const enriched = await Promise.all(limitedContexts.map(async (context) => {
+        if (!includeNodes) return context;
+        const nodes = await contextService.getNodesForContext(context.id);
+        return {
+          ...context,
+          nodes: nodes.map((node) => ({
+            id: node.id,
+            title: node.title,
+            description: node.description ?? null,
+            dimensions: node.dimensions || [],
+            context_id: node.context_id ?? null,
+            updated_at: node.updated_at,
+          })),
+        };
+      }));
+
+      return {
+        success: true,
+        data: {
+          contexts: enriched,
+          count: enriched.length,
+          total_available: contexts.length,
+          filters_applied: filters,
+        },
+        message: enriched.length === 0 ? 'No contexts found.' : `Found ${enriched.length} context(s).`,
+      };
+    } catch (error) {
+      return {
+        success: false,
+        error: error instanceof Error ? error.message : 'Failed to query contexts',
+        data: {
+          contexts: [],
+          count: 0,
+          filters_applied: filters,
+        },
+      };
+    }
+  },
+});
diff --git a/src/tools/database/queryNodes.ts b/src/tools/database/queryNodes.ts
index f2d9cd7..e339cf3 100644
--- a/src/tools/database/queryNodes.ts
+++ b/src/tools/database/queryNodes.ts
@@ -7,6 +7,7 @@ import { scoreNodeSearchMatch } from '@/services/database/searchRanking';
 
 type QueryNodeFilters = {
   dimensions?: string[];
+  contextId?: number;
   search?: string;
   limit?: number;
   createdAfter?: string;
@@ -20,6 +21,7 @@ export const queryNodesTool = tool({
   inputSchema: z.object({
     filters: z.object({
       dimensions: z.array(z.string()).describe('Filter by dimensions (e.g., ["research", "ai", "technology"]). Replaces old type/stage filtering.').optional(),
+      contextId: z.number().int().positive().describe('Optional primary context filter.').optional(),
       search: z.string().describe('Search term to match against node title, description, or source').optional(),
       limit: z.number().min(1).max(50).default(10).describe('Maximum number of results to return'),
       createdAfter: z.string().optional().describe('ISO date (YYYY-MM-DD). Only return nodes created on or after this date.'),
@@ -82,6 +84,7 @@ export const queryNodesTool = tool({
         const nodesPromise: Promise<Node[] | undefined> = nodeService.getNodes({
           limit,
           dimensions: queryFilters.dimensions,
+          contextId: queryFilters.contextId,
           search: queryFilters.search,
           searchMode: searchTerm ? 'hybrid' : 'standard',
           createdAfter: queryFilters.createdAfter,
diff --git a/src/tools/database/updateNode.ts b/src/tools/database/updateNode.ts
index c4abed8..e97ec76 100644
--- a/src/tools/database/updateNode.ts
+++ b/src/tools/database/updateNode.ts
@@ -1,20 +1,21 @@
 import { tool } from 'ai';
 import { z } from 'zod';
 import { getInternalApiBaseUrl } from '@/services/runtime/apiBase';
-import { normalizeDimensions, validateExplicitDescription } from '@/services/database/quality';
+import { normalizeDimensions } from '@/services/database/quality';
 
 export const updateNodeTool = tool({
-  description: 'Update node fields. Description is REQUIRED on every update and must explicitly state WHAT this is + WHY it matters.',
+  description: 'Update node fields. Use this to enrich or correct nodes without losing canonical source content. Context is preserved unless context_id is supplied explicitly. When fixing a user-authored idea node, source should preserve the user\'s original wording as fully as possible. Never block an update because the description is incomplete. If the new description framing is materially inferred, complete the update and then invite one concise user feedback pass.',
   inputSchema: z.object({
     id: z.number().describe('The ID of the node to update'),
     updates: z.object({
       title: z.string().optional().describe('New title'),
-      description: z.string().max(280).describe('REQUIRED on every update. Explicitly state WHAT this is + WHY it matters. No "discusses/explores".'),
-      source: z.string().optional().describe('Canonical source content for embedding. Use this only to set or correct the raw source text.'),
+      description: z.string().max(500).optional().describe('Optional natural description. Replace the whole field with one clean description when you are improving context. It should read like normal prose, not labels.'),
+      source: z.string().optional().describe('Canonical source content for embedding. Use this to set or correct the raw source text. For user-authored ideas or dictated notes, preserve the user\'s original wording with only minimal cleanup rather than compressing it into a summary.'),
       link: z.string().optional().describe('New link'),
       event_date: z.string().optional().describe('When the thing actually happened (ISO 8601). Not when it was added to the graph.'),
-      dimensions: z.array(z.string()).optional().describe('New dimension tags - completely replaces existing dimensions'),
-      metadata: z.record(z.any()).optional().describe('New metadata - completely replaces existing metadata')
+      context_id: z.number().int().positive().nullable().optional().describe('Primary context ID. Omit to preserve the existing context. Use null only to clear it intentionally.'),
+      dimensions: z.array(z.string()).optional().describe('New secondary dimension tags - completely replaces existing dimensions'),
+      metadata: z.record(z.any()).optional().describe('Metadata patch. It now merges with existing metadata instead of replacing the full blob. Use canonical keys: type, state, captured_method, captured_by, source_metadata.')
     }).describe('Object containing the fields to update. Derived analysis should be stored in a separate linked node, not appended to the source node.')
   }),
   execute: async ({ id, updates }) => {
@@ -27,27 +28,10 @@ export const updateNodeTool = tool({
         };
       }
 
-      if (!updates.description) {
-        return {
-          success: false,
-          error: 'Every node update requires an explicit description (WHAT this is + WHY it matters).',
-          data: null
-        };
-      }
-      const descriptionError = validateExplicitDescription(updates.description);
-      if (descriptionError) {
-        return {
-          success: false,
-          error: descriptionError,
-          data: null
-        };
-      }
-
       if (Array.isArray(updates.dimensions)) {
         updates.dimensions = normalizeDimensions(updates.dimensions, 5);
       }
 
-      // Call the nodes API endpoint
       const response = await fetch(`${getInternalApiBaseUrl()}/api/nodes/${id}`, {
         method: 'PUT',
         headers: { 'Content-Type': 'application/json' },
@@ -55,7 +39,7 @@ export const updateNodeTool = tool({
       });
 
       const result = await response.json();
-      
+
       if (!response.ok) {
         return {
           success: false,
@@ -74,10 +58,9 @@ export const updateNodeTool = tool({
         success: false,
         error: error instanceof Error ? error.message : 'Failed to update node',
         data: null
-        };
+      };
     }
   }
 });
 
-// Legacy export for backwards compatibility
 export const updateItemTool = updateNodeTool;
diff --git a/src/tools/infrastructure/groups.ts b/src/tools/infrastructure/groups.ts
index a158f9a..34b4277 100644
--- a/src/tools/infrastructure/groups.ts
+++ b/src/tools/infrastructure/groups.ts
@@ -40,6 +40,7 @@ export const TOOL_GROUP_ASSIGNMENTS: Record<string, string> = {
   queryDimensions: 'core',
   getDimension: 'core',
   queryDimensionNodes: 'core',
+  queryContexts: 'core',
   searchContentEmbeddings: 'core',
 
   // Orchestration: Web search and reasoning
diff --git a/src/tools/infrastructure/registry.ts b/src/tools/infrastructure/registry.ts
index 0ef0978..57d1525 100644
--- a/src/tools/infrastructure/registry.ts
+++ b/src/tools/infrastructure/registry.ts
@@ -14,6 +14,7 @@ import { deleteDimensionTool } from '../database/deleteDimension';
 import { queryDimensionsTool } from '../database/queryDimensions';
 import { getDimensionTool } from '../database/getDimension';
 import { queryDimensionNodesTool } from '../database/queryDimensionNodes';
+import { queryContextsTool } from '../database/queryContexts';
 import { searchContentEmbeddingsTool } from '../other/searchContentEmbeddings';
 import { webSearchTool } from '../other/webSearch';
 import { thinkTool } from '../other/think';
@@ -32,6 +33,7 @@ const CORE_TOOLS: Record<string, any> = {
   queryDimensions: queryDimensionsTool,
   getDimension: getDimensionTool,
   queryDimensionNodes: queryDimensionNodesTool,
+  queryContexts: queryContextsTool,
   searchContentEmbeddings: searchContentEmbeddingsTool,
 };
 
diff --git a/src/tools/other/paperExtract.ts b/src/tools/other/paperExtract.ts
index 94795bd..eb71b63 100644
--- a/src/tools/other/paperExtract.ts
+++ b/src/tools/other/paperExtract.ts
@@ -3,9 +3,20 @@ import { z } from 'zod';
 import { openai } from '@ai-sdk/openai';
 import { generateText } from 'ai';
 import { extractPaper } from '@/services/typescript/extractors/paper';
+import { getInternalApiBaseUrl } from '@/services/runtime/apiBase';
 import { formatNodeForChat } from '../infrastructure/nodeFormatter';
+import { validateExplicitDescription } from '@/services/database/quality';
+
+function ensureNodeDescription(candidate: string | undefined, fallbackLead: string): string {
+  const normalizedCandidate = typeof candidate === 'string' ? candidate.trim().replace(/\s+/g, ' ') : '';
+  if (normalizedCandidate && !validateExplicitDescription(normalizedCandidate)) {
+    return normalizedCandidate.slice(0, 500);
+  }
+  const lead = normalizedCandidate || fallbackLead.trim();
+  const suffix = 'It was added via extraction and the exact reason it belongs in the graph is not yet inferred from the available context, and it has not been reviewed yet.';
+  return `${lead}${/[.!?]$/.test(lead) ? ' ' : '. '}${suffix}`.slice(0, 500);
+}
 
-// AI-powered content analysis
 async function analyzeContentWithAI(title: string, description: string, contentType: string) {
   try {
     const prompt = `Analyze this ${contentType} content and provide classification.
@@ -13,56 +24,36 @@ async function analyzeContentWithAI(title: string, description: string, contentT
 Title: "${title}"
 Description: "${description}"
 
-CRITICAL — nodeDescription rules (max 280 chars):
-1. Say WHAT this literally is: "Paper by…", "Research from…", "Preprint introducing…"
-2. Name the authors if known from the metadata.
-3. State the actual finding, method, or contribution — not "a study on X" but what they actually found or built.
-4. End with why it matters — one concrete phrase about impact or implication.
-5. ABSOLUTELY FORBIDDEN: "discusses", "explores", "examines", "talks about", "delves into", "emphasizing the need for". State things directly.
+CRITICAL — nodeDescription rules (max 500 chars):
+1. Write natural prose.
+2. Make clear what this literally is.
+3. State the actual finding, method, or contribution.
+4. Make clear why it belongs in the graph. If unclear, say so naturally.
+5. Make the workflow status clear.
 
-Examples:
-- Title: "Attention Is All You Need" / Authors: Vaswani et al.
-  GOOD: "Vaswani et al. introduce the Transformer architecture — replaces recurrence with self-attention for sequence modeling. Foundation of every modern LLM."
-  BAD: "This paper discusses a new architecture called the Transformer and explores its applications."
-
-- Title: "Scaling Laws for Neural Language Models" / Authors: Kaplan et al.
-  GOOD: "Kaplan et al. show that LLM performance scales as a power law with compute, data, and parameters — and compute matters most. The paper that launched the scaling era."
-  BAD: "A study examining how neural language models scale with different factors."
-
-Respond with ONLY valid JSON (no markdown, no code blocks):
+Respond with ONLY valid JSON:
 {
-  "enhancedDescription": "A comprehensive summary (3-6 paragraphs, 800-1500 chars). Cover key points, arguments, takeaways.",
-  "nodeDescription": "<your 280-char description following the rules above>",
-  "tags": ["relevant", "semantic", "tags"],
-  "reasoning": "Brief explanation of classification choices"
+  "enhancedDescription": "A comprehensive summary.",
+  "nodeDescription": "<your natural description>",
+  "reasoning": "Brief explanation"
 }`;
-
     const response = await generateText({
       model: openai('gpt-4o-mini'),
       prompt,
       maxOutputTokens: 800
     });
-
-    let content = response.text || '{}';
-
-    // Clean up the response - remove markdown code blocks if present
-    content = content.replace(/```json\s*/g, '').replace(/```\s*/g, '').trim();
-
+    const content = (response.text || '{}').replace(/```json\s*/g, '').replace(/```\s*/g, '').trim();
     const result = JSON.parse(content);
-
     return {
       enhancedDescription: result.enhancedDescription || description,
-      nodeDescription: typeof result.nodeDescription === 'string' ? result.nodeDescription.slice(0, 280) : undefined,
-      tags: Array.isArray(result.tags) ? result.tags : [],
+      nodeDescription: typeof result.nodeDescription === 'string' ? result.nodeDescription.slice(0, 500) : undefined,
       reasoning: result.reasoning || 'AI analysis completed'
     };
   } catch (error) {
-    const message = error instanceof Error ? error.message : 'unknown error';
-    console.warn('Paper analysis fallback (using default description):', message);
+    console.warn('Paper analysis fallback (using default description):', error);
     return {
       enhancedDescription: description,
       nodeDescription: undefined,
-      tags: [],
       reasoning: 'Fallback description used'
     };
   }
@@ -73,30 +64,19 @@ export const paperExtractTool = tool({
   inputSchema: z.object({
     url: z.string().describe('The PDF URL to add to inbox'),
     title: z.string().optional().describe('Custom title (auto-generated if not provided)'),
-    dimensions: z.array(z.string()).min(1).max(5).optional().describe('Dimension tags to apply to the created node (locked dimensions first)')
+    dimensions: z.array(z.string()).min(1).max(5).optional().describe('Dimension tags to apply to the created node')
   }),
   execute: async ({ url, title, dimensions }) => {
     try {
-      // Validate PDF URL
       if (!url.startsWith('http://') && !url.startsWith('https://')) {
-        return {
-          success: false,
-          error: 'Invalid URL format - must start with http:// or https://',
-          data: null
-        };
+        return { success: false, error: 'Invalid URL format - must start with http:// or https://', data: null };
       }
 
-      // Check if URL likely points to a PDF
       if (!url.toLowerCase().includes('.pdf') && !url.includes('arxiv.org')) {
-        return {
-          success: false,
-          error: 'URL does not appear to point to a PDF file',
-          data: null
-        };
+        return { success: false, error: 'URL does not appear to point to a PDF file', data: null };
       }
 
       let result: { success: boolean; source?: string; metadata?: any; error?: string };
-      
       try {
         const extractionResult = await extractPaper(url);
         result = {
@@ -112,91 +92,72 @@ export const paperExtractTool = tool({
           }
         };
       } catch (error: any) {
-        result = { 
-          success: false, 
-          error: error.message || 'TypeScript extraction failed' 
-        };
+        result = { success: false, error: error.message || 'TypeScript extraction failed' };
       }
 
       if (!result.success || !result.source) {
-        return {
-          success: false,
-          error: result.error || 'Failed to extract PDF content',
-          data: null
-        };
+        return { success: false, error: result.error || 'Failed to extract PDF content', data: null };
       }
 
-      console.log('🎯 PDF extraction successful, analyzing with AI...');
-
-      // Step 2: AI Analysis for enhanced metadata
       const aiAnalysis = await analyzeContentWithAI(
-        result.metadata?.title || `PDF: ${new URL(url).pathname.split('/').pop()?.replace('.pdf', '')}`, 
-        result.source.substring(0, 2000) || 'PDF document content', 
+        result.metadata?.title || `PDF: ${new URL(url).pathname.split('/').pop()?.replace('.pdf', '')}`,
+        result.source.substring(0, 2000) || 'PDF document content',
         'pdf'
       );
 
-      // Step 3: Create node with extracted content and AI analysis
       const nodeTitle = title || result.metadata?.title || `PDF: ${new URL(url).pathname.split('/').pop()?.replace('.pdf', '')}`;
-      const enhancedDescription = aiAnalysis?.enhancedDescription || `PDF document from ${new URL(url).hostname}`;
-      
-      const suppliedDimensions = Array.isArray(dimensions) ? dimensions : [];
-      let trimmedDimensions = suppliedDimensions
-        .map(dim => (typeof dim === 'string' ? dim.trim() : ''))
-        .filter(Boolean);
+      const nodeDescription = ensureNodeDescription(
+        aiAnalysis?.nodeDescription,
+        `Research paper or PDF from ${new URL(url).hostname} titled ${nodeTitle}`
+      );
+      const trimmedDimensions = Array.isArray(dimensions) ? dimensions.slice(0, 5) : [];
 
-      trimmedDimensions = trimmedDimensions.slice(0, 5);
-
-      const createResponse = await fetch(`${process.env.NEXT_PUBLIC_BASE_URL || 'http://localhost:3000'}/api/nodes`, {
+      const createResponse = await fetch(`${getInternalApiBaseUrl()}/api/nodes`, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({
           title: nodeTitle,
-          description: aiAnalysis?.nodeDescription,
+          description: nodeDescription,
           source: result.source,
           link: url,
           dimensions: trimmedDimensions,
           metadata: {
-            source: 'pdf',
-            hostname: new URL(url).hostname,
-            author: result.metadata?.author || result.metadata?.info?.Author,
-            pages: result.metadata?.pages,
-            file_size: result.metadata?.file_size,
-            content_length: result.source.length,
-            extraction_method: result.metadata?.extraction_method || 'python_pdfplumber',
-            ai_analysis: aiAnalysis?.reasoning,
-            enhanced_description: enhancedDescription,
-            refined_at: new Date().toISOString()
+            type: 'pdf',
+            state: 'not_processed',
+            captured_method: 'paper_extract',
+            captured_by: 'agent',
+            source_metadata: {
+              hostname: new URL(url).hostname,
+              author: result.metadata?.author || result.metadata?.info?.Author,
+              pages: result.metadata?.pages,
+              content_length: result.source.length,
+              extraction_method: result.metadata?.extraction_method || 'typescript',
+              ai_analysis: aiAnalysis?.reasoning,
+              enhanced_description: aiAnalysis?.enhancedDescription,
+              refined_at: new Date().toISOString()
+            }
           }
         })
       });
 
       const createResult = await createResponse.json();
-
       if (!createResponse.ok) {
-        return {
-          success: false,
-          error: createResult.error || 'Failed to create node',
-          data: null
-        };
+        return { success: false, error: createResult.error || 'Failed to create node', data: null };
       }
 
-      console.log('🎯 PaperExtract completed successfully');
-
-      // Use actual assigned dimensions from API response (includes auto-assigned locked + keywords)
       const actualDimensions: string[] = createResult.data?.dimensions || trimmedDimensions || [];
       const formattedNode = createResult.data?.id
         ? formatNodeForChat({ id: createResult.data.id, title: nodeTitle, dimensions: actualDimensions })
         : nodeTitle;
-      const dimsDisplay = actualDimensions.length > 0 ? actualDimensions.join(', ') : 'none';
 
       return {
         success: true,
-        message: `Added ${formattedNode} with dimensions: ${dimsDisplay}`,
+        message: `Added ${formattedNode} with dimensions: ${actualDimensions.length > 0 ? actualDimensions.join(', ') : 'none'}`,
         data: {
           nodeId: createResult.data?.id,
           title: nodeTitle,
           contentLength: result.source.length,
-          url: url,
+          url,
           dimensions: actualDimensions
         }
       };
diff --git a/src/tools/other/websiteExtract.ts b/src/tools/other/websiteExtract.ts
index 2354554..971b18d 100644
--- a/src/tools/other/websiteExtract.ts
+++ b/src/tools/other/websiteExtract.ts
@@ -3,13 +3,25 @@ import { z } from 'zod';
 import { openai } from '@ai-sdk/openai';
 import { generateText } from 'ai';
 import { extractWebsite } from '@/services/typescript/extractors/website';
+import { getInternalApiBaseUrl } from '@/services/runtime/apiBase';
 import { formatNodeForChat } from '../infrastructure/nodeFormatter';
+import { validateExplicitDescription } from '@/services/database/quality';
 
 interface ExistingDimension {
   name: string;
   description: string | null;
 }
 
+function ensureNodeDescription(candidate: string | undefined, fallbackLead: string): string {
+  const normalizedCandidate = typeof candidate === 'string' ? candidate.trim().replace(/\s+/g, ' ') : '';
+  if (normalizedCandidate && !validateExplicitDescription(normalizedCandidate)) {
+    return normalizedCandidate.slice(0, 500);
+  }
+  const lead = normalizedCandidate || fallbackLead.trim();
+  const suffix = 'It was added via extraction and the exact reason it belongs in the graph is not yet inferred from the available context, and it has not been reviewed yet.';
+  return `${lead}${/[.!?]$/.test(lead) ? ' ' : '. '}${suffix}`.slice(0, 500);
+}
+
 function inferWebsiteContentType(url: string): 'website' | 'tweet' {
   try {
     const hostname = new URL(url).hostname.toLowerCase();
@@ -23,12 +35,10 @@ function inferWebsiteContentType(url: string): 'website' | 'tweet' {
 
 async function fetchExistingDimensions(): Promise<ExistingDimension[]> {
   try {
-    const response = await fetch(`${process.env.NEXT_PUBLIC_BASE_URL || 'http://localhost:3000'}/api/dimensions/popular`);
+    const response = await fetch(`${getInternalApiBaseUrl()}/api/dimensions/popular`);
     if (!response.ok) return [];
-
     const result = await response.json();
     if (!Array.isArray(result.data)) return [];
-
     return result.data
       .map((dimension: { dimension?: unknown; description?: unknown }) => ({
         name: typeof dimension.dimension === 'string' ? dimension.dimension.trim() : '',
@@ -41,17 +51,11 @@ async function fetchExistingDimensions(): Promise<ExistingDimension[]> {
   }
 }
 
-function selectExistingDimensions(
-  selected: unknown,
-  existingDimensions: ExistingDimension[],
-  max = 5
-): string[] {
+function selectExistingDimensions(selected: unknown, existingDimensions: ExistingDimension[], max = 5): string[] {
   if (!Array.isArray(selected) || existingDimensions.length === 0) return [];
-
   const byLowerName = new Map(existingDimensions.map((dimension) => [dimension.name.toLowerCase(), dimension.name]));
   const normalized: string[] = [];
   const seen = new Set<string>();
-
   for (const value of selected) {
     if (typeof value !== 'string') continue;
     const matched = byLowerName.get(value.trim().toLowerCase());
@@ -62,89 +66,53 @@ function selectExistingDimensions(
     normalized.push(matched);
     if (normalized.length >= max) break;
   }
-
   return normalized;
 }
 
-// AI-powered content analysis
-async function analyzeContentWithAI(
-  title: string,
-  description: string,
-  contentType: string,
-  existingDimensions: ExistingDimension[]
-) {
+async function analyzeContentWithAI(title: string, description: string, contentType: string, existingDimensions: ExistingDimension[]) {
   try {
     const availableDimensionsBlock = existingDimensions.length > 0
-      ? existingDimensions
-          .map((dimension) => `- ${dimension.name}${dimension.description ? `: ${dimension.description}` : ''}`)
-          .join('\n')
+      ? existingDimensions.map((dimension) => `- ${dimension.name}${dimension.description ? `: ${dimension.description}` : ''}`).join('\n')
       : '- No existing dimensions available. Return an empty dimensions array.';
     const prompt = `Analyze this ${contentType} content and provide classification.
 
 Title: "${title}"
 Description: "${description}"
 
-CRITICAL — nodeDescription rules (max 280 chars):
-1. Say WHAT this literally is using explicit entity words only: "Blog post by…", "Article from…", "Essay arguing…", "Tutorial on…", "Thread by…", "Tweet by…", "Post by…"
-2. Name the author/site if known from the metadata.
-3. State the actual claim or thesis — don't paraphrase into vague abstractions.
-4. End with why it's interesting or important — one concrete phrase.
-5. ABSOLUTELY FORBIDDEN: "discusses", "explores", "examines", "talks about", "delves into", "emphasizing the need for". State things directly.
-
-DIMENSION SELECTION (critical):
-You must select 0-3 dimensions from the list below.
-Do NOT invent new dimension names.
-Pick only dimensions that genuinely fit this content.
-If nothing fits, return an empty array.
+CRITICAL — nodeDescription rules (max 500 chars):
+1. Write natural prose, not labels or a checklist.
+2. Make clear what this literally is using explicit entity words only.
+3. Name the author/site if known from the metadata.
+4. State the actual claim or thesis.
+5. Make clear why it belongs in the graph. If that remains unclear, say so naturally.
+6. Make workflow status clear.
 
 Available dimensions:
 ${availableDimensionsBlock}
 
-Examples:
-- Title: "Software is eating the world — again" / Author: Andrej Karpathy
-  GOOD: "Karpathy's blog post arguing AI agents make software fluid — they can rip functionality from repos instead of taking dependencies. Signals the end of monolithic libraries."
-  BAD: "By Karpathy — discusses the importance of software becoming more fluid and malleable with agents."
-
-- Title: "The case for slowing down AI" / Site: The Atlantic
-  GOOD: "Atlantic article making the case that AI labs should voluntarily slow capability research until safety catches up. Notable because it cites internal lab disagreements."
-  BAD: "This article explores ideas about slowing down AI development and its implications."
-
-Respond with ONLY valid JSON (no markdown, no code blocks):
+Respond with ONLY valid JSON:
 {
-  "enhancedDescription": "A comprehensive summary (3-6 paragraphs, 800-1500 chars). Cover key points, arguments, takeaways.",
-  "nodeDescription": "<your 280-char description following the rules above>",
-  "dimensions": ["existing-dimension-1", "existing-dimension-2"],
-  "reasoning": "Brief explanation of classification choices"
+  "enhancedDescription": "A comprehensive summary.",
+  "nodeDescription": "<your natural description>",
+  "dimensions": ["existing-dimension-1"],
+  "reasoning": "Brief explanation"
 }`;
-
     const response = await generateText({
       model: openai('gpt-4o-mini'),
       prompt,
       maxOutputTokens: 800
     });
-
-    let content = response.text || '{}';
-
-    // Clean up the response - remove markdown code blocks if present
-    content = content.replace(/```json\s*/g, '').replace(/```\s*/g, '').trim();
-
+    const content = (response.text || '{}').replace(/```json\s*/g, '').replace(/```\s*/g, '').trim();
     const result = JSON.parse(content);
-
     return {
       enhancedDescription: result.enhancedDescription || description,
-      nodeDescription: typeof result.nodeDescription === 'string' ? result.nodeDescription.slice(0, 280) : undefined,
+      nodeDescription: typeof result.nodeDescription === 'string' ? result.nodeDescription.slice(0, 500) : undefined,
       dimensions: selectExistingDimensions(result.dimensions, existingDimensions, 5),
       reasoning: result.reasoning || 'AI analysis completed'
     };
   } catch (error) {
-    const message = error instanceof Error ? error.message : 'unknown error';
-    console.warn('Website analysis fallback (using default description):', message);
-    return {
-      enhancedDescription: description,
-      nodeDescription: undefined,
-      dimensions: [],
-      reasoning: 'Fallback description used'
-    };
+    console.warn('Website analysis fallback (using default description):', error);
+    return { enhancedDescription: description, nodeDescription: undefined, dimensions: [], reasoning: 'Fallback description used' };
   }
 }
 
@@ -153,21 +121,15 @@ export const websiteExtractTool = tool({
   inputSchema: z.object({
     url: z.string().describe('The website URL to add to knowledge base'),
     title: z.string().optional().describe('Custom title (auto-generated if not provided)'),
-    dimensions: z.array(z.string()).min(1).max(5).optional().describe('Dimension tags to apply to the created node (locked dimensions first)')
+    dimensions: z.array(z.string()).min(1).max(5).optional().describe('Dimension tags to apply to the created node')
   }),
   execute: async ({ url, title, dimensions }) => {
     try {
-      // Validate URL format
       if (!url.startsWith('http://') && !url.startsWith('https://')) {
-        return {
-          success: false,
-          error: 'Invalid URL format - must start with http:// or https://',
-          data: null
-        };
+        return { success: false, error: 'Invalid URL format - must start with http:// or https://', data: null };
       }
 
       let result: { success: boolean; source?: string; metadata?: any; error?: string };
-      
       try {
         const extractionResult = await extractWebsite(url);
         result = {
@@ -184,97 +146,75 @@ export const websiteExtractTool = tool({
           }
         };
       } catch (error: any) {
-        result = { 
-          success: false, 
-          error: error.message || 'TypeScript extraction failed' 
-        };
+        result = { success: false, error: error.message || 'TypeScript extraction failed' };
       }
 
       if (!result.success || !result.source) {
-        return {
-          success: false,
-          error: result.error || 'Failed to extract website content',
-          data: null
-        };
+        return { success: false, error: result.error || 'Failed to extract website content', data: null };
       }
 
-      console.log('🎯 Website extraction successful, analyzing with AI...');
-
-      // Step 2: AI Analysis for enhanced metadata
       const existingDimensions = await fetchExistingDimensions();
-      const contentType = inferWebsiteContentType(url);
       const aiAnalysis = await analyzeContentWithAI(
-        result.metadata?.title || `Website: ${new URL(url).hostname}`, 
-        result.source.substring(0, 2000) || 'Website content', 
-        contentType,
+        result.metadata?.title || `Website: ${new URL(url).hostname}`,
+        result.source.substring(0, 2000) || 'Website content',
+        inferWebsiteContentType(url),
         existingDimensions
       );
 
-      // Step 3: Create node with extracted content and AI analysis
       const nodeTitle = title || result.metadata?.title || `Website: ${new URL(url).hostname}`;
-      const enhancedDescription = aiAnalysis?.enhancedDescription || `Website content from ${new URL(url).hostname}`;
-      
-      const suppliedDimensions = Array.isArray(dimensions) ? dimensions : [];
-      let trimmedDimensions = suppliedDimensions
-        .map(dim => (typeof dim === 'string' ? dim.trim() : ''))
-        .filter(Boolean);
+      const suppliedDimensions = Array.isArray(dimensions) ? dimensions.slice(0, 5) : [];
+      const finalDimensions = suppliedDimensions.length > 0 ? suppliedDimensions : (aiAnalysis?.dimensions || []).slice(0, 5);
+      const nodeDescription = ensureNodeDescription(
+        aiAnalysis?.nodeDescription,
+        `Website article from ${result.metadata?.site_name || new URL(url).hostname} titled ${nodeTitle}`
+      );
 
-      trimmedDimensions = trimmedDimensions.slice(0, 5);
-      const finalDimensions = trimmedDimensions.length > 0
-        ? trimmedDimensions
-        : (aiAnalysis?.dimensions || []).slice(0, 5);
-
-      const createResponse = await fetch(`${process.env.NEXT_PUBLIC_BASE_URL || 'http://localhost:3000'}/api/nodes`, {
+      const createResponse = await fetch(`${getInternalApiBaseUrl()}/api/nodes`, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({
           title: nodeTitle,
-          description: aiAnalysis?.nodeDescription,
+          description: nodeDescription,
           source: result.source,
           link: url,
-          event_date: result.metadata?.published_date || result.metadata?.date || null,
           dimensions: finalDimensions,
           metadata: {
-            source: contentType,
-            hostname: new URL(url).hostname,
-            author: result.metadata?.author,
-            published_date: result.metadata?.published_date || result.metadata?.date,
-            content_length: result.source.length,
-            extraction_method: result.metadata?.extraction_method || 'python_beautifulsoup',
-            ai_analysis: aiAnalysis?.reasoning,
-            enhanced_description: enhancedDescription,
-            refined_at: new Date().toISOString()
+            type: inferWebsiteContentType(url),
+            state: 'not_processed',
+            captured_method: 'website_extract',
+            captured_by: 'agent',
+            source_metadata: {
+              hostname: new URL(url).hostname,
+              author: result.metadata?.author,
+              site_name: result.metadata?.site_name,
+              date: result.metadata?.date,
+              og_image: result.metadata?.og_image,
+              extraction_method: result.metadata?.extraction_method,
+              ai_analysis: aiAnalysis?.reasoning,
+              refined_at: new Date().toISOString()
+            }
           }
         })
       });
 
       const createResult = await createResponse.json();
-
       if (!createResponse.ok) {
-        return {
-          success: false,
-          error: createResult.error || 'Failed to create node',
-          data: null
-        };
+        return { success: false, error: createResult.error || 'Failed to create node', data: null };
       }
 
-      console.log('🎯 WebsiteExtract completed successfully');
-
-      // Use actual assigned dimensions from API response (includes auto-assigned locked + keywords)
       const actualDimensions: string[] = createResult.data?.dimensions || finalDimensions || [];
       const formattedNode = createResult.data?.id
         ? formatNodeForChat({ id: createResult.data.id, title: nodeTitle, dimensions: actualDimensions })
         : nodeTitle;
-      const dimsDisplay = actualDimensions.length > 0 ? actualDimensions.join(', ') : 'none';
 
       return {
         success: true,
-        message: `Added ${formattedNode} with dimensions: ${dimsDisplay}`,
+        message: `Added ${formattedNode} with dimensions: ${actualDimensions.length > 0 ? actualDimensions.join(', ') : 'none'}`,
         data: {
           nodeId: createResult.data?.id,
           title: nodeTitle,
           contentLength: result.source.length,
-          url: url,
+          url,
           dimensions: actualDimensions
         }
       };
diff --git a/src/tools/other/youtubeExtract.ts b/src/tools/other/youtubeExtract.ts
index 719dda3..f3c609c 100644
--- a/src/tools/other/youtubeExtract.ts
+++ b/src/tools/other/youtubeExtract.ts
@@ -3,16 +3,33 @@ import { z } from 'zod';
 import { openai } from '@ai-sdk/openai';
 import { generateText } from 'ai';
 import { extractYouTube } from '@/services/typescript/extractors/youtube';
+import { getInternalApiBaseUrl } from '@/services/runtime/apiBase';
 import { formatNodeForChat } from '../infrastructure/nodeFormatter';
+import { validateExplicitDescription } from '@/services/database/quality';
 
 interface ExistingDimension {
   name: string;
   description: string | null;
 }
 
+function ensureNodeDescription(candidate: string | undefined, fallbackLead: string): string {
+  const normalizedCandidate = typeof candidate === 'string'
+    ? candidate.trim().replace(/\s+/g, ' ')
+    : '';
+
+  if (normalizedCandidate && !validateExplicitDescription(normalizedCandidate)) {
+    return normalizedCandidate.slice(0, 500);
+  }
+
+  const lead = normalizedCandidate || fallbackLead.trim();
+  const suffix = 'It was added via extraction and the exact reason it belongs in the graph is not yet inferred from the available context, and it has not been reviewed yet.';
+  const joined = `${lead}${/[.!?]$/.test(lead) ? ' ' : '. '}${suffix}`;
+  return joined.slice(0, 500);
+}
+
 async function fetchExistingDimensions(): Promise<ExistingDimension[]> {
   try {
-    const response = await fetch(`${process.env.NEXT_PUBLIC_BASE_URL || 'http://localhost:3000'}/api/dimensions/popular`);
+    const response = await fetch(`${getInternalApiBaseUrl()}/api/dimensions/popular`);
     if (!response.ok) return [];
 
     const result = await response.json();
@@ -30,11 +47,7 @@ async function fetchExistingDimensions(): Promise<ExistingDimension[]> {
   }
 }
 
-function selectExistingDimensions(
-  selected: unknown,
-  existingDimensions: ExistingDimension[],
-  max = 5
-): string[] {
+function selectExistingDimensions(selected: unknown, existingDimensions: ExistingDimension[], max = 5): string[] {
   if (!Array.isArray(selected) || existingDimensions.length === 0) return [];
 
   const byLowerName = new Map(existingDimensions.map((dimension) => [dimension.name.toLowerCase(), dimension.name]));
@@ -55,55 +68,39 @@ function selectExistingDimensions(
   return normalized;
 }
 
-// AI-powered content analysis
-async function analyzeContentWithAI(
-  title: string,
-  description: string,
-  contentType: string,
-  existingDimensions: ExistingDimension[]
-) {
+async function analyzeContentWithAI(title: string, description: string, contentType: string, existingDimensions: ExistingDimension[]) {
   try {
     const availableDimensionsBlock = existingDimensions.length > 0
-      ? existingDimensions
-          .map((dimension) => `- ${dimension.name}${dimension.description ? `: ${dimension.description}` : ''}`)
-          .join('\n')
+      ? existingDimensions.map((dimension) => `- ${dimension.name}${dimension.description ? `: ${dimension.description}` : ''}`).join('\n')
       : '- No existing dimensions available. Return an empty dimensions array.';
+
     const prompt = `Analyze this ${contentType} content and provide classification.
 
 Title: "${title}"
 Description: "${description}"
 
-CRITICAL — nodeDescription rules (max 280 chars):
-1. Say WHAT this literally is: "Podcast episode where…", "Talk by…", "Interview with…", "Video essay on…"
-2. Name people by their role: the channel/host is the creator, anyone in the title is likely the guest or subject.
-3. State the actual claim or thesis from the title — don't paraphrase into vague abstractions.
-4. End with why it's interesting or important — one concrete phrase.
-5. ABSOLUTELY FORBIDDEN: "discusses", "explores", "examines", "talks about", "delves into", "emphasizing the need for". State things directly.
+CRITICAL — nodeDescription rules (max 500 chars):
+1. Write natural prose, not labels or a checklist.
+2. Make clear what this literally is: "Podcast episode where…", "Talk by…", "Interview with…", "Video essay on…"
+3. Name people by their role: the channel/host is the creator, anyone in the title is likely the guest or subject.
+4. State the actual claim or thesis from the title.
+5. Make clear why it belongs in the graph. If that cannot be inferred, say so naturally.
+6. Make the workflow status clear. If unknown, say naturally that it has not been reviewed yet.
+7. ABSOLUTELY FORBIDDEN: "discusses", "explores", "examines", "talks about", "delves into", "emphasizing the need for", "insightful for understanding", "relevant to".
 
-DIMENSION SELECTION (critical):
+DIMENSION SELECTION:
 You must select 0-3 dimensions from the list below.
 Do NOT invent new dimension names.
-Pick only dimensions that genuinely fit this content.
-If nothing fits, return an empty array.
 
 Available dimensions:
 ${availableDimensionsBlock}
 
-Examples:
-- Title: "Dario Amodei — We are near the end of the exponential" / Channel: Dwarkesh Patel
-  GOOD: "Dwarkesh Patel interview with Anthropic CEO Dario Amodei — argues we're nearing the end of exponential AI scaling. Key signal for what the next phase of AI development looks like."
-  BAD: "By Dario Amodei — discusses reaching the limits of exponential growth in AI, emphasizing the need for a critical perspective."
-
-- Title: "The spell of language models" / Channel: Andrej Karpathy
-  GOOD: "Karpathy talk on how LLMs work under the hood — tokenization, attention, and why they feel like magic but aren't. Essential mental model for anyone building with LLMs."
-  BAD: "By Andrej Karpathy — explores the nature of language models and their capabilities."
-
-Respond with ONLY valid JSON (no markdown, no code blocks):
+Respond with ONLY valid JSON:
 {
-  "enhancedDescription": "A comprehensive summary (3-6 paragraphs, 800-1500 chars). Cover key points, arguments, takeaways.",
-  "nodeDescription": "<your 280-char description following the rules above>",
-  "dimensions": ["existing-dimension-1", "existing-dimension-2"],
-  "reasoning": "Brief explanation of classification choices"
+  "enhancedDescription": "A comprehensive summary (3-6 paragraphs, 800-1500 chars).",
+  "nodeDescription": "<your natural description>",
+  "dimensions": ["existing-dimension-1"],
+  "reasoning": "Brief explanation"
 }`;
 
     const response = await generateText({
@@ -112,22 +109,17 @@ Respond with ONLY valid JSON (no markdown, no code blocks):
       maxOutputTokens: 800
     });
 
-    let content = response.text || '{}';
-
-    // Clean up the response - remove markdown code blocks if present
-    content = content.replace(/```json\s*/g, '').replace(/```\s*/g, '').trim();
-
+    const content = (response.text || '{}').replace(/```json\s*/g, '').replace(/```\s*/g, '').trim();
     const result = JSON.parse(content);
 
     return {
       enhancedDescription: result.enhancedDescription || description,
-      nodeDescription: typeof result.nodeDescription === 'string' ? result.nodeDescription.slice(0, 280) : undefined,
+      nodeDescription: typeof result.nodeDescription === 'string' ? result.nodeDescription.slice(0, 500) : undefined,
       dimensions: selectExistingDimensions(result.dimensions, existingDimensions, 5),
       reasoning: result.reasoning || 'AI analysis completed'
     };
   } catch (error) {
-    const message = error instanceof Error ? error.message : 'unknown error';
-    console.warn('YouTube analysis fallback (using default description):', message);
+    console.warn('YouTube analysis fallback (using default description):', error);
     return {
       enhancedDescription: description,
       nodeDescription: undefined,
@@ -142,29 +134,21 @@ async function summariseTranscript(title: string, transcript: string): Promise<s
     return null;
   }
 
-  // Limit transcript length to keep token costs manageable
-  const MAX_CHARS = 16000;
-  let excerpt = transcript.trim();
-  if (excerpt.length > MAX_CHARS) {
-    const head = excerpt.slice(0, MAX_CHARS / 2);
-    const tail = excerpt.slice(-MAX_CHARS / 2);
-    excerpt = `${head}\n[...]\n${tail}`;
-  }
-
-  const prompt = `You are summarising a long-form recording for a knowledge graph entry. Title: "${title}".
-
-Using the transcript excerpt below, write a concise 3-4 sentence summary covering the main themes, notable claims, and outcomes. If specific terms, frameworks, or memorable lines appear, mention them. Keep the tone factual (no marketing language). If the excerpt appears truncated, note that the summary is based on the portion provided.
-
-Transcript excerpt:
-"""
-${excerpt}
-"""
-`;
+  const excerpt = transcript.trim().length > 16000
+    ? `${transcript.trim().slice(0, 8000)}\n[...]\n${transcript.trim().slice(-8000)}`
+    : transcript.trim();
 
   try {
     const response = await generateText({
       model: openai('gpt-4o-mini'),
-      prompt,
+      prompt: `You are summarising a long-form recording for a knowledge graph entry. Title: "${title}".
+
+Using the transcript excerpt below, write a concise 3-4 sentence summary covering the main themes, notable claims, and outcomes. Keep the tone factual.
+
+Transcript excerpt:
+"""
+${excerpt}
+"""`,
       maxOutputTokens: 400
     });
     return response.text?.trim() || null;
@@ -179,23 +163,17 @@ export const youtubeExtractTool = tool({
   inputSchema: z.object({
     url: z.string().describe('The YouTube video URL to add to knowledge base'),
     title: z.string().optional().describe('Custom title (auto-generated if not provided)'),
-    dimensions: z.array(z.string()).min(1).max(5).optional().describe('Dimension tags to apply to the created node (locked dimensions first)')
+    dimensions: z.array(z.string()).min(1).max(5).optional().describe('Dimension tags to apply to the created node')
   }),
   execute: async ({ url, title, dimensions }) => {
     console.log('🎯 YouTubeExtract tool called with URL:', url);
     try {
-      // Validate YouTube URL
       if (!url.includes('youtube.com') && !url.includes('youtu.be')) {
-        return {
-          success: false,
-          error: 'Invalid YouTube URL format',
-          data: null
-        };
+        return { success: false, error: 'Invalid YouTube URL format', data: null };
       }
 
       let result: { success: boolean; source?: string; metadata?: any; error?: string };
-      
-      console.log('📝 Using TypeScript yt-dlp extractor');
+
       try {
         const extractionResult = await extractYouTube(url);
         result = {
@@ -215,98 +193,81 @@ export const youtubeExtractTool = tool({
           error: extractionResult.error
         };
       } catch (error: any) {
-        result = { 
-          success: false, 
-          error: error.message || 'TypeScript extraction failed' 
-        };
+        result = { success: false, error: error.message || 'TypeScript extraction failed' };
       }
 
       if (!result.success || !result.source) {
-        return {
-          success: false,
-          error: result.error || 'Failed to extract YouTube content',
-          data: null
-        };
+        return { success: false, error: result.error || 'Failed to extract YouTube content', data: null };
       }
 
-      console.log('🎯 YouTube extraction successful, analyzing with AI...');
-
-      // Step 2: AI Analysis for enhanced metadata
       const existingDimensions = await fetchExistingDimensions();
       const aiAnalysis = await analyzeContentWithAI(
-        result.metadata?.video_title || 'YouTube Video', 
-        `Video by ${result.metadata?.channel_name || 'Unknown Channel'}`, 
+        result.metadata?.video_title || 'YouTube Video',
+        `Video by ${result.metadata?.channel_name || 'Unknown Channel'}`,
         'youtube',
         existingDimensions
       );
 
-      // Step 3: Create node with extracted content and AI analysis
       const nodeTitle = title || result.metadata?.video_title || `YouTube Video ${url.split('/').pop()?.split('?')[0]}`;
       const transcriptSummary = await summariseTranscript(nodeTitle, result.source);
-
       const suppliedDimensions = Array.isArray(dimensions) ? dimensions : [];
-      let trimmedDimensions = suppliedDimensions
-        .map(dim => (typeof dim === 'string' ? dim.trim() : ''))
-        .filter(Boolean);
-
-      trimmedDimensions = trimmedDimensions.slice(0, 5);
-      const finalDimensions = trimmedDimensions.length > 0
-        ? trimmedDimensions
+      const finalDimensions = suppliedDimensions.slice(0, 5).length > 0
+        ? suppliedDimensions.slice(0, 5)
         : (aiAnalysis?.dimensions || []).slice(0, 5);
+      const nodeDescription = ensureNodeDescription(
+        aiAnalysis?.nodeDescription,
+        transcriptSummary || `YouTube video by ${result.metadata?.channel_name || 'an unknown creator'} about ${nodeTitle}`
+      );
 
-      const createResponse = await fetch(`${process.env.NEXT_PUBLIC_BASE_URL || 'http://localhost:3000'}/api/nodes`, {
+      const createResponse = await fetch(`${getInternalApiBaseUrl()}/api/nodes`, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({
           title: nodeTitle,
-          description: aiAnalysis?.nodeDescription,
+          description: nodeDescription,
           source: result.source,
           link: url,
           dimensions: finalDimensions,
           metadata: {
-            source: 'youtube',
-            video_id: result.metadata?.video_id,
-            channel_name: result.metadata?.channel_name,
-            channel_url: result.metadata?.channel_url,
-            thumbnail_url: result.metadata?.thumbnail_url,
-            transcript_length: result.metadata?.transcript_length,
-            total_segments: result.metadata?.total_segments,
-            language: result.metadata?.language,
-            extraction_method: result.metadata?.extraction_method,
-            ai_analysis: aiAnalysis?.reasoning,
-            summary_origin: transcriptSummary ? 'transcript_summary' : 'metadata_description',
-            refined_at: new Date().toISOString()
+            type: 'youtube',
+            state: 'not_processed',
+            captured_method: 'youtube_extract',
+            captured_by: 'agent',
+            source_metadata: {
+              video_id: result.metadata?.video_id,
+              channel_name: result.metadata?.channel_name,
+              channel_url: result.metadata?.channel_url,
+              thumbnail_url: result.metadata?.thumbnail_url,
+              transcript_length: result.metadata?.transcript_length,
+              total_segments: result.metadata?.total_segments,
+              language: result.metadata?.language,
+              extraction_method: result.metadata?.extraction_method,
+              ai_analysis: aiAnalysis?.reasoning,
+              summary_origin: transcriptSummary ? 'transcript_summary' : 'metadata_description',
+              refined_at: new Date().toISOString()
+            }
           }
         })
       });
 
       const createResult = await createResponse.json();
-
       if (!createResponse.ok) {
-        return {
-          success: false,
-          error: createResult.error || 'Failed to create item',
-          data: null
-        };
+        return { success: false, error: createResult.error || 'Failed to create item', data: null };
       }
 
-      console.log('🎯 YouTubeExtract completed successfully');
-
-      // Use actual assigned dimensions from API response (includes auto-assigned locked + keywords)
       const actualDimensions: string[] = createResult.data?.dimensions || finalDimensions || [];
       const formattedNode = createResult.data?.id
         ? formatNodeForChat({ id: createResult.data.id, title: nodeTitle, dimensions: actualDimensions })
         : nodeTitle;
-      const dimsDisplay = actualDimensions.length > 0 ? actualDimensions.join(', ') : 'none';
 
       return {
         success: true,
-        message: `Added ${formattedNode} with dimensions: ${dimsDisplay}`,
+        message: `Added ${formattedNode} with dimensions: ${actualDimensions.length > 0 ? actualDimensions.join(', ') : 'none'}`,
         data: {
           nodeId: createResult.data?.id,
           title: nodeTitle,
           contentLength: result.source.length,
-          url: url,
+          url,
           dimensions: actualDimensions
         }
       };
diff --git a/src/types/database.ts b/src/types/database.ts
index eacefd0..7a6971b 100644
--- a/src/types/database.ts
+++ b/src/types/database.ts
@@ -1,3 +1,32 @@
+export type NodeMetadataState = 'processed' | 'not_processed';
+export type NodeCapturedBy = 'human' | 'agent';
+
+export interface CanonicalNodeMetadata {
+  type?: string;
+  state?: NodeMetadataState;
+  captured_method?: string;
+  captured_by?: NodeCapturedBy;
+  source_metadata?: Record<string, unknown>;
+  [key: string]: unknown;
+}
+
+export interface Context {
+  id: number;
+  name: string;
+  description: string | null;
+  icon: string | null;
+  created_at: string;
+  updated_at: string;
+}
+
+export interface ContextSummary {
+  id: number;
+  name: string;
+  description: string | null;
+  icon: string | null;
+  count: number;
+}
+
 // New Node-based type system replacing rigid Item categorization
 export interface Node {
   id: number;
@@ -10,10 +39,12 @@ export interface Node {
   dimensions: string[];       // Flexible dimensions replacing type + stage + segment + tags
   embedding?: Buffer;         // Node-level embedding (BLOB data)
   chunk?: string;             // Deprecated legacy field - do not write
-  metadata?: any;            // Flexible metadata storage
+  metadata?: CanonicalNodeMetadata | null; // Flexible metadata storage with canonical contract
   created_at: string;
   updated_at: string;
   edge_count?: number;       // Derived count of edges, included in some queries
+  context_id?: number | null;
+  context?: Pick<Context, 'id' | 'name' | 'description' | 'icon'> | null;
 
   // Optional embedding fields
   embedding_updated_at?: string;
@@ -67,6 +98,7 @@ export interface EdgeContext {
 // New NodeFilters interface replacing rigid ItemFilters
 export interface NodeFilters {
   dimensions?: string[];      // Filter by dimensions (replaces stage/type filtering)
+  contextId?: number;
   search?: string;           // Text search in title/content
   searchMode?: 'standard' | 'hybrid'; // standard = FTS/LIKE, hybrid = add node-vector retrieval
   chunkStatus?: 'not_chunked' | 'chunking' | 'chunked' | 'error';
diff --git a/src/utils/nodeLink.ts b/src/utils/nodeLink.ts
new file mode 100644
index 0000000..5d1e6cb
--- /dev/null
+++ b/src/utils/nodeLink.ts
@@ -0,0 +1,27 @@
+const LOCAL_HOST_PATTERN = /^(localhost|127(?:\.\d{1,3}){3}|0\.0\.0\.0)(:\d+)?(\/.*)?$/i;
+const BARE_HOST_PATTERN = /^(?:[a-z0-9-]+\.)+[a-z]{2,}(?::\d+)?(?:\/.*)?$/i;
+
+export function normalizeNodeLink(input?: string | null): string | null {
+  if (typeof input !== 'string') return null;
+
+  const trimmed = input.trim();
+  if (!trimmed) return null;
+
+  const candidate = /^[a-z][a-z0-9+.-]*:\/\//i.test(trimmed)
+    ? trimmed
+    : BARE_HOST_PATTERN.test(trimmed) || LOCAL_HOST_PATTERN.test(trimmed)
+      ? `https://${trimmed}`
+      : null;
+
+  if (!candidate) return null;
+
+  try {
+    const parsed = new URL(candidate);
+    if (!['http:', 'https:'].includes(parsed.protocol)) {
+      return null;
+    }
+    return parsed.toString();
+  } catch {
+    return null;
+  }
+}