@powerhousedao/ph-clint-cli 0.1.0-dev.3 → 0.1.0-dev.31

package/dist/triggers/spec-change.js

@@ -1,26 +1,30 @@
 /**
- * `spec-change` trigger — watches the `powerhouse/ph-clint-project` document
- * on the Reactor drive and, when its state changes, enqueues a work item
- * that re-runs the code generator in update mode.
+ * `spec-change` trigger — watches ALL `powerhouse/ph-clint-project` documents
+ * and, when any change, re-runs the code generator for each affected project.
  *
  * Flow:
  *   1. `createDocumentChangeTrigger` (from ph-clint) owns the subscription,
- *      event coalescing, doc loading, and type narrowing.
- *   2. `documentId` resolves the target doc lazily: it prefers
- *      `config.projectDocumentId`, falling back to a drive scan for the first
- *      `powerhouse/ph-clint-project` document (and pinning the id into local
- *      config on success).
- *   3. `onChange` converts the doc state to a `ClintProjectSpec`, hashes it,
+ *      event coalescing, doc loading, and type narrowing. No `documentId` is
+ *      set, so it loads ALL matching documents on each poll.
+ *   2. `getProjectMapping()` merges an on-disk scan (via the clint-project
+ *      service's projectScanner) with personal-drive folder entries to
+ *      correlate each document to an on-disk project directory.
+ *   3. For each document, `specFromDocumentState()` builds a spec, hashes it,
  *      and compares against `.ph/ph-clint-cli/.last-spec-hash`. If unchanged,
- *      emits nothing. If different, returns a `function` work item that calls
- *      `generateProject(spec, workdir, 'update')` and writes the new hash.
+ *      skips. Otherwise regenerates at the mapped target directory.
  */
 import crypto from 'node:crypto';
 import fs from 'node:fs/promises';
 import path from 'node:path';
+import { scanProjects, getProjectMapping } from '@powerhousedao/ph-clint';
+import { importSpec } from '@powerhousedao/ph-clint-app/document-models/ph-clint-project';
 import { createDocumentChangeTrigger } from '../framework.js';
 import { generateProject } from '../codegen/index.js';
+import { runPhInit } from '../codegen/scaffold.js';
 import { specFromDocumentState } from '../spec/from-document.js';
+import { readProjectSpec, writeProjectSpec } from '../spec/file.js';
+import { syncExternalSkills } from '../skills/sync.js';
+import { clintProject } from '../services/clint-project.js';
 const DOCUMENT_TYPE = 'powerhouse/ph-clint-project';
 const HASH_DIR = path.join('.ph', 'ph-clint-cli');
 const HASH_FILE = '.last-spec-hash';
@@ -49,11 +53,13 @@ async function writeLastSpecHash(targetDir, hash) {
     await fs.mkdir(path.dirname(file), { recursive: true });
     await fs.writeFile(file, hash + '\n', 'utf8');
 }
-/** Stable hash of a ClintProjectSpec (sha256 of canonical-key JSON). */
+/** Stable hash of a ClintProjectSpec (sha256 of canonical-key JSON).
+ *  Excludes documentId/documentType — they don't affect codegen output. */
 export function hashSpec(spec) {
+    const { documentId, documentType, ...codegenRelevant } = spec;
     return crypto
         .createHash('sha256')
-        .update(canonicalJson(spec), 'utf8')
+        .update(canonicalJson(codegenRelevant), 'utf8')
         .digest('hex');
 }
 function canonicalJson(value) {
@@ -70,102 +76,172 @@ function canonicalJson(value) {
             .join(',') +
         '}');
 }
-/** Find the first ph-clint-project document on the default drive. */
-async function findProjectDocumentId(client, driveId) {
-    try {
-        const children = await client.getChildren(driveId);
-        const results = (children?.results ?? []);
-        for (const node of results) {
-            if (node.header?.documentType === DOCUMENT_TYPE && node.header.id) {
-                return node.header.id;
-            }
-        }
-    }
-    catch {
-        // fall through
-    }
-    return undefined;
+export function specToImportInput(spec) {
+    return {
+        name: spec.name,
+        scope: spec.scope ?? null,
+        version: spec.version,
+        description: spec.description,
+        bin: spec.bin ?? null,
+        powerhouse: spec.features.powerhouse,
+        mastraEnabled: spec.features.mastra.enabled,
+        routineEnabled: spec.features.routine.enabled,
+        agentId: spec.features.mastra.agentId ?? null,
+        agentName: spec.features.mastra.agentName ?? null,
+        models: spec.features.mastra.models.map(m => ({
+            id: m.id,
+            isDefault: m.isDefault,
+        })),
+        profiles: spec.features.mastra.profiles.map(p => ({
+            id: p.id,
+            title: p.title,
+            content: p.content,
+        })),
+        packages: spec.packages.map(p => ({
+            id: p.id,
+            packageName: p.packageName,
+            documentTypes: p.documentTypes,
+        })),
+        externalSkills: spec.externalSkills.map(s => ({
+            id: s.id,
+            name: s.name,
+            githubUrl: s.githubUrl,
+        })),
+    };
 }
 export const specChangeTrigger = createDocumentChangeTrigger({
     id: 'spec-change',
     documentType: DOCUMENT_TYPE,
-    // Resolve the target id lazily so we can also do first-time discovery and
-    // persist the discovered id into local config.
-    documentId: async (ctx) => {
-        const configured = ctx.context.config.projectDocumentId &&
-            ctx.context.config.projectDocumentId.length > 0
-            ? ctx.context.config.projectDocumentId
-            : undefined;
-        if (configured)
-            return configured;
+    // No documentId → watches ALL ph-clint-project docs
+    async onChange(docs, ctx) {
+        const log = ctx.context.log;
+        const folders = ctx.context.folders;
+        // Build the mapping: on-disk projects + personal drive documents
+        const scanner = clintProject.projectScanner;
+        const scanResults = scanner
+            ? scanProjects(ctx.context.workdir, scanner)
+            : [];
+        const mapping = await getProjectMapping(scanResults, folders);
+        // Auto-create spec documents for unlinked projects
         const reactor = await ctx.reactor();
-        if (!reactor)
-            return undefined;
-        const discovered = await findProjectDocumentId(reactor.client, reactor.driveId);
-        if (!discovered) {
-            ctx.context.log?.debug(`${TAG} no ${DOCUMENT_TYPE} document found on drive ${reactor.driveId}`);
-            return undefined;
+        if (reactor && folders) {
+            for (const entry of mapping) {
+                if (entry.path && !entry.documentId) {
+                    const existingSpec = await readProjectSpec(entry.path);
+                    if (!existingSpec)
+                        continue;
+                    log?.info(`${TAG} creating spec document for unlinked project ${entry.name}`);
+                    const newDoc = await reactor.client.createEmpty('powerhouse/ph-clint-project');
+                    const docId = newDoc.header.id;
+                    await folders.addDocument(docId, `specs/${entry.name}`, entry.name);
+                    const importInput = specToImportInput(existingSpec);
+                    await reactor.client.execute(docId, 'main', [importSpec(importInput)]);
+                    existingSpec.documentId = docId;
+                    existingSpec.documentType = 'powerhouse/ph-clint-project';
+                    await writeProjectSpec(entry.path, existingSpec);
+                    log?.info(`${TAG} linked project ${entry.name} to document ${docId}`);
+                }
+            }
         }
-        // Persist into local config + mutate in-memory so future ticks skip discovery.
-        try {
-            const current = await ctx.context.workspace.loadLocalConfig({});
-            await ctx.context.workspace.storeLocalConfig({
-                ...current,
-                projectDocumentId: discovered,
+        for (const doc of docs) {
+            const spec = specFromDocumentState(doc.state.global, {
+                documentId: doc.header.id,
+                documentType: doc.header.documentType,
             });
-            ctx.context.config.projectDocumentId = discovered;
-            ctx.context.log?.info(`${TAG} pinned projectDocumentId=${discovered} in ${ctx.context.workspace.getLocalConfigPath()}`);
-        }
-        catch (err) {
-            ctx.context.log?.warn(`${TAG} failed to persist projectDocumentId: ${err instanceof Error ? err.message : String(err)}`);
-        }
-        return discovered;
-    },
-    async onChange(doc, ctx) {
-        const log = ctx.context.log;
-        const spec = specFromDocumentState(doc.state.global);
-        if (!spec) {
-            log?.debug(`${TAG} document ${doc.header.id} state did not validate against ClintProjectSpec, skipping`);
-            return null;
-        }
-        const targetDir = ctx.context.workdir;
-        const nextHash = hashSpec(spec);
-        const prevHash = await readLastSpecHash(targetDir);
-        if (nextHash === prevHash) {
-            log?.debug(`${TAG} spec unchanged (hash=${nextHash.slice(0, 12)}…), nothing to do`);
-            return null;
-        }
-        log?.debug(`${TAG} spec changed: ${prevHash ? prevHash.slice(0, 12) + '…' : '<none>'} → ${nextHash.slice(0, 12)}…`);
-        return {
-            type: 'function',
-            params: {
-                fn: async () => {
-                    log?.info(`${TAG} regenerating project at ${targetDir} (doc=${doc.header.id})`);
-                    const t0 = Date.now();
-                    const warnings = [];
-                    const result = await generateProject({
+            if (!spec) {
+                log?.debug(`${TAG} document ${doc.header.id} state did not validate against ClintProjectSpec, skipping`);
+                continue;
+            }
+            // Find target directory from mapping
+            const entry = mapping.find((m) => m.documentId === doc.header.id);
+            const targetDir = entry?.path ?? path.join(ctx.context.workdir, spec.name);
+            // Per-project hash comparison
+            const nextHash = hashSpec(spec);
+            const prevHash = await readLastSpecHash(targetDir);
+            if (nextHash === prevHash) {
+                log?.debug(`${TAG} spec for ${spec.name} unchanged (hash=${nextHash.slice(0, 12)}…), skipping`);
+                continue;
+            }
+            log?.debug(`${TAG} spec for ${spec.name} changed: ${prevHash ? prevHash.slice(0, 12) + '…' : '<none>'} → ${nextHash.slice(0, 12)}…`);
+            log?.info(`${TAG} regenerating ${spec.name} at ${targetDir} (doc=${doc.header.id})`);
+            const t0 = Date.now();
+            const warnings = [];
+            const result = await generateProject({
+                targetDir,
+                spec,
+                mode: 'update',
+                force: true,
+                onWarn: (m) => warnings.push(m),
+            });
+            // Write spec JSON with documentId
+            await writeProjectSpec(targetDir, spec);
+            await writeLastSpecHash(targetDir, nextHash);
+            const elapsed = Date.now() - t0;
+            if (log) {
+                if (result.migrated)
+                    log.info(`${TAG} migrated flat → split layout`);
+                log.info(`${TAG} regenerated ${spec.name} in ${elapsed}ms: ${result.files.length} written, ${result.skipped.length} skipped, ${result.deleted.length} deleted`);
+                for (const w of warnings)
+                    log.warn(`${TAG} ${w}`);
+            }
+            // Scaffold the reactor package (app dir) if it hasn't been initialized yet.
+            if (result.appDir) {
+                const appPkgJson = path.join(result.appDir, 'package.json');
+                let appExists = false;
+                try {
+                    await fs.access(appPkgJson);
+                    appExists = true;
+                }
+                catch { /* noop */ }
+                if (!appExists) {
+                    log?.info(`${TAG} initializing reactor package at ${result.appDir}`);
+                    const phResult = await runPhInit({
                         targetDir,
+                        appDir: result.appDir,
                         spec,
-                        mode: 'update',
-                        onWarn: (m) => warnings.push(m),
+                        log: (msg) => log?.info(`${TAG} ${msg}`),
+                        runProcess: ctx.context.runProcess,
                     });
-                    await writeLastSpecHash(targetDir, nextHash);
-                    const elapsed = Date.now() - t0;
-                    if (log) {
-                        if (result.migrated)
-                            log.info(`${TAG} migrated flat → split layout`);
-                        log.info(`${TAG} regenerated in ${elapsed}ms: ${result.files.length} written, ${result.skipped.length} skipped, ${result.deleted.length} deleted`);
-                        for (const w of warnings)
-                            log.warn(`${TAG} ${w}`);
+                    if (!phResult.ran) {
+                        log?.warn(`${TAG} ph init skipped: ${phResult.reason ?? 'unknown'}`);
                     }
-                },
-            },
-            callbacks: {
-                onFailure: (err) => {
-                    log?.error(`${TAG} regen failed: ${err.message}`);
-                    log?.debug(`${TAG} stack: ${err.stack ?? '<no stack>'}`);
-                },
-            },
-        };
+                    else if (phResult.exitCode !== 0) {
+                        log?.warn(`${TAG} ph init exited with code ${phResult.exitCode}`);
+                    }
+                }
+                // Always ensure the app package name matches the spec's scope,
+                // even if ph init ran in a previous trigger cycle without scope.
+                if (spec.scope) {
+                    try {
+                        const raw = await fs.readFile(appPkgJson, 'utf8');
+                        const pkg = JSON.parse(raw);
+                        const appFolder = path.basename(result.appDir);
+                        const scopedName = `@${spec.scope}/${appFolder}`;
+                        if (pkg.name !== scopedName) {
+                            pkg.name = scopedName;
+                            pkg.publishConfig = { access: 'public' };
+                            await fs.writeFile(appPkgJson, JSON.stringify(pkg, null, 2) + '\n');
+                            log?.info(`${TAG} patched app package name to ${scopedName}`);
+                        }
+                    }
+                    catch (err) {
+                        log?.warn(`${TAG} could not patch app package name: ${err instanceof Error ? err.message : String(err)}`);
+                    }
+                }
+            }
+            // Sync external skills after codegen.
+            if (spec.externalSkills.length > 0) {
+                const skillsResult = await syncExternalSkills({
+                    targetDir,
+                    desired: spec.externalSkills,
+                    log: (msg) => log?.info(`${TAG} ${msg}`),
+                });
+                if (log && (skillsResult.added.length > 0 || skillsResult.removed.length > 0)) {
+                    log.info(`${TAG} skills sync: +${skillsResult.added.length} -${skillsResult.removed.length}`);
+                }
+            }
+        }
+        // Work done inline, no additional work item needed
+        return null;
     },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@powerhousedao/ph-clint-cli",
-  "version": "0.1.0-dev.3",
+  "version": "0.1.0-dev.31",
   "publishConfig": {
     "access": "public"
   },
@@ -10,8 +10,7 @@
     "ph-clint": "./dist/main.js"
   },
   "files": [
-    "dist",
-    "prompts"
+    "dist"
   ],
   "scripts": {
     "build:skills": "tsx scripts/build-skills.ts",
@@ -19,21 +18,23 @@
     "dev": "tsx src/main.ts",
     "start": "node dist/main.js",
     "test": "NODE_OPTIONS='--experimental-vm-modules' jest --detectOpenHandles",
+    "test:e2e": "NODE_OPTIONS='--experimental-vm-modules' jest --detectOpenHandles --testPathPatterns 'tests/(e2e|codegen-e2e)/' --testPathIgnorePatterns '/node_modules/'",
     "lint": "eslint src",
     "mastra:dev": "mastra dev",
     "mastra:build": "mastra build",
     "mastra:start": "mastra start"
   },
   "dependencies": {
-    "@powerhousedao/ph-clint": "^0.1.0-dev.3",
-    "@powerhousedao/ph-clint-app": "^0.1.0-dev.3",
+    "@electric-sql/pglite": "0.3.15",
     "@mastra/core": "^1.22.0",
     "@mastra/libsql": "^1.7.4",
     "@mastra/memory": "^1.13.1",
+    "@powerhousedao/ph-clint": "^0.1.0-dev.31",
+    "@powerhousedao/ph-clint-app": "^0.1.0-dev.31",
+    "@powerhousedao/ph-clint-dev": "^0.1.0-dev.31",
     "@powerhousedao/reactor": "6.0.0-dev.170",
     "@powerhousedao/reactor-api": "6.0.0-dev.170",
     "@powerhousedao/shared": "6.0.0-dev.170",
-    "@electric-sql/pglite": "0.3.15",
     "document-model": "6.0.0-dev.170",
     "kysely": "^0.27.0",
     "kysely-pglite-dialect": "^1.3.0",
@@ -48,7 +49,6 @@
     "@jest/globals": "^30.2.0",
     "@types/node": "^25.5.2",
     "jest": "^30.2.0",
-    "@powerhousedao/ph-clint-dev": "^0.1.0-dev.3",
     "ts-jest": "^29.4.6",
     "tsx": "^4.19.0",
     "typescript": "^6.0.2"