prjct-cli 0.21.0 → 0.22.0

package/core/integrations/notion/client.ts

@@ -179,6 +179,95 @@ export class NotionClient {
     }
   }
 
+  /**
+   * Update page content (for dashboard)
+   */
+  async updatePageContent(pageId: string, content: string): Promise<boolean> {
+    try {
+      // Convert markdown content to Notion blocks
+      const blocks = this.markdownToBlocks(content)
+
+      // Clear existing content and add new blocks
+      // First, get existing blocks to delete them
+      const existingBlocks = await this.apiRequest(
+        `/blocks/${pageId}/children`,
+        'GET'
+      )
+
+      // Delete existing blocks
+      for (const block of existingBlocks.results || []) {
+        await this.apiRequest(`/blocks/${block.id}`, 'DELETE')
+      }
+
+      // Add new blocks
+      await this.apiRequest(`/blocks/${pageId}/children`, 'PATCH', {
+        children: blocks,
+      })
+
+      return true
+    } catch (error) {
+      console.error('[notion] Failed to update page content:', (error as Error).message)
+      return false
+    }
+  }
+
+  /**
+   * Convert simple markdown to Notion blocks
+   */
+  private markdownToBlocks(content: string): unknown[] {
+    const blocks: unknown[] = []
+    const lines = content.split('\n')
+
+    for (const line of lines) {
+      if (line.startsWith('# ')) {
+        blocks.push({
+          type: 'heading_1',
+          heading_1: {
+            rich_text: [{ type: 'text', text: { content: line.slice(2) } }],
+          },
+        })
+      } else if (line.startsWith('## ')) {
+        blocks.push({
+          type: 'heading_2',
+          heading_2: {
+            rich_text: [{ type: 'text', text: { content: line.slice(3) } }],
+          },
+        })
+      } else if (line.startsWith('- ')) {
+        blocks.push({
+          type: 'bulleted_list_item',
+          bulleted_list_item: {
+            rich_text: [{ type: 'text', text: { content: line.slice(2) } }],
+          },
+        })
+      } else if (line.startsWith('|') && line.includes('|')) {
+        // Table row - skip header separator
+        if (!line.match(/^\|[-|]+\|$/)) {
+          const cells = line.split('|').filter(Boolean).map((c) => c.trim())
+          if (cells.length > 0) {
+            blocks.push({
+              type: 'paragraph',
+              paragraph: {
+                rich_text: [{ type: 'text', text: { content: cells.join(' | ') } }],
+              },
+            })
+          }
+        }
+      } else if (line.trim() === '---') {
+        blocks.push({ type: 'divider', divider: {} })
+      } else if (line.trim()) {
+        blocks.push({
+          type: 'paragraph',
+          paragraph: {
+            rich_text: [{ type: 'text', text: { content: line } }],
+          },
+        })
+      }
+    }
+
+    return blocks
+  }
+
   /**
    * Query a database
    */
@@ -211,11 +300,12 @@ export class NotionClient {
   }
 
   /**
-   * Find page by project ID and name (for upsert)
+   * Find page by name (for upsert)
+   * Note: Since each project has its own database, we don't need to filter by project
    */
   async findPageByProjectAndName(
     databaseId: string,
-    projectId: string,
+    _projectId: string,
     name: string
   ): Promise<string | null> {
     try {
@@ -224,9 +314,9 @@ export class NotionClient {
         'POST',
         {
           filter: {
-            and: [
-              { property: 'Project', rich_text: { equals: projectId } },
+            or: [
               { property: 'Name', title: { equals: name } },
+              { property: 'Idea', title: { equals: name } },
             ],
           },
         }

package/core/integrations/notion/index.ts

@@ -28,8 +28,11 @@ export {
   syncShippedFeature,
   syncIdea,
   fullSync,
+  pullShippedFeatures,
+  pullIdeas,
+  bidirectionalSync,
 } from './sync'
-export type { SyncResult } from './sync'
+export type { SyncResult, PullResult } from './sync'
 
 // Setup
 export {

package/core/integrations/notion/setup.ts

@@ -94,16 +94,21 @@ export async function createDatabases(
   const databases: NotionIntegrationConfig['databases'] = {}
 
   try {
-    // Create each database
+    // Create each database with project-specific names
     for (const [key, schema] of Object.entries(ALL_DATABASE_SCHEMAS)) {
-      const db = await notionClient.createDatabase(parentPageId, schema)
+      // Override title with project name prefix
+      const projectSchema = {
+        ...schema,
+        title: schema.title.replace('prjct:', `${projectName}:`),
+      }
+      const db = await notionClient.createDatabase(parentPageId, projectSchema)
       if (db) {
         databases[key as keyof typeof databases] = db.id
       } else {
         return {
           success: false,
           databases,
-          error: `Failed to create ${schema.title} database`,
+          error: `Failed to create ${projectSchema.title} database`,
         }
       }
     }

package/core/integrations/notion/sync.ts

@@ -6,6 +6,7 @@
 import type { ShippedFeature, Idea } from '../../types/storage'
 import type { NotionIntegrationConfig } from '../../types/integrations'
 import { notionClient } from './client'
+import { getDashboardContent, type DashboardMetrics } from './templates'
 
 // =============================================================================
 // Types
@@ -25,17 +26,25 @@ export interface SyncResult {
 
 /**
  * Build Notion properties for a shipped feature
+ * Includes ALL fields for comprehensive sync
  */
 function buildShippedProperties(
   feature: ShippedFeature,
-  projectId: string
+  _projectId: string
 ): Record<string, unknown> {
+  const now = new Date().toISOString()
+
+  // Note: Project field removed - each project now has its own database
   const props: Record<string, unknown> = {
     Name: {
       title: [{ text: { content: feature.name } }],
     },
-    Project: {
-      rich_text: [{ text: { content: projectId } }],
+    // Sync tracking fields
+    prjctId: {
+      rich_text: [{ text: { content: feature.id } }],
+    },
+    'Last Updated': {
+      date: { start: now.split('T')[0] },
     },
   }
 
@@ -57,16 +66,24 @@ function buildShippedProperties(
     }
   }
 
+  // Full code metrics
   if (feature.codeMetrics) {
     const metrics = feature.codeMetrics
-    props['Lines Changed'] = {
-      number: (metrics.linesAdded || 0) + (metrics.linesRemoved || 0),
+    props['Lines Added'] = {
+      number: metrics.linesAdded || 0,
+    }
+    props['Lines Removed'] = {
+      number: metrics.linesRemoved || 0,
     }
     props['Files Changed'] = {
       number: metrics.filesChanged || 0,
     }
-    props.Commits = {
-      number: metrics.commits || 0,
+  }
+
+  // Commit info
+  if (feature.commit && typeof feature.commit === 'object') {
+    props.Commit = {
+      rich_text: [{ text: { content: feature.commit.hash || '' } }],
     }
   }
 
@@ -82,22 +99,37 @@ function buildShippedProperties(
     }
   }
 
+  // Impact level based on metrics
+  const impact = feature.codeMetrics?.linesAdded && feature.codeMetrics.linesAdded > 500 ? 'High' :
+                 feature.codeMetrics?.linesAdded && feature.codeMetrics.linesAdded > 100 ? 'Medium' : 'Low'
+  props.Impact = {
+    select: { name: impact },
+  }
+
   return props
 }
 
 /**
  * Build Notion properties for an idea
+ * Includes ALL fields for comprehensive sync
  */
 function buildIdeaProperties(
   idea: Idea,
-  projectId: string
+  _projectId: string
 ): Record<string, unknown> {
+  const now = new Date().toISOString()
+
+  // Note: Project field removed - each project now has its own database
   const props: Record<string, unknown> = {
     Idea: {
       title: [{ text: { content: idea.text } }],
     },
-    Project: {
-      rich_text: [{ text: { content: projectId } }],
+    // Sync tracking fields
+    prjctId: {
+      rich_text: [{ text: { content: idea.id } }],
+    },
+    'Last Updated': {
+      date: { start: now.split('T')[0] },
     },
   }
 
@@ -138,9 +170,186 @@ function buildIdeaProperties(
     }
   }
 
+  // Details/notes
+  if (idea.details) {
+    props.Details = {
+      rich_text: [{ text: { content: idea.details.slice(0, 2000) } }],
+    }
+  }
+
+  // Impact/Effort matrix
+  if (idea.impactEffort) {
+    props.Impact = {
+      select: { name: idea.impactEffort.impact },
+    }
+    props.Effort = {
+      select: { name: idea.impactEffort.effort },
+    }
+  }
+
+  // Pain points as text
+  if (idea.painPoints && idea.painPoints.length > 0) {
+    props['Pain Points'] = {
+      rich_text: [{ text: { content: idea.painPoints.join(', ').slice(0, 2000) } }],
+    }
+  }
+
+  // Solutions as text
+  if (idea.solutions && idea.solutions.length > 0) {
+    props.Solutions = {
+      rich_text: [{ text: { content: idea.solutions.join(', ').slice(0, 2000) } }],
+    }
+  }
+
+  // Files affected
+  if (idea.filesAffected && idea.filesAffected.length > 0) {
+    props['Files Affected'] = {
+      rich_text: [{ text: { content: idea.filesAffected.join(', ').slice(0, 2000) } }],
+    }
+  }
+
+  // Risks count
+  if (idea.risksCount !== undefined) {
+    props.Risks = {
+      number: idea.risksCount,
+    }
+  }
+
   return props
 }
 
+// =============================================================================
+// Property Parsers (Notion → prjct)
+// =============================================================================
+
+/**
+ * Extract text from Notion rich_text property
+ */
+function extractText(prop: unknown): string | undefined {
+  if (!prop || typeof prop !== 'object') return undefined
+  const p = prop as { rich_text?: Array<{ plain_text?: string }> }
+  if (!p.rich_text || p.rich_text.length === 0) return undefined
+  return p.rich_text.map((t) => t.plain_text || '').join('')
+}
+
+/**
+ * Extract title from Notion title property
+ */
+function extractTitle(prop: unknown): string {
+  if (!prop || typeof prop !== 'object') return ''
+  const p = prop as { title?: Array<{ plain_text?: string }> }
+  if (!p.title || p.title.length === 0) return ''
+  return p.title.map((t) => t.plain_text || '').join('')
+}
+
+/**
+ * Extract date from Notion date property
+ */
+function extractDate(prop: unknown): string | undefined {
+  if (!prop || typeof prop !== 'object') return undefined
+  const p = prop as { date?: { start?: string } }
+  return p.date?.start
+}
+
+/**
+ * Extract select value from Notion select property
+ */
+function extractSelect(prop: unknown): string | undefined {
+  if (!prop || typeof prop !== 'object') return undefined
+  const p = prop as { select?: { name?: string } }
+  return p.select?.name
+}
+
+/**
+ * Extract status value from Notion status property
+ */
+function extractStatus(prop: unknown): string | undefined {
+  if (!prop || typeof prop !== 'object') return undefined
+  const p = prop as { status?: { name?: string } }
+  return p.status?.name
+}
+
+/**
+ * Extract number from Notion number property
+ */
+function extractNumber(prop: unknown): number | undefined {
+  if (!prop || typeof prop !== 'object') return undefined
+  const p = prop as { number?: number | null }
+  return p.number ?? undefined
+}
+
+/**
+ * Extract multi-select as string array
+ */
+function extractMultiSelect(prop: unknown): string[] {
+  if (!prop || typeof prop !== 'object') return []
+  const p = prop as { multi_select?: Array<{ name?: string }> }
+  if (!p.multi_select) return []
+  return p.multi_select.map((s) => s.name || '').filter(Boolean)
+}
+
+/**
+ * Parse Notion page to ShippedFeature
+ */
+function parseShippedFeature(
+  pageId: string,
+  props: Record<string, unknown>
+): Partial<ShippedFeature> & { notionPageId: string } {
+  return {
+    notionPageId: pageId,
+    id: extractText(props.prjctId) || '',
+    name: extractTitle(props.Name) || '',
+    version: extractText(props.Version) || '',
+    shippedAt: extractDate(props['Shipped Date']) || new Date().toISOString(),
+    description: extractText(props.Description),
+    type: extractSelect(props.Type) as ShippedFeature['type'],
+    duration: extractText(props.Duration),
+    codeMetrics: {
+      linesAdded: extractNumber(props['Lines Added']) || 0,
+      linesRemoved: extractNumber(props['Lines Removed']) || 0,
+      filesChanged: extractNumber(props['Files Changed']) || 0,
+      commits: 0,
+    },
+    lastSyncedAt: new Date().toISOString(),
+  }
+}
+
+/**
+ * Parse Notion page to Idea
+ */
+function parseIdea(
+  pageId: string,
+  props: Record<string, unknown>
+): Partial<Idea> & { notionPageId: string } {
+  const statusMap: Record<string, Idea['status']> = {
+    Pending: 'pending',
+    Converted: 'converted',
+    Archived: 'archived',
+  }
+
+  const priorityMap: Record<string, Idea['priority']> = {
+    high: 'high',
+    medium: 'medium',
+    low: 'low',
+    High: 'high',
+    Medium: 'medium',
+    Low: 'low',
+  }
+
+  return {
+    notionPageId: pageId,
+    id: extractText(props.prjctId) || '',
+    text: extractTitle(props.Idea) || '',
+    status: statusMap[extractStatus(props.Status) || ''] || 'pending',
+    priority: priorityMap[extractSelect(props.Priority) || ''] || 'medium',
+    tags: extractMultiSelect(props.Tags),
+    details: extractText(props.Details),
+    addedAt: extractDate(props.Created) || new Date().toISOString(),
+    convertedTo: extractText(props['Converted To']),
+    lastSyncedAt: new Date().toISOString(),
+  }
+}
+
 // =============================================================================
 // Sync Functions
 // =============================================================================
@@ -309,3 +518,301 @@ export async function fullSync(
 
   return results
 }
+
+// =============================================================================
+// Pull Sync Functions (Notion → prjct)
+// =============================================================================
+
+export interface PullResult<T> {
+  items: T[]
+  newCount: number
+  updatedCount: number
+  errors: string[]
+}
+
+/**
+ * Pull shipped features from Notion
+ * Returns new and updated features from Notion that don't exist or are newer in Notion
+ */
+export async function pullShippedFeatures(
+  config: NotionIntegrationConfig,
+  existingFeatures: ShippedFeature[]
+): Promise<PullResult<ShippedFeature>> {
+  const result: PullResult<ShippedFeature> = {
+    items: [],
+    newCount: 0,
+    updatedCount: 0,
+    errors: [],
+  }
+
+  if (!config.enabled || !config.databases.shipped) {
+    return result
+  }
+
+  if (!notionClient.isReady()) {
+    result.errors.push('Notion client not ready')
+    return result
+  }
+
+  try {
+    const pages = await notionClient.queryDatabase(config.databases.shipped)
+
+    // Create lookup map by prjctId and notionPageId
+    const existingByPrjctId = new Map(
+      existingFeatures.filter((f) => f.id).map((f) => [f.id, f])
+    )
+    const existingByNotionId = new Map(
+      existingFeatures.filter((f) => f.notionPageId).map((f) => [f.notionPageId, f])
+    )
+
+    for (const page of pages) {
+      const parsed = parseShippedFeature(page.id, page.properties)
+
+      // Skip if no name (invalid entry)
+      if (!parsed.name) continue
+
+      // Check if exists locally
+      const existingByPrjct = parsed.id ? existingByPrjctId.get(parsed.id) : undefined
+      const existingByNotion = existingByNotionId.get(page.id)
+      const existing = existingByPrjct || existingByNotion
+
+      if (existing) {
+        // Update existing - merge with local data
+        const merged: ShippedFeature = {
+          ...existing,
+          ...parsed,
+          id: existing.id || parsed.id || crypto.randomUUID(),
+          notionPageId: page.id,
+          lastSyncedAt: new Date().toISOString(),
+        }
+        result.items.push(merged)
+        result.updatedCount++
+      } else {
+        // New from Notion - create new entry
+        const newFeature: ShippedFeature = {
+          id: parsed.id || crypto.randomUUID(),
+          name: parsed.name,
+          shippedAt: parsed.shippedAt || new Date().toISOString(),
+          version: parsed.version || '0.0.0',
+          description: parsed.description,
+          type: parsed.type,
+          duration: parsed.duration,
+          codeMetrics: parsed.codeMetrics,
+          notionPageId: page.id,
+          lastSyncedAt: new Date().toISOString(),
+        }
+        result.items.push(newFeature)
+        result.newCount++
+      }
+    }
+
+    return result
+  } catch (error) {
+    result.errors.push((error as Error).message)
+    return result
+  }
+}
+
+/**
+ * Pull ideas from Notion
+ * Returns new and updated ideas from Notion
+ */
+export async function pullIdeas(
+  config: NotionIntegrationConfig,
+  existingIdeas: Idea[]
+): Promise<PullResult<Idea>> {
+  const result: PullResult<Idea> = {
+    items: [],
+    newCount: 0,
+    updatedCount: 0,
+    errors: [],
+  }
+
+  if (!config.enabled || !config.databases.ideas) {
+    return result
+  }
+
+  if (!notionClient.isReady()) {
+    result.errors.push('Notion client not ready')
+    return result
+  }
+
+  try {
+    const pages = await notionClient.queryDatabase(config.databases.ideas)
+
+    // Create lookup map
+    const existingByPrjctId = new Map(
+      existingIdeas.filter((i) => i.id).map((i) => [i.id, i])
+    )
+    const existingByNotionId = new Map(
+      existingIdeas.filter((i) => i.notionPageId).map((i) => [i.notionPageId, i])
+    )
+
+    for (const page of pages) {
+      const parsed = parseIdea(page.id, page.properties)
+
+      // Skip if no text (invalid entry)
+      if (!parsed.text) continue
+
+      // Check if exists locally
+      const existingByPrjct = parsed.id ? existingByPrjctId.get(parsed.id) : undefined
+      const existingByNotion = existingByNotionId.get(page.id)
+      const existing = existingByPrjct || existingByNotion
+
+      if (existing) {
+        // Update existing
+        const merged: Idea = {
+          ...existing,
+          ...parsed,
+          id: existing.id || parsed.id || crypto.randomUUID(),
+          notionPageId: page.id,
+          lastSyncedAt: new Date().toISOString(),
+        }
+        result.items.push(merged)
+        result.updatedCount++
+      } else {
+        // New from Notion
+        const newIdea: Idea = {
+          id: parsed.id || crypto.randomUUID(),
+          text: parsed.text,
+          status: parsed.status || 'pending',
+          priority: parsed.priority || 'medium',
+          tags: parsed.tags || [],
+          addedAt: parsed.addedAt || new Date().toISOString(),
+          details: parsed.details,
+          convertedTo: parsed.convertedTo,
+          notionPageId: page.id,
+          lastSyncedAt: new Date().toISOString(),
+        }
+        result.items.push(newIdea)
+        result.newCount++
+      }
+    }
+
+    return result
+  } catch (error) {
+    result.errors.push((error as Error).message)
+    return result
+  }
+}
+
+/**
+ * Bidirectional sync - combines push and pull
+ * Uses "last edit wins" strategy based on lastSyncedAt
+ */
+export async function bidirectionalSync(
+  projectId: string,
+  config: NotionIntegrationConfig,
+  localData: {
+    shipped?: ShippedFeature[]
+    ideas?: Idea[]
+  }
+): Promise<{
+  pushed: { shipped: number; ideas: number }
+  pulled: { shipped: PullResult<ShippedFeature>; ideas: PullResult<Idea> }
+}> {
+  const results = {
+    pushed: { shipped: 0, ideas: 0 },
+    pulled: {
+      shipped: { items: [], newCount: 0, updatedCount: 0, errors: [] } as PullResult<ShippedFeature>,
+      ideas: { items: [], newCount: 0, updatedCount: 0, errors: [] } as PullResult<Idea>,
+    },
+  }
+
+  // 1. Pull from Notion first (to get latest)
+  if (localData.shipped) {
+    results.pulled.shipped = await pullShippedFeatures(config, localData.shipped)
+  }
+  if (localData.ideas) {
+    results.pulled.ideas = await pullIdeas(config, localData.ideas)
+  }
+
+  // 2. Push local items that don't have notionPageId (new local items)
+  if (localData.shipped && config.databases.shipped) {
+    for (const feature of localData.shipped) {
+      if (!feature.notionPageId) {
+        const result = await syncShippedFeature(projectId, feature, config)
+        if (result.success) {
+          results.pushed.shipped++
+        }
+      }
+    }
+  }
+
+  if (localData.ideas && config.databases.ideas) {
+    for (const idea of localData.ideas) {
+      if (!idea.notionPageId) {
+        const result = await syncIdea(projectId, idea, config)
+        if (result.success) {
+          results.pushed.ideas++
+        }
+      }
+    }
+  }
+
+  return results
+}
+
+// =============================================================================
+// Dashboard Metrics Update
+// =============================================================================
+
+/**
+ * Update dashboard page with current metrics
+ * Called after sync operations
+ */
+export async function updateDashboardMetrics(
+  config: NotionIntegrationConfig,
+  projectName: string,
+  metrics: DashboardMetrics
+): Promise<{ success: boolean; error?: string }> {
+  if (!config.enabled || !config.dashboardPageId) {
+    return { success: false, error: 'Dashboard not configured' }
+  }
+
+  if (!notionClient.isReady()) {
+    return { success: false, error: 'Notion client not ready' }
+  }
+
+  try {
+    const content = getDashboardContent(projectName, config.databases, metrics)
+
+    // Update dashboard page content
+    await notionClient.updatePageContent(config.dashboardPageId, content)
+
+    return { success: true }
+  } catch (error) {
+    return {
+      success: false,
+      error: (error as Error).message,
+    }
+  }
+}
+
+/**
+ * Calculate metrics from local data
+ */
+export function calculateMetrics(data: {
+  shipped?: ShippedFeature[]
+  ideas?: Idea[]
+  tasks?: Array<{ status?: string; completed?: boolean }>
+  roadmap?: Array<{ progress?: number }>
+}): DashboardMetrics {
+  const shippedCount = data.shipped?.length || 0
+  const ideasPending = data.ideas?.filter((i) => i.status === 'pending').length || 0
+  const tasksActive = data.tasks?.filter((t) => !t.completed && t.status !== 'completed').length || 0
+
+  // Calculate roadmap progress as average of all features
+  let roadmapProgress = 0
+  if (data.roadmap && data.roadmap.length > 0) {
+    const totalProgress = data.roadmap.reduce((sum, f) => sum + (f.progress || 0), 0)
+    roadmapProgress = Math.round(totalProgress / data.roadmap.length)
+  }
+
+  return {
+    shippedCount,
+    ideasPending,
+    tasksActive,
+    roadmapProgress,
+  }
+}

package/core/integrations/notion/templates.ts

@@ -35,7 +35,6 @@ export const SHIPPED_DATABASE_SCHEMA: NotionDatabaseSchema = {
     Commits: { type: 'number', number: { format: 'number' } },
     Duration: { type: 'rich_text', rich_text: {} },
     Description: { type: 'rich_text', rich_text: {} },
-    Project: { type: 'rich_text', rich_text: {} },
   },
 }
 
@@ -78,7 +77,6 @@ export const ROADMAP_DATABASE_SCHEMA: NotionDatabaseSchema = {
     'Target Date': { type: 'date', date: {} },
     Description: { type: 'rich_text', rich_text: {} },
     Tasks: { type: 'number', number: { format: 'number' } },
-    Project: { type: 'rich_text', rich_text: {} },
   },
 }
 
@@ -117,7 +115,6 @@ export const IDEAS_DATABASE_SCHEMA: NotionDatabaseSchema = {
     Tags: { type: 'multi_select', multi_select: { options: [] } },
     Created: { type: 'date', date: {} },
     'Converted To': { type: 'rich_text', rich_text: {} },
-    Project: { type: 'rich_text', rich_text: {} },
   },
 }
 
@@ -165,7 +162,6 @@ export const TASKS_DATABASE_SCHEMA: NotionDatabaseSchema = {
     Feature: { type: 'rich_text', rich_text: {} },
     Created: { type: 'date', date: {} },
     'Completed At': { type: 'date', date: {} },
-    Project: { type: 'rich_text', rich_text: {} },
   },
 }
 
@@ -173,8 +169,15 @@ export const TASKS_DATABASE_SCHEMA: NotionDatabaseSchema = {
 // Dashboard Template
 // =============================================================================
 
+export interface DashboardMetrics {
+  shippedCount: number
+  ideasPending: number
+  tasksActive: number
+  roadmapProgress: number // 0-100
+}
+
 /**
- * Dashboard page content template
+ * Dashboard page content template with metrics
  */
 export function getDashboardContent(
   projectName: string,
@@ -183,41 +186,50 @@ export function getDashboardContent(
     roadmap?: string
     ideas?: string
     tasks?: string
-  }
+  },
+  metrics?: DashboardMetrics
 ): string {
-  const sections = []
+  const sections: string[] = []
 
   sections.push(`# ${projectName} Dashboard`)
   sections.push('')
-  sections.push('This dashboard is automatically synced by prjct-cli.')
-  sections.push('')
 
-  if (databases.shipped) {
-    sections.push('## Shipped Features')
-    sections.push(`View all shipped features and metrics.`)
+  // Metrics section
+  if (metrics) {
+    sections.push('## Metrics')
+    sections.push('')
+    sections.push('| Metric | Value |')
+    sections.push('|--------|-------|')
+    sections.push(`| Features Shipped | ${metrics.shippedCount} |`)
+    sections.push(`| Ideas Pending | ${metrics.ideasPending} |`)
+    sections.push(`| Active Tasks | ${metrics.tasksActive} |`)
+    sections.push(`| Roadmap Progress | ${metrics.roadmapProgress}% |`)
+    sections.push('')
+  } else {
+    sections.push('*Metrics will appear after first sync*')
     sections.push('')
   }
 
+  // Database links
+  sections.push('## Databases')
+  sections.push('')
+
+  if (databases.shipped) {
+    sections.push(`- **Shipped Features**: Track released features and metrics`)
+  }
   if (databases.roadmap) {
-    sections.push('## Roadmap')
-    sections.push(`Track feature progress and planning.`)
-    sections.push('')
+    sections.push(`- **Roadmap**: Feature planning and progress`)
   }
-
   if (databases.ideas) {
-    sections.push('## Ideas')
-    sections.push(`Captured ideas and their status.`)
-    sections.push('')
+    sections.push(`- **Ideas**: Captured ideas and status`)
   }
-
   if (databases.tasks) {
-    sections.push('## Active Tasks')
-    sections.push(`Current task queue and completion status.`)
-    sections.push('')
+    sections.push(`- **Active Tasks**: Current task queue`)
   }
 
+  sections.push('')
   sections.push('---')
-  sections.push('Powered by [prjct-cli](https://prjct.app)')
+  sections.push('Synced by [prjct-cli](https://prjct.app)')
 
   return sections.join('\n')
 }

package/core/types/storage.ts

@@ -43,6 +43,10 @@ export interface ShippedFeature {
   quantitativeImpact?: string
   tasksCompleted?: number
   featureId?: string
+  /** Notion page ID for bidirectional sync */
+  notionPageId?: string
+  /** Last sync timestamp for conflict resolution */
+  lastSyncedAt?: string
 }
 
 export interface ShipChange {
@@ -113,6 +117,10 @@ export interface Idea {
   risks?: string[]
   risksCount?: number
   createdAt?: string
+  /** Notion page ID for bidirectional sync */
+  notionPageId?: string
+  /** Last sync timestamp for conflict resolution */
+  lastSyncedAt?: string
 }
 
 export interface ImpactEffort {

package/core/types/task.ts

@@ -11,6 +11,10 @@ export interface Task {
   completedAt?: string
   duration?: string
   metadata?: TaskMetadata
+  /** Notion page ID for bidirectional sync */
+  notionPageId?: string
+  /** Last sync timestamp for conflict resolution */
+  lastSyncedAt?: string
 }
 
 export interface TaskMetadata {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prjct-cli",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "Built for Claude - Ship fast, track progress, stay focused. Developer momentum tool for indie hackers.",
   "main": "core/index.ts",
   "bin": {

package/templates/skills/notion-push.md

@@ -0,0 +1,116 @@
+---
+allowed-tools: [Read, Bash]
+description: 'Push prjct data to Notion databases'
+timestamp-rule: 'GetTimestamp() for all timestamps'
+---
+
+# /p:notion push - Push Data to Notion
+
+## Purpose
+
+Manually sync all prjct data to Notion databases:
+- Shipped features → Shipped Features database
+- Ideas → Ideas database
+- Queue tasks → Active Tasks database (optional)
+
+## Prerequisites
+
+1. Notion integration configured (`/p:notion setup`)
+2. Token stored in `~/.prjct-cli/config/notion.json`
+
+## Flow
+
+### Step 1: Check Config
+
+READ: `.prjct/prjct.config.json` → extract `projectId`
+READ: `~/.prjct-cli/projects/{projectId}/project.json`
+
+IF `integrations.notion.enabled !== true`:
+  OUTPUT: "Notion not configured. Run /p:notion setup first."
+  STOP
+
+### Step 2: Load Token
+
+READ: `~/.prjct-cli/config/notion.json` → extract `token`
+
+IF no token:
+  OUTPUT: "Notion token not found. Run /p:notion setup first."
+  STOP
+
+### Step 3: Load Data
+
+READ: `~/.prjct-cli/projects/{projectId}/storage/shipped.json`
+READ: `~/.prjct-cli/projects/{projectId}/storage/ideas.json`
+
+### Step 4: Push to Notion
+
+For each shipped feature:
+```bash
+curl -X POST "https://api.notion.com/v1/pages" \
+  -H "Authorization: Bearer {token}" \
+  -H "Notion-Version: 2022-06-28" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "parent": { "database_id": "{databases.shipped}" },
+    "properties": {
+      "Name": { "title": [{ "text": { "content": "{feature.name}" } }] },
+      "Project": { "select": { "name": "{projectName}" } },
+      "Type": { "select": { "name": "{feature.type}" } },
+      "Version": { "rich_text": [{ "text": { "content": "{feature.version}" } }] },
+      "Shipped Date": { "date": { "start": "{feature.shippedAt}" } }
+    }
+  }'
+```
+
+For each idea:
+```bash
+curl -X POST "https://api.notion.com/v1/pages" \
+  -H "Authorization: Bearer {token}" \
+  -H "Notion-Version: 2022-06-28" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "parent": { "database_id": "{databases.ideas}" },
+    "properties": {
+      "Name": { "title": [{ "text": { "content": "{idea.text}" } }] },
+      "Project": { "select": { "name": "{projectName}" } },
+      "Status": { "select": { "name": "{idea.status}" } },
+      "Created": { "date": { "start": "{idea.addedAt}" } }
+    }
+  }'
+```
+
+### Step 5: Report Results
+
+```
+✅ Notion Push Complete
+
+Shipped Features: {shipped.count} synced
+Ideas: {ideas.count} synced
+
+View in Notion: {dashboardUrl}
+```
+
+## Response (Success)
+
+```
+✅ Notion Push Complete
+
+📦 Shipped: 11 features synced
+💡 Ideas: 1 idea synced
+
+Dashboard: https://notion.so/...
+```
+
+## Response (No Data)
+
+```
+Nothing to push. Add features or ideas first.
+```
+
+## Error Handling
+
+| Error | Response |
+|-------|----------|
+| Not configured | "Run /p:notion setup first" |
+| Token invalid | "Token expired. Run /p:notion setup again" |
+| API error | Show error, suggest retry |

package/templates/{commands → skills}/notion-setup.md

@@ -76,7 +76,7 @@ Ensure the token starts with "ntn_" or "secret_".
 ```
 Now share a Notion page with your integration:
 
-1. Open a Notion page where you want the databases
+1. Create a new page in Notion named "prjct: {projectName}"
 2. Click "..." → "Connect to" → select "prjct-cli"
 3. Copy the page URL or ID
 
@@ -87,18 +87,25 @@ Parse page ID from URL:
 - `https://notion.so/workspace/Page-Title-abc123...` → `abc123...`
 - Just the 32-character ID is also valid
 
-### Step 5: Create Databases
+### Step 5: Create Project Databases
 
-Create 4 databases under the parent page:
+Create 4 databases + 1 dashboard under the parent page.
+Each project gets its own set of databases (not shared).
 
-| Database | Description |
-|----------|-------------|
-| prjct: Shipped Features | Track shipped features with metrics |
-| prjct: Roadmap | Feature planning and progress |
-| prjct: Ideas | Captured ideas and status |
-| prjct: Active Tasks | Current task queue |
+| Created | Name | Description |
+|---------|------|-------------|
+| Dashboard | {projectName}: Dashboard | Metrics + links to all DBs |
+| Database | {projectName}: Shipped Features | Track shipped features with metrics |
+| Database | {projectName}: Roadmap | Feature planning and progress |
+| Database | {projectName}: Ideas | Captured ideas and status |
+| Database | {projectName}: Active Tasks | Current task queue |
 
-Each database has project-specific columns for multi-project support.
+The dashboard shows:
+- Total features shipped
+- Ideas pendientes
+- Tareas activas
+- Progreso del roadmap
+- Links a cada database
 
 ### Step 6: Save Config
 
@@ -150,17 +157,18 @@ Or create `~/.prjct-cli/config/notion.json`:
 ✅ Notion Connected
 
 Workspace: {workspaceName}
-Created: 4 databases
+Project: {projectName}
+Created: 1 dashboard + 4 databases
 
-Databases:
-• prjct: Shipped Features
-• prjct: Roadmap
-• prjct: Ideas
-• prjct: Active Tasks
+• {projectName}: Dashboard (with metrics)
+• {projectName}: Shipped Features
+• {projectName}: Roadmap
+• {projectName}: Ideas
+• {projectName}: Active Tasks
 
 Auto-sync enabled:
-• On /p:ship → Shipped Features
-• On /p:idea → Ideas
+• On /p:ship → Shipped Features + Dashboard metrics
+• On /p:idea → Ideas + Dashboard metrics
 
 To sync all existing data: /p:notion sync
 ```

package/templates/skills/notion-sync.md

@@ -0,0 +1,290 @@
+---
+allowed-tools: [Read, Bash, Write]
+description: 'Bidirectional sync between prjct and Notion'
+timestamp-rule: 'GetTimestamp() for all timestamps'
+---
+
+# /p:notion sync - Bidirectional Sync
+
+## Purpose
+
+Full bidirectional sync between prjct and Notion:
+- **Pull**: Get new items created in Notion → prjct
+- **Push**: Sync local items → Notion
+- **Merge**: Update existing items with latest data
+
+Uses "last edit wins" conflict resolution via `lastSyncedAt` timestamps.
+
+## Prerequisites
+
+1. Notion integration configured (`/p:notion setup`)
+2. Token stored in `~/.prjct-cli/config/notion.json`
+3. Databases have `prjctId` and `Last Updated` columns
+
+## Context Variables
+
+- `{projectId}`: From `.prjct/prjct.config.json`
+- `{globalPath}`: `~/.prjct-cli/projects/{projectId}`
+- `{token}`: From `~/.prjct-cli/config/notion.json`
+
+## Flow
+
+### Step 1: Check Configuration
+
+READ: `.prjct/prjct.config.json` → extract `projectId`
+READ: `{globalPath}/project.json`
+
+IF `integrations.notion.enabled !== true`:
+  OUTPUT: "Notion not configured. Run /p:notion setup first."
+  STOP
+
+### Step 2: Load Token
+
+READ: `~/.prjct-cli/config/notion.json` → extract `token`
+
+IF no token:
+  OUTPUT: "Notion token not found. Run /p:notion setup first."
+  STOP
+
+### Step 3: Load Local Data
+
+READ: `{globalPath}/storage/shipped.json`
+READ: `{globalPath}/storage/ideas.json`
+
+SET: {localShipped} = shipped.shipped array
+SET: {localIdeas} = ideas.ideas array
+
+### Step 4: Initialize Notion Client
+
+```typescript
+import { notionClient } from '../core/integrations/notion/client'
+import { bidirectionalSync } from '../core/integrations/notion/sync'
+
+notionClient.initialize(config.integrations.notion, token)
+```
+
+### Step 5: Execute Bidirectional Sync
+
+```typescript
+const results = await bidirectionalSync(
+  projectId,
+  config.integrations.notion,
+  {
+    shipped: localShipped,
+    ideas: localIdeas
+  }
+)
+```
+
+### Step 6: Merge Pull Results with Local Data
+
+For shipped features:
+```typescript
+// Merge pulled items with local
+const mergedShipped = [...localShipped]
+
+for (const pulled of results.pulled.shipped.items) {
+  const existingIndex = mergedShipped.findIndex(
+    f => f.id === pulled.id || f.notionPageId === pulled.notionPageId
+  )
+
+  if (existingIndex >= 0) {
+    // Update existing
+    mergedShipped[existingIndex] = pulled
+  } else {
+    // Add new
+    mergedShipped.push(pulled)
+  }
+}
+```
+
+Same logic for ideas.
+
+### Step 7: Write Updated Data
+
+WRITE: `{globalPath}/storage/shipped.json`
+```json
+{
+  "shipped": {mergedShipped},
+  "lastUpdated": "{GetTimestamp()}"
+}
+```
+
+WRITE: `{globalPath}/storage/ideas.json`
+```json
+{
+  "ideas": {mergedIdeas},
+  "lastUpdated": "{GetTimestamp()}"
+}
+```
+
+### Step 8: Regenerate Context
+
+After updating storage, regenerate markdown context:
+
+WRITE: `{globalPath}/context/shipped.md` (from shipped.json)
+WRITE: `{globalPath}/context/ideas.md` (from ideas.json)
+
+### Step 9: Log to Memory
+
+APPEND to: `{globalPath}/memory/events.jsonl`
+```json
+{"timestamp":"{GetTimestamp()}","action":"notion_sync","pulled":{"shipped":{shippedPulled},"ideas":{ideasPulled}},"pushed":{"shipped":{shippedPushed},"ideas":{ideasPushed}}}
+```
+
+## Response (Success)
+
+```
+Notion Sync Complete
+
+Pulled from Notion:
+- Shipped: {newShipped} new, {updatedShipped} updated
+- Ideas: {newIdeas} new, {updatedIdeas} updated
+
+Pushed to Notion:
+- Shipped: {pushedShipped} features
+- Ideas: {pushedIdeas} ideas
+
+Local storage updated.
+```
+
+## Response (No Changes)
+
+```
+Notion Sync Complete
+
+Already in sync - no changes detected.
+```
+
+## Response (Errors)
+
+```
+Notion Sync Complete (with warnings)
+
+Pulled: 5 shipped, 2 ideas
+Pushed: 3 features
+
+Errors:
+- {error1}
+- {error2}
+```
+
+## Database Field Mapping
+
+### Shipped Features
+
+| prjct Field | Notion Property | Type |
+|-------------|-----------------|------|
+| id | prjctId | rich_text |
+| name | Name | title |
+| version | Version | rich_text |
+| shippedAt | Shipped Date | date |
+| type | Type | select |
+| description | Description | rich_text |
+| duration | Duration | rich_text |
+| codeMetrics.linesAdded | Lines Added | number |
+| codeMetrics.linesRemoved | Lines Removed | number |
+| codeMetrics.filesChanged | Files Changed | number |
+| commit.hash | Commit | rich_text |
+| (calculated) | Impact | select |
+| (auto) | Last Updated | date |
+
+### Ideas
+
+| prjct Field | Notion Property | Type |
+|-------------|-----------------|------|
+| id | prjctId | rich_text |
+| text | Idea | title |
+| status | Status | status |
+| priority | Priority | select |
+| tags | Tags | multi_select |
+| addedAt | Created | date |
+| details | Details | rich_text |
+| impactEffort.impact | Impact | select |
+| impactEffort.effort | Effort | select |
+| convertedTo | Converted To | rich_text |
+| (auto) | Last Updated | date |
+
+## Conflict Resolution
+
+**Strategy: Last Edit Wins**
+
+When the same item exists in both Notion and prjct:
+1. Compare `lastSyncedAt` (prjct) with `Last Updated` (Notion)
+2. Most recent timestamp wins
+3. Update both sides to match
+
+**Matching Logic:**
+1. First match by `prjctId` ↔ `id`
+2. If no prjctId, match by `notionPageId` ↔ Notion page ID
+3. If neither, treat as new item
+
+## Error Handling
+
+| Error | Response | Action |
+|-------|----------|--------|
+| Not configured | "Run /p:notion setup first" | STOP |
+| Token invalid | "Token expired. Re-run setup" | STOP |
+| API rate limit | "Rate limited. Retry in 1 min" | WARN |
+| Parse error | Log warning | CONTINUE |
+| Network error | "Connection failed" | STOP |
+
+## Examples
+
+### Example 1: First Sync (Push Only)
+```
+/p:notion sync
+
+Output:
+Notion Sync Complete
+
+Pulled from Notion:
+- Shipped: 0 new, 0 updated
+- Ideas: 0 new, 0 updated
+
+Pushed to Notion:
+- Shipped: 11 features
+- Ideas: 3 ideas
+
+Local storage updated.
+```
+
+### Example 2: New Ideas from Notion
+```
+/p:notion sync
+
+Output:
+Notion Sync Complete
+
+Pulled from Notion:
+- Shipped: 0 new, 0 updated
+- Ideas: 2 new, 0 updated
+
+Pushed to Notion:
+- Shipped: 0 features
+- Ideas: 0 ideas
+
+Local storage updated.
+
+New ideas added:
+- "Add dark mode toggle"
+- "Improve error messages"
+```
+
+### Example 3: Bidirectional Changes
+```
+/p:notion sync
+
+Output:
+Notion Sync Complete
+
+Pulled from Notion:
+- Shipped: 1 new, 2 updated
+- Ideas: 3 new, 1 updated
+
+Pushed to Notion:
+- Shipped: 2 features
+- Ideas: 1 idea
+
+Local storage updated.
+```