jfl 0.2.5 → 0.4.2

package/dist/commands/init.js

@@ -17,7 +17,7 @@ import { ensureDaemonInstalled } from "./context-hub.js";
 const TEMPLATE_REPO = "https://github.com/402goose/jfl-template.git";
 export async function initCommand(options) {
     // Start Clawdbot-style flow
-    p.intro(chalk.hex("#FFD700")("┌  JFL - Initialize GTM Workspace"));
+    p.intro(chalk.hex("#FFD700")("┌  JFL - Initialize Workspace"));
     // Check authentication - owner needs to be verified
     let ownerName = "";
     let ownerGithub = "";
@@ -67,6 +67,19 @@ export async function initCommand(options) {
         }
         projectName = name;
     }
+    // Ask workspace type
+    const workspaceType = await p.select({
+        message: "Workspace type:",
+        options: [
+            { label: "GTM", value: "gtm", hint: "Single product workspace" },
+            { label: "Portfolio", value: "portfolio", hint: "Manages multiple products" },
+        ],
+    });
+    if (p.isCancel(workspaceType)) {
+        p.cancel("Setup cancelled.");
+        process.exit(0);
+    }
+    const isPortfolio = workspaceType === "portfolio";
     // If cwd already matches the project name, initialize in place
     const cwdBasename = basename(process.cwd());
     const initInPlace = cwdBasename === projectName;
@@ -95,7 +108,7 @@ export async function initCommand(options) {
         return;
     }
     // Clone template to temp directory, copy only template/ folder
-    const spinner = ora("Downloading GTM template...").start();
+    const spinner = ora(`Downloading ${isPortfolio ? "portfolio" : "GTM"} template...`).start();
     const tempDir = join(tmpdir(), `jfl-init-${Date.now()}`);
     try {
         // Clone to temp
@@ -150,7 +163,7 @@ export async function initCommand(options) {
         catch {
             execSync(`git init`, { cwd: projectPath, stdio: "pipe" });
         }
-        spinner.succeed("GTM workspace created!");
+        spinner.succeed(`${isPortfolio ? "Portfolio" : "GTM"} workspace created!`);
         // Validate and fix .claude/settings.json
         const settingsPath = join(projectPath, ".claude", "settings.json");
         if (existsSync(settingsPath)) {
@@ -181,165 +194,233 @@ export async function initCommand(options) {
             process.exit(0);
         }
         let productRepo = null;
-        // Ask about product repo (registered as service, NOT a submodule)
-        const productChoice = await p.select({
-            message: "Product repo:",
-            options: [
-                {
-                    label: "I have an existing repo",
-                    value: "existing",
-                    hint: "Register as a service"
-                },
-                {
-                    label: "Create a new repo for me",
-                    value: "create",
-                    hint: "Requires: gh CLI"
-                },
-                {
-                    label: "I'll add it later",
-                    value: "later",
-                    hint: "Recommended if unsure"
-                },
-            ],
-        });
-        if (p.isCancel(productChoice)) {
-            p.cancel("Setup cancelled.");
-            process.exit(0);
-        }
-        if (productChoice !== "later") {
-            if (productChoice === "existing") {
-                const repoUrl = await p.text({
-                    message: "Product repo URL:",
-                    placeholder: "https://github.com/user/repo.git",
-                    validate: (input) => {
-                        if (!input.trim()) {
-                            return "Please enter a repo URL";
+        const portfolioChildGtms = [];
+        if (isPortfolio) {
+            // Portfolio: register child GTM workspaces
+            p.note("Register existing GTM workspaces under this portfolio.\n" +
+                "Each GTM gets its own eval pipeline, journals, and event bus.\n" +
+                "The portfolio aggregates across all of them.", chalk.hex("#FFA500")("Portfolio Setup"));
+            const registerGtms = await p.confirm({
+                message: "Register GTM workspaces now?",
+                initialValue: true,
+            });
+            if (!p.isCancel(registerGtms) && registerGtms) {
+                let adding = true;
+                let gtmCount = 0;
+                while (adding) {
+                    const gtmPathInput = await p.text({
+                        message: gtmCount === 0
+                            ? "GTM workspace path:"
+                            : "Another GTM path (or Enter to skip):",
+                        placeholder: "/path/to/my-product-gtm",
+                        validate: (input) => {
+                            if (gtmCount === 0 && !input.trim()) {
+                                return "Enter at least one GTM path";
+                            }
+                        },
+                    });
+                    if (p.isCancel(gtmPathInput))
+                        break;
+                    if (!gtmPathInput || gtmPathInput.trim() === "") {
+                        adding = false;
+                        break;
+                    }
+                    const resolvedGtmPath = join(process.cwd(), gtmPathInput).replace(/\/+$/, "");
+                    const absGtmPath = gtmPathInput.startsWith("/") ? gtmPathInput : resolvedGtmPath;
+                    const gtmConfigPath = join(absGtmPath, ".jfl", "config.json");
+                    if (!existsSync(gtmConfigPath)) {
+                        p.log.warning(`No .jfl/config.json at ${absGtmPath} — skipping`);
+                        continue;
+                    }
+                    try {
+                        const gtmConfig = JSON.parse(readFileSync(gtmConfigPath, "utf-8"));
+                        if (gtmConfig.type !== "gtm") {
+                            p.log.warning(`${absGtmPath} is type "${gtmConfig.type}", not "gtm" — skipping`);
+                            continue;
                         }
-                    },
-                });
-                if (p.isCancel(repoUrl)) {
-                    p.cancel("Setup cancelled.");
-                    process.exit(0);
+                        const { getRegisteredServices } = await import("../lib/service-gtm.js");
+                        const svcCount = getRegisteredServices(absGtmPath).length;
+                        portfolioChildGtms.push({
+                            name: gtmConfig.name,
+                            path: absGtmPath,
+                            type: "gtm",
+                            registered_at: new Date().toISOString(),
+                            status: "active",
+                            context_scope: gtmConfig.context_scope,
+                        });
+                        // Write portfolio_parent back to child
+                        gtmConfig.portfolio_parent = projectPath;
+                        writeFileSync(gtmConfigPath, JSON.stringify(gtmConfig, null, 2));
+                        p.log.success(`Registered: ${gtmConfig.name} (${svcCount} services)`);
+                        gtmCount++;
+                    }
+                    catch (err) {
+                        p.log.warning(`Failed to read ${absGtmPath}: ${err.message}`);
+                    }
                 }
-                productRepo = repoUrl;
-                p.log.success(`Product repo registered: ${productRepo}`);
-                p.log.info("Use service agents to work on product code directly in its own repo.");
             }
-            else if (productChoice === "create") {
-                // Check if gh CLI is available
-                try {
-                    execSync("gh --version", { stdio: "pipe" });
-                    let repoCreated = false;
-                    let attemptCount = 0;
-                    const maxAttempts = 3;
-                    while (!repoCreated && attemptCount < maxAttempts) {
-                        attemptCount++;
-                        const repoName = await p.text({
-                            message: attemptCount > 1 ? "Try a different name:" : "New repo name:",
-                            placeholder: attemptCount > 1
-                                ? `${projectName.replace(/-gtm$/, "")}-${attemptCount}`
-                                : projectName.replace(/-gtm$/, ""),
-                            validate: (input) => {
-                                if (!input.trim()) {
-                                    return "Please enter a repo name";
-                                }
-                                if (/\s/.test(input)) {
-                                    return "Repo names cannot contain spaces. Use hyphens instead (e.g., 'my-project')";
-                                }
-                                if (!/^[a-zA-Z0-9._-]+$/.test(input)) {
-                                    return "Repo names can only contain letters, numbers, hyphens, underscores, and dots";
-                                }
-                            },
-                        });
-                        if (p.isCancel(repoName)) {
-                            p.cancel("Setup cancelled.");
-                            process.exit(0);
-                        }
-                        const visibility = await p.select({
-                            message: "Visibility:",
-                            options: [
-                                { label: "Private", value: "private" },
-                                { label: "Public", value: "public" },
-                            ],
-                        });
-                        if (p.isCancel(visibility)) {
-                            p.cancel("Setup cancelled.");
-                            process.exit(0);
-                        }
-                        const createSpinner = ora("Creating product repo...").start();
-                        try {
-                            const visFlag = visibility === "private" ? "--private" : "--public";
-                            const finalRepoName = repoName.trim().replace(/\s+/g, '-');
-                            try {
-                                execSync(`gh repo create ${finalRepoName} ${visFlag}`, {
-                                    cwd: projectPath,
-                                    stdio: "pipe",
-                                    encoding: "utf-8",
-                                });
-                                // Get the repo URL
-                                const repoUrl = execSync(`gh repo view ${finalRepoName} --json url -q .url`, {
-                                    cwd: projectPath,
-                                    encoding: "utf-8",
-                                }).trim();
-                                createSpinner.succeed(`Product repo created: ${repoUrl}`);
-                                productRepo = repoUrl;
-                                repoCreated = true;
+        }
+        if (!isPortfolio) {
+            // Ask about product repo (registered as service, NOT a submodule)
+            const productChoice = await p.select({
+                message: "Product repo:",
+                options: [
+                    {
+                        label: "I have an existing repo",
+                        value: "existing",
+                        hint: "Register as a service"
+                    },
+                    {
+                        label: "Create a new repo for me",
+                        value: "create",
+                        hint: "Requires: gh CLI"
+                    },
+                    {
+                        label: "I'll add it later",
+                        value: "later",
+                        hint: "Recommended if unsure"
+                    },
+                ],
+            });
+            if (p.isCancel(productChoice)) {
+                p.cancel("Setup cancelled.");
+                process.exit(0);
+            }
+            if (productChoice !== "later") {
+                if (productChoice === "existing") {
+                    const repoUrl = await p.text({
+                        message: "Product repo URL:",
+                        placeholder: "https://github.com/user/repo.git",
+                        validate: (input) => {
+                            if (!input.trim()) {
+                                return "Please enter a repo URL";
+                            }
+                        },
+                    });
+                    if (p.isCancel(repoUrl)) {
+                        p.cancel("Setup cancelled.");
+                        process.exit(0);
+                    }
+                    productRepo = repoUrl;
+                    p.log.success(`Product repo registered: ${productRepo}`);
+                    p.log.info("Use service agents to work on product code directly in its own repo.");
+                }
+                else if (productChoice === "create") {
+                    // Check if gh CLI is available
+                    try {
+                        execSync("gh --version", { stdio: "pipe" });
+                        let repoCreated = false;
+                        let attemptCount = 0;
+                        const maxAttempts = 3;
+                        while (!repoCreated && attemptCount < maxAttempts) {
+                            attemptCount++;
+                            const repoName = await p.text({
+                                message: attemptCount > 1 ? "Try a different name:" : "New repo name:",
+                                placeholder: attemptCount > 1
+                                    ? `${projectName.replace(/-gtm$/, "")}-${attemptCount}`
+                                    : projectName.replace(/-gtm$/, ""),
+                                validate: (input) => {
+                                    if (!input.trim()) {
+                                        return "Please enter a repo name";
+                                    }
+                                    if (/\s/.test(input)) {
+                                        return "Repo names cannot contain spaces. Use hyphens instead (e.g., 'my-project')";
+                                    }
+                                    if (!/^[a-zA-Z0-9._-]+$/.test(input)) {
+                                        return "Repo names can only contain letters, numbers, hyphens, underscores, and dots";
+                                    }
+                                },
+                            });
+                            if (p.isCancel(repoName)) {
+                                p.cancel("Setup cancelled.");
+                                process.exit(0);
+                            }
+                            const visibility = await p.select({
+                                message: "Visibility:",
+                                options: [
+                                    { label: "Private", value: "private" },
+                                    { label: "Public", value: "public" },
+                                ],
+                            });
+                            if (p.isCancel(visibility)) {
+                                p.cancel("Setup cancelled.");
+                                process.exit(0);
                             }
-                            catch (createErr) {
-                                createSpinner.fail("Failed to create repo");
-                                console.log("");
-                                const errorMsg = createErr.stderr || createErr.message || String(createErr);
-                                if (errorMsg.includes("already exists") || errorMsg.includes("Name already exists")) {
-                                    console.log(chalk.yellow("That name is already taken on your GitHub"));
+                            const createSpinner = ora("Creating product repo...").start();
+                            try {
+                                const visFlag = visibility === "private" ? "--private" : "--public";
+                                const finalRepoName = repoName.trim().replace(/\s+/g, '-');
+                                try {
+                                    execSync(`gh repo create ${finalRepoName} ${visFlag}`, {
+                                        cwd: projectPath,
+                                        stdio: "pipe",
+                                        encoding: "utf-8",
+                                    });
+                                    // Get the repo URL
+                                    const repoUrl = execSync(`gh repo view ${finalRepoName} --json url -q .url`, {
+                                        cwd: projectPath,
+                                        encoding: "utf-8",
+                                    }).trim();
+                                    createSpinner.succeed(`Product repo created: ${repoUrl}`);
+                                    productRepo = repoUrl;
+                                    repoCreated = true;
+                                }
+                                catch (createErr) {
+                                    createSpinner.fail("Failed to create repo");
                                     console.log("");
-                                    if (attemptCount < maxAttempts) {
-                                        const retry = await p.confirm({
-                                            message: "Try a different name?",
-                                            initialValue: true,
-                                        });
-                                        if (p.isCancel(retry) || !retry) {
-                                            p.log.info("Skipping repo creation. Register it later with:");
+                                    const errorMsg = createErr.stderr || createErr.message || String(createErr);
+                                    if (errorMsg.includes("already exists") || errorMsg.includes("Name already exists")) {
+                                        console.log(chalk.yellow("That name is already taken on your GitHub"));
+                                        console.log("");
+                                        if (attemptCount < maxAttempts) {
+                                            const retry = await p.confirm({
+                                                message: "Try a different name?",
+                                                initialValue: true,
+                                            });
+                                            if (p.isCancel(retry) || !retry) {
+                                                p.log.info("Skipping repo creation. Register it later with:");
+                                                p.log.info("  jfl services add <repo-url>");
+                                                break;
+                                            }
+                                        }
+                                        else {
+                                            p.log.warning("Max attempts reached. Register repo later:");
                                             p.log.info("  jfl services add <repo-url>");
                                             break;
                                         }
                                     }
+                                    else if (errorMsg.includes("authentication") || errorMsg.includes("not logged in") || errorMsg.includes("HTTP 401")) {
+                                        console.log(chalk.red("GitHub authentication required"));
+                                        console.log("");
+                                        p.log.info("Authenticate with GitHub:");
+                                        p.log.info("  gh auth login");
+                                        break;
+                                    }
                                     else {
-                                        p.log.warning("Max attempts reached. Register repo later:");
-                                        p.log.info("  jfl services add <repo-url>");
+                                        console.log(chalk.red("Error from GitHub CLI:"));
+                                        console.log(chalk.gray(errorMsg));
+                                        console.log("");
+                                        p.log.info(`Try manually: gh repo create ${finalRepoName} ${visFlag}`);
                                         break;
                                     }
                                 }
-                                else if (errorMsg.includes("authentication") || errorMsg.includes("not logged in") || errorMsg.includes("HTTP 401")) {
-                                    console.log(chalk.red("GitHub authentication required"));
-                                    console.log("");
-                                    p.log.info("Authenticate with GitHub:");
-                                    p.log.info("  gh auth login");
-                                    break;
-                                }
-                                else {
-                                    console.log(chalk.red("Error from GitHub CLI:"));
-                                    console.log(chalk.gray(errorMsg));
-                                    console.log("");
-                                    p.log.info(`Try manually: gh repo create ${finalRepoName} ${visFlag}`);
-                                    break;
-                                }
+                            }
+                            catch (err) {
+                                break;
                             }
                         }
-                        catch (err) {
-                            break;
-                        }
+                    }
+                    catch {
+                        p.log.warning("GitHub CLI (gh) not found. Install it to create repos:");
+                        p.log.info("brew install gh && gh auth login");
                     }
                 }
-                catch {
-                    p.log.warning("GitHub CLI (gh) not found. Install it to create repos:");
-                    p.log.info("brew install gh && gh auth login");
+                else {
+                    p.log.info("Register your product repo later:");
+                    p.log.info("  jfl services add <repo-url>");
                 }
             }
-            else {
-                p.log.info("Register your product repo later:");
-                p.log.info("  jfl services add <repo-url>");
-            }
-        }
+        } // end if (!isPortfolio)
         // Update .jfl/config.json
         const configDir = join(projectPath, ".jfl");
         if (!existsSync(configDir)) {
@@ -348,7 +429,7 @@ export async function initCommand(options) {
         const configPath = join(configDir, "config.json");
         const config = {
             name: projectName,
-            type: "gtm",
+            type: isPortfolio ? "portfolio" : "gtm",
             description: description,
         };
         // Save owner info if authenticated
@@ -368,6 +449,10 @@ export async function initCommand(options) {
             config.product_repo = productRepo;
             config.registered_services = [{ name: "product", repo: productRepo }];
         }
+        // Merge portfolio child GTMs collected earlier
+        if (isPortfolio && portfolioChildGtms.length > 0) {
+            config.registered_services = portfolioChildGtms;
+        }
         writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n");
         // Assign deterministic port and write to config + .mcp.json
         const hubPort = persistProjectPort(projectPath);
@@ -386,7 +471,7 @@ export async function initCommand(options) {
         const profile = getProfile();
         if (profile) {
             // Generate CLAUDE.md from profile
-            const projectDescription = `GTM workspace for ${projectName}`;
+            const projectDescription = isPortfolio ? `Portfolio workspace for ${projectName}` : `GTM workspace for ${projectName}`;
             const claudeContent = generateClaudeMdFromProfile(profile, {
                 name: projectName,
                 description: projectDescription
@@ -714,6 +799,48 @@ export async function initCommand(options) {
         else {
             p.log.info("Skip service onboarding. Add services later with: jfl onboard <path|url>");
         }
+        // Configure HTTP hooks for telemetry
+        try {
+            const { getProjectPort } = await import("../utils/context-hub-port.js");
+            const port = getProjectPort(projectPath);
+            if (port) {
+                const hookUrl = `http://localhost:${port}/api/hooks`;
+                const settingsPath = join(projectPath, ".claude", "settings.json");
+                if (existsSync(settingsPath)) {
+                    const settings = JSON.parse(readFileSync(settingsPath, "utf-8"));
+                    if (!settings.hooks)
+                        settings.hooks = {};
+                    const hookEvents = ["PostToolUse", "Stop", "PreCompact", "SubagentStart", "SubagentStop"];
+                    let added = 0;
+                    let fixed = 0;
+                    for (const event of hookEvents) {
+                        if (!settings.hooks[event])
+                            settings.hooks[event] = [];
+                        const existingIdx = settings.hooks[event].findIndex((e) => e.hooks?.some((h) => h.type === "http" && h.url?.includes("/api/hooks")));
+                        if (existingIdx >= 0) {
+                            const entry = settings.hooks[event][existingIdx];
+                            const httpHook = entry.hooks.find((h) => h.type === "http" && h.url?.includes("/api/hooks"));
+                            if (httpHook && httpHook.url !== hookUrl) {
+                                httpHook.url = hookUrl;
+                                fixed++;
+                            }
+                        }
+                        else {
+                            settings.hooks[event].push({ matcher: "", hooks: [{ type: "http", url: hookUrl }] });
+                            added++;
+                        }
+                    }
+                    if (added > 0 || fixed > 0) {
+                        writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + "\n");
+                        if (added > 0)
+                            p.log.success(`HTTP hooks added for ${added} events → ${hookUrl}`);
+                        if (fixed > 0)
+                            p.log.success(`HTTP hooks updated for ${fixed} events → ${hookUrl}`);
+                    }
+                }
+            }
+        }
+        catch { }
         // Success message
         let successMessage = `${projectName}/\n` +
             "├── .claude/skills/ ← JFL skills\n" +