prjct-cli 0.21.0 → 0.23.0

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## [0.23.0] - 2025-12-28
+
+### Feature: Branch + PR Workflow
+
+Integrated git branch management and PR-based shipping workflow.
+
+**Branch Management:**
+- `/p:now` auto-creates feature branches when on main/master
+- `/p:bug` auto-creates bug branches with proper naming
+- Handles uncommitted changes (stash/commit/abort prompts)
+- Tracks branch info in state.json
+
+**Protected Branch Validation:**
+- `/p:git` blocks commits/pushes to main/master
+- Validates current branch matches expected task branch
+- Clear error messages with recovery instructions
+
+**PR-Based Shipping (`/p:ship`):**
+- Creates PR via `gh` CLI instead of direct push
+- Generates PR description with quality metrics
+- Waits for CI checks (up to 10 min)
+- Records CI status (passed/failed/timeout)
+- Supports `--draft` flag for WIP PRs
+
+**Template Updates:**
+- `templates/commands/bug.md` - Branch creation + stashing
+- `templates/commands/git.md` - Protected branch checks
+- `templates/commands/now.md` - Feature branch workflow
+- `templates/commands/ship.md` - Full PR lifecycle
+
 ## [0.20.1] - 2025-12-26
 
 ### Refactor: Type Consolidation

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`,
         }
       }
     }