create-claude-cabinet 0.33.1 → 0.34.1

package/lib/engagement-setup.js

@@ -1,23 +1,37 @@
 /**
- * engagement-setup.js — extend pib-db files with engagement schema v5
+ * engagement-setup.js — extend pib-db files with engagement schema
  * when the engagement module is installed.
  *
- * Dispatched from cli.js's postInstall pipeline. Idempotent: skips
- * files that already contain the engagement code (detected by marker).
+ * Dispatched from cli.js's postInstall pipeline. Two responsibilities:
  *
- * The base pib-db templates (owned by work-tracking) ship schema v1-v4.
- * The engagement module stores the complete engagement-inclusive versions
- * of the pib-db files in templates/engagement/pib-db-patches/. When
- * engagement is selected, this handler copies those over the base
- * versions, keeping the base templates clean for consumers who don't
- * opt into engagement.
+ * 1. FILE OVERLAY — copy the engagement-inclusive pib-db files over the
+ *    base versions. Uses a version-aware check: parse SCHEMA_VERSION from
+ *    the installed file and re-copy when below the patch's version. This
+ *    replaces the old string-marker approach, which was version-blind and
+ *    silently skipped upgrades (e.g., v5→v6 never landed because the v5
+ *    marker already matched).
+ *
+ * 2. SCHEMA ENSURE — after the overlay, open pib.db and call migrate()
+ *    so existing DBs advance to the patch's schema version. Also runs an
+ *    idempotent CREATE TABLE IF NOT EXISTS for engagement_events, which
+ *    covers the Path 5 case (a base-only consumer at v5 who later adds
+ *    engagement — the v5 migration entry is gated out, so this direct
+ *    exec is the only path to creating the table).
+ *
+ * The base pib-db templates (owned by work-tracking) ship schema v1-v5.
+ * The engagement patch ships v1-v6 (v5=engagement_events, v6=projects.tags).
  */
 
 const fs = require('fs');
 const path = require('path');
 
-const MARKER = 'ENGAGEMENT_EVENT_KINDS';
 const FILES = ['pib-db-lib.mjs', 'pib-db-mcp-server.mjs', 'pib-db-schema.sql', 'pib-db.mjs'];
+const VERSION_RE = /export const SCHEMA_VERSION\s*=\s*(\d+)/;
+
+function parseSchemaVersion(content) {
+  const m = content.match(VERSION_RE);
+  return m ? parseInt(m[1], 10) : 0;
+}
 
 function setupEngagement({ dryRun, projectDir } = {}) {
   const results = [];
@@ -29,6 +43,15 @@ function setupEngagement({ dryRun, projectDir } = {}) {
     return { results };
   }
 
+  // --- Step 1: File overlay (version-aware) ---
+
+  const patchLibPath = path.join(patchDir, 'pib-db-lib.mjs');
+  let patchVersion = 0;
+  if (fs.existsSync(patchLibPath)) {
+    patchVersion = parseSchemaVersion(fs.readFileSync(patchLibPath, 'utf8'));
+  }
+
+  let filesUpdated = false;
   for (const file of FILES) {
     const target = path.join(scriptsDir, file);
     const source = path.join(patchDir, file);
@@ -43,18 +66,95 @@ function setupEngagement({ dryRun, projectDir } = {}) {
       continue;
     }
 
-    const existing = fs.readFileSync(target, 'utf8');
-    if (existing.includes(MARKER)) {
-      results.push(`${file}: already has engagement code — skipped`);
-      continue;
+    if (file === 'pib-db-lib.mjs') {
+      const installedVersion = parseSchemaVersion(fs.readFileSync(target, 'utf8'));
+      if (installedVersion >= patchVersion) {
+        results.push(`${file}: schema v${installedVersion} >= patch v${patchVersion} — skipped`);
+        continue;
+      }
+    } else {
+      const existing = fs.readFileSync(target, 'utf8');
+      const source_content = fs.readFileSync(source, 'utf8');
+      if (existing === source_content) {
+        results.push(`${file}: already matches patch — skipped`);
+        continue;
+      }
     }
 
     if (!dryRun) {
       fs.copyFileSync(source, target);
+      filesUpdated = true;
     }
     results.push(`${file}: applied engagement-inclusive version`);
   }
 
+  // --- Step 2: Schema ensure (migrate + idempotent engagement_events) ---
+
+  const dbPath = path.join(projectDir, 'pib.db');
+  if (!dryRun && fs.existsSync(dbPath) && fs.existsSync(path.join(scriptsDir, 'pib-db-lib.mjs'))) {
+    try {
+      const Database = require('better-sqlite3');
+      const db = new Database(dbPath);
+      db.pragma('journal_mode = WAL');
+      db.pragma('foreign_keys = ON');
+
+      const libPath = path.join(scriptsDir, 'pib-db-lib.mjs');
+      const libContent = fs.readFileSync(libPath, 'utf8');
+      const currentVersion = db.pragma('user_version', { simple: true });
+      const targetVersion = parseSchemaVersion(libContent);
+
+      if (currentVersion < targetVersion) {
+        const { execSync } = require('child_process');
+        try {
+          execSync(`node "${path.join(scriptsDir, 'pib-db.mjs')}" init`, {
+            cwd: projectDir,
+            env: { ...process.env, PIB_DB_PATH: dbPath },
+            stdio: 'pipe',
+          });
+          results.push(`schema-ensure: migrated pib.db from v${currentVersion} to v${targetVersion}`);
+        } catch (e) {
+          results.push(`schema-ensure: migration failed — ${e.message}`);
+        }
+      }
+
+      // Idempotent engagement_events CREATE — runs UNCONDITIONALLY (not
+      // gated on version). Covers Path 5: a base-only consumer at v5 who
+      // later adds engagement. Their v5 migration entry (engagement_events)
+      // is gated out by user_version, and the execSync migrate above won't
+      // create it either. This direct exec is the only path.
+      try {
+        db.exec(`CREATE TABLE IF NOT EXISTS engagement_events (
+          id            INTEGER PRIMARY KEY AUTOINCREMENT,
+          engagement    TEXT NOT NULL REFERENCES projects(fid),
+          target_fid    TEXT,
+          packet_id     TEXT,
+          kind          TEXT NOT NULL
+                          CHECK(kind IN ('client_feedback','status_push','delegation','approval','note','packet_sent')),
+          author        TEXT NOT NULL,
+          verdict       TEXT CHECK(verdict IS NULL OR verdict IN ('approve','object','comment','none')),
+          body          TEXT CHECK(body IS NULL OR length(body) <= 10000),
+          addressed     INTEGER NOT NULL DEFAULT 0 CHECK(addressed IN (0,1)),
+          created_at    TEXT NOT NULL CHECK(created_at GLOB '????-??-??T*'),
+          CHECK(kind NOT IN ('client_feedback','approval')
+                OR (verdict IS NOT NULL AND verdict IN ('approve','object','comment')))
+        )`);
+        db.exec("CREATE INDEX IF NOT EXISTS idx_engagement_events_eng ON engagement_events(engagement, created_at DESC)");
+        db.exec("CREATE INDEX IF NOT EXISTS idx_engagement_events_tgt ON engagement_events(target_fid, created_at DESC)");
+        db.exec("CREATE INDEX IF NOT EXISTS idx_engagement_events_dedup ON engagement_events(packet_id, target_fid, verdict)");
+        results.push('schema-ensure: engagement_events table ensured (idempotent)');
+      } catch (e) {
+        results.push(`schema-ensure: engagement_events ensure failed — ${e.message}`);
+      }
+      db.close();
+    } catch (e) {
+      if (/Cannot find module|MODULE_NOT_FOUND/.test(e.message || '')) {
+        results.push('schema-ensure: better-sqlite3 not available — skipped (DB will migrate on first use)');
+      } else {
+        results.push(`schema-ensure: ${e.message}`);
+      }
+    }
+  }
+
   return { results };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-claude-cabinet",
-  "version": "0.33.1",
+  "version": "0.34.1",
   "description": "Claude Cabinet — opinionated process scaffolding for Claude Code projects",
   "bin": {
     "create-claude-cabinet": "bin/create-claude-cabinet.js"

package/templates/engagement/OVERVIEW.md

@@ -88,8 +88,8 @@ to receive **before** anything is dispatched:
 
 ```
 Ready to send:
-  Ed (principal, plugin) — 2 need response, 4 in progress, 7 done, $4,417.50 billed
-  Sydney (delegate, email) — 1 assigned item (marketing)
+  Ed (principal, has Claude Code) — 2 need response, 4 in progress, 7 done, $4,417.50 billed
+  Sydney (delegate, no Claude Code) — 1 assigned item (marketing)
 
   Blocked (not client-ready): 1 — "DNS cutover" (no client-facing copy)
 ```