@powerhousedao/ph-clint-cli 0.1.0-dev.25 → 0.1.0-dev.26

package/dist/codegen/scaffold.d.ts

@@ -1,4 +1,12 @@
 import type { ClintProjectSpec } from '../spec/types.js';
+import type { ProcessRunOptions } from '@powerhousedao/ph-clint';
+/**
+ * Signature for the subprocess runner — matches CommandContext.runProcess.
+ */
+type RunProcess = (command: string, opts?: Omit<ProcessRunOptions, 'onOutput'>) => Promise<{
+    success: boolean;
+    output: string;
+}>;
 export interface PhInitOptions {
     /** Absolute path to the project root. */
     targetDir: string;
@@ -9,8 +17,8 @@ export interface PhInitOptions {
     log?: (msg: string) => void;
     /** Override `ph` binary name (for tests). */
     binName?: string;
-    /** Stdio passthrough (tests pass 'ignore'). */
-    stdio?: 'inherit' | 'ignore';
+    /** Subprocess runner — uses CommandContext.runProcess when available. */
+    runProcess?: RunProcess;
     /** Explicit Powerhouse version to pin `ph init` to (tag or semver). */
     phVersion?: string;
 }
@@ -32,7 +40,8 @@ export interface PnpmInstallOptions {
     log?: (msg: string) => void;
     /** Override `pnpm` binary name (for tests). */
     binName?: string;
-    stdio?: 'inherit' | 'ignore';
+    /** Subprocess runner — uses CommandContext.runProcess when available. */
+    runProcess?: RunProcess;
 }
 export interface PnpmInstallResult {
     ran: string[];
@@ -40,3 +49,4 @@ export interface PnpmInstallResult {
     reason?: string;
 }
 export declare function runPnpmInstall(options: PnpmInstallOptions): Promise<PnpmInstallResult>;
+export {};

package/dist/codegen/scaffold.js

@@ -8,7 +8,7 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 import { execFileSync } from 'node:child_process';
-import { hasCommandOnPath, runCommand } from './exec.js';
+import { hasCommandOnPath } from './exec.js';
 /**
  * Detect the installed `ph` CLI version by parsing `ph --version` output.
  * Returns the version string (e.g. '6.0.0-dev.194') or undefined if
@@ -49,39 +49,51 @@ export async function runPhInit(options) {
     // placed a `.gitkeep` + README.md placeholder there; clear it out so
     // ph init has a blank slate to work with.
     await fs.rm(options.appDir, { recursive: true, force: true });
+    const args = ['init', appFolder, ...versionArgs, '--pnpm'];
     log(`Running \`${binName} init ${appFolder}\` (version: ${phVersion ?? 'auto'}) in ${options.targetDir} …`);
-    const result = await runCommand(binName, [
-        'init',
-        appFolder,
-        ...versionArgs,
-        '--pnpm',
-    ], { cwd: options.targetDir, stdio: options.stdio ?? 'inherit' });
+    const run = options.runProcess;
+    if (run) {
+        const result = await run(`${binName} ${args.join(' ')}`, {
+            cwd: options.targetDir,
+            timeout: 300_000, // ph init + pnpm install can be slow
+        });
+        const exitCode = result.success ? 0 : 1;
+        if (!result.success) {
+            log(`\`${binName} init\` failed. ` +
+                'You can re-run it manually after resolving the issue.');
+        }
+        // Patch scoped name
+        await patchScopedName(options, appFolder, log);
+        return { ran: true, exitCode };
+    }
+    // Fallback: direct spawn with stdio inherit (for backward compat / tests without context)
+    const { runCommand } = await import('./exec.js');
+    const result = await runCommand(binName, args, { cwd: options.targetDir, stdio: 'inherit' });
     if (result.exitCode !== 0) {
         log(`\`${binName} init\` exited with code ${result.exitCode}. ` +
             'You can re-run it manually after resolving the issue.');
     }
-    // ph init creates an unscoped package name. If the spec has a scope, patch
-    // the app's package.json to use the scoped name so `file:` deps and publish
-    // both resolve correctly. Run even on non-zero exit — ph init may have
-    // partially succeeded and created package.json.
-    if (options.spec.scope) {
-        const appPkgJsonPath = path.join(options.appDir, 'package.json');
-        try {
-            const raw = await fs.readFile(appPkgJsonPath, 'utf8');
-            const pkg = JSON.parse(raw);
-            const scopedName = `@${options.spec.scope}/${appFolder}`;
-            if (pkg.name !== scopedName) {
-                pkg.name = scopedName;
-                pkg.publishConfig = { access: 'public' };
-                await fs.writeFile(appPkgJsonPath, JSON.stringify(pkg, null, 2) + '\n');
-                log(`Patched app package name to ${scopedName}`);
-            }
-        }
-        catch (err) {
-            log(`Warning: could not patch app package name: ${err instanceof Error ? err.message : String(err)}`);
+    await patchScopedName(options, appFolder, log);
+    return { ran: true, exitCode: result.exitCode };
+}
+async function patchScopedName(options, appFolder, log) {
+    if (!options.spec.scope)
+        return;
+    const appPkgJsonPath = path.join(options.appDir, 'package.json');
+    try {
+        const raw = await fs.readFile(appPkgJsonPath, 'utf8');
+        const pkg = JSON.parse(raw);
+        const scopedName = `@${options.spec.scope}/${appFolder}`;
+        if (pkg.name !== scopedName) {
+            pkg.name = scopedName;
+            pkg.publishConfig = { access: 'public' };
+            await fs.writeFile(appPkgJsonPath, JSON.stringify(pkg, null, 2) + '\n');
+            log(`Patched app package name to ${scopedName}`);
         }
     }
-    return { ran: true, exitCode: result.exitCode };
+    catch (err) {
+        log(`Warning: could not patch app package name: ${err instanceof Error ? err.message : String(err)}`);
+    }
 }
 export async function runPnpmInstall(options) {
     const log = options.log ?? (() => { });
@@ -94,14 +106,27 @@ export async function runPnpmInstall(options) {
     const ran = [];
     for (const dir of options.dirs) {
         log(`Running \`${binName} install\` in ${dir} …`);
-        const result = await runCommand(binName, ['install'], {
-            cwd: dir,
-            stdio: options.stdio ?? 'inherit',
-        });
-        if (result.exitCode !== 0) {
-            log(`\`${binName} install\` exited with code ${result.exitCode} in ${dir}. ` +
-                'Retry manually once the underlying issue is resolved.');
-            // Don't abort the whole chain — subsequent dirs may still work.
+        const run = options.runProcess;
+        if (run) {
+            const result = await run(`${binName} install`, {
+                cwd: dir,
+                timeout: 300_000,
+            });
+            if (!result.success) {
+                log(`\`${binName} install\` failed in ${dir}. ` +
+                    'Retry manually once the underlying issue is resolved.');
+            }
+        }
+        else {
+            const { runCommand } = await import('./exec.js');
+            const result = await runCommand(binName, ['install'], {
+                cwd: dir,
+                stdio: 'inherit',
+            });
+            if (result.exitCode !== 0) {
+                log(`\`${binName} install\` exited with code ${result.exitCode} in ${dir}. ` +
+                    'Retry manually once the underlying issue is resolved.');
+            }
         }
         ran.push(dir);
     }

package/dist/commands/clint-project-build.js

@@ -1,5 +1,4 @@
 import path from 'node:path';
-import { spawn } from 'node:child_process';
 import { defineCommand } from '@powerhousedao/ph-clint';
 import { z } from 'zod';
 import { detectLayout } from '@powerhousedao/ph-clint-dev';
@@ -7,44 +6,28 @@ const inputSchema = z.object({
     dir: z.string().optional().describe('Project root directory (default: cwd)'),
     verbose: z.boolean().default(false),
 });
-function execInDir(dir, cmd, verbose) {
-    return new Promise((resolve, reject) => {
-        const proc = spawn(cmd, {
-            cwd: dir,
-            shell: true,
-            stdio: verbose ? 'inherit' : 'pipe',
-        });
-        let stderr = '';
-        if (!verbose && proc.stderr) {
-            proc.stderr.on('data', (data) => {
-                stderr += data.toString();
-            });
-        }
-        proc.on('close', (code) => {
-            if (code === 0)
-                resolve();
-            else
-                reject(new Error(`Command "${cmd}" failed in ${dir} (exit ${code})${stderr ? `:\n${stderr}` : ''}`));
-        });
-        proc.on('error', (err) => reject(err));
-    });
-}
 export const build = defineCommand({
     id: 'clint-project-build',
     description: 'Build all packages in the project',
     inputSchema,
-    execute: async (input, { workdir, stdout }) => {
+    execute: async (input, { workdir, stdout, runProcess }) => {
         const dir = path.resolve(input.dir ?? workdir);
         const layout = detectLayout(dir);
         if (layout?.type === 'split') {
             stdout(`Building app package (${layout.app})...\n`);
-            await execInDir(layout.app, 'pnpm build', input.verbose);
+            const appResult = await runProcess('pnpm build', { cwd: layout.app, timeout: 120_000 });
+            if (!appResult.success)
+                return { text: `App build failed.` };
             stdout(`Building cli package (${layout.cli})...\n`);
-            await execInDir(layout.cli, 'pnpm build', input.verbose);
+            const cliResult = await runProcess('pnpm build', { cwd: layout.cli, timeout: 120_000 });
+            if (!cliResult.success)
+                return { text: `CLI build failed.` };
         }
         else {
             stdout(`Building project...\n`);
-            await execInDir(layout?.cli ?? dir, 'pnpm build', input.verbose);
+            const result = await runProcess('pnpm build', { cwd: layout?.cli ?? dir, timeout: 120_000 });
+            if (!result.success)
+                return { text: `Build failed.` };
         }
         return { text: 'Build complete.' };
     },

package/dist/commands/clint-project-init.js

@@ -102,7 +102,7 @@ export const init = defineCommand({
         promptForDefaults: true,
         promptOptional: ['description'],
     },
-    execute: async (input, { workdir, stdout, reactor: getReactor, folders }) => {
+    execute: async (input, { workdir, stdout, reactor: getReactor, folders, runProcess }) => {
         const { name: bareName } = splitPackageName(input.name);
         const targetDir = path.resolve(workdir, input.dir ?? bareName);
         if (!input.force) {
@@ -151,6 +151,7 @@ export const init = defineCommand({
                 appDir: result.appDir,
                 spec,
                 log: (msg) => stdout(msg + '\n'),
+                runProcess,
             });
             if (!phResult.ran) {
                 stdout(`Note: \`ph init\` did not run — ${phResult.reason ?? 'see above'}.\n`);
@@ -170,6 +171,7 @@ export const init = defineCommand({
             await runPnpmInstall({
                 dirs,
                 log: (msg) => stdout(msg + '\n'),
+                runProcess,
             });
         }
         const next = [];

package/dist/triggers/spec-change.js

@@ -200,7 +200,7 @@ export const specChangeTrigger = createDocumentChangeTrigger({
                         appDir: result.appDir,
                         spec,
                         log: (msg) => log?.info(`${TAG} ${msg}`),
-                        stdio: 'ignore',
+                        runProcess: ctx.context.runProcess,
                     });
                     if (!phResult.ran) {
                         log?.warn(`${TAG} ph init skipped: ${phResult.reason ?? 'unknown'}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@powerhousedao/ph-clint-cli",
-  "version": "0.1.0-dev.25",
+  "version": "0.1.0-dev.26",
   "publishConfig": {
     "access": "public"
   },
@@ -29,9 +29,9 @@
     "@mastra/core": "^1.22.0",
     "@mastra/libsql": "^1.7.4",
     "@mastra/memory": "^1.13.1",
-    "@powerhousedao/ph-clint": "^0.1.0-dev.25",
-    "@powerhousedao/ph-clint-app": "^0.1.0-dev.25",
-    "@powerhousedao/ph-clint-dev": "^0.1.0-dev.25",
+    "@powerhousedao/ph-clint": "^0.1.0-dev.26",
+    "@powerhousedao/ph-clint-app": "^0.1.0-dev.26",
+    "@powerhousedao/ph-clint-dev": "^0.1.0-dev.26",
     "@powerhousedao/reactor": "6.0.0-dev.170",
     "@powerhousedao/reactor-api": "6.0.0-dev.170",
     "@powerhousedao/shared": "6.0.0-dev.170",