@fusionkit/cli 0.1.5 → 0.1.7

package/dist/fusion-init.js

@@ -3,8 +3,9 @@
  * per-repo `fusionkit.json`. On a non-interactive stdin the prompts fall back to
  * their defaults, so `fusion init` still produces a sensible config in CI.
  */
-import { DEFAULT_CLOUD_PANEL, DEFAULT_TRIO, defaultKeyEnv } from "./fusion-quickstart.js";
-import { FUSION_CONFIG_VERSION, FusionConfigError, fusionConfigPath, writeFusionConfig } from "./fusion-config.js";
+import { execFileSync } from "node:child_process";
+import { DEFAULT_CLOUD_PANEL, DEFAULT_TRIO, defaultKeyEnv, fusionkitPyCommand } from "./fusion-quickstart.js";
+import { FUSION_CONFIG_VERSION, FusionConfigError, fusionConfigPath, fusionPromptsDir, PROMPT_IDS, writeFusionConfig, writeFusionPrompts } from "./fusion-config.js";
 import { parsePanelModelSpec } from "./shared/options.js";
 import { confirm, done, note, select, text } from "./ui/prompt.js";
 import { uiStream } from "./ui/runtime.js";
@@ -18,6 +19,35 @@ function withKeyEnv(spec) {
     const keyEnv = defaultKeyEnv(provider);
     return keyEnv !== undefined ? { ...spec, keyEnv } : { ...spec };
 }
+/**
+ * Pull the built-in default prompts from the Python `fusionkit` CLI
+ * (`fusionkit prompts dump`) so the scaffolded `.fusionkit/prompts/*.md` files
+ * match the synthesizer's source of truth. Returns `undefined` if the CLI is
+ * unreachable (e.g. offline) — callers fall back to leaving prompts unset, in
+ * which case the built-in defaults are used at run time.
+ */
+function fetchDefaultPrompts(fusionkitDir) {
+    const runner = fusionkitPyCommand(fusionkitDir);
+    try {
+        const stdout = execFileSync(runner.command, [...runner.prefix, "prompts", "dump"], {
+            encoding: "utf8",
+            stdio: ["ignore", "pipe", "ignore"],
+            timeout: 120_000,
+            ...(runner.cwd !== undefined ? { cwd: runner.cwd } : {})
+        });
+        const parsed = JSON.parse(stdout);
+        const prompts = {};
+        for (const id of PROMPT_IDS) {
+            const value = parsed[id];
+            if (typeof value === "string" && value.length > 0)
+                prompts[id] = value;
+        }
+        return Object.keys(prompts).length > 0 ? prompts : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 async function buildCustomPanel() {
     out.write(dim("Add panel models as ID=PROVIDER:MODEL (e.g. gpt=openai:gpt-5.5). Blank line to finish.\n"));
     const specs = [];
@@ -42,7 +72,7 @@ async function buildCustomPanel() {
 export async function runFusionInit(input) {
     if (input.repoRoot === undefined) {
         out.write(`${red("error:")} not inside a git repository.\n` +
-            "  cd into your project (or run from a repo) so fusionkit.json lands at the repo root.\n");
+            "  cd into your project (or run from a repo) so .fusionkit/ lands at the repo root.\n");
         return 1;
     }
     out.write(`\n${brandHeader("let's set up model fusion for this repo")}\n\n`);
@@ -51,7 +81,7 @@ export async function runFusionInit(input) {
         options: [
             { value: "codex", label: "codex", hint: "OpenAI Codex CLI" },
             { value: "claude", label: "claude", hint: "Claude Code" },
-            { value: "cursor", label: "cursor", hint: "cursor-agent (needs a Cursorkit checkout)" },
+            { value: "cursor", label: "cursor", hint: "cursor-agent (logged-in CLI)" },
             { value: "serve", label: "serve", hint: "just run the gateway and print setup" }
         ],
         defaultIndex: 0
@@ -83,14 +113,6 @@ export async function runFusionInit(input) {
     }
     const judgeDefault = panel[0]?.model ?? "";
     const judgeModel = await text({ message: "Judge model (for synthesis)", defaultValue: judgeDefault });
-    let cursorKitDir;
-    if (tool === "cursor") {
-        const answer = await text({
-            message: "Cursorkit checkout dir (optional, can set FUSIONKIT_CURSORKIT_DIR later)"
-        });
-        if (answer.length > 0)
-            cursorKitDir = answer;
-    }
     const observe = await confirm({ message: "Enable the observability dashboard by default?", defaultValue: false });
     const config = {
         version: FUSION_CONFIG_VERSION,
@@ -98,8 +120,7 @@ export async function runFusionInit(input) {
         panel,
         ...(judgeModel.length > 0 ? { judgeModel } : {}),
         local: preset === "local",
-        observe,
-        ...(cursorKitDir !== undefined ? { cursorKitDir } : {})
+        observe
     };
     let path;
     try {
@@ -112,8 +133,22 @@ export async function runFusionInit(input) {
         }
         throw error;
     }
+    // Scaffold editable prompt overrides from the synthesizer's built-in defaults.
+    // If the Python CLI is unreachable, skip silently — unset prompts use the
+    // built-in defaults at run time, and the user can eject them later with
+    // `fusionkit prompts dump --dir .fusionkit/prompts`.
+    const defaultPrompts = fetchDefaultPrompts(input.fusionkitDir);
+    const wrotePrompts = defaultPrompts !== undefined
+        ? writeFusionPrompts(input.repoRoot, defaultPrompts, { force: input.force === true })
+        : [];
     out.write("\n");
     done(`wrote ${cyan(fusionConfigPath(input.repoRoot))}`);
-    note(`commit it, then just run: ${bold(`fusionkit ${tool === "serve" ? "serve" : tool}`)}`);
+    if (wrotePrompts.length > 0) {
+        note(`editable prompts in ${cyan(fusionPromptsDir(input.repoRoot))} (empty file = built-in default)`);
+    }
+    else if (defaultPrompts === undefined) {
+        note(`prompts use built-in defaults; run ${bold("fusionkit prompts dump --dir .fusionkit/prompts")} to customize`);
+    }
+    note(`commit ${cyan(".fusionkit/")}, then just run: ${bold(`fusionkit ${tool === "serve" ? "serve" : tool}`)}`);
     return 0;
 }

package/dist/fusion-quickstart.d.ts

@@ -10,229 +10,18 @@
  *
  * No mocks: the panel is real models, candidates are real patches verified by
  * really running the repo's tests, and the judge is a real model.
- */
-import type { ChildProcess } from "node:child_process";
-import type { EnsembleModel } from "@fusionkit/ensemble";
-import type { PortlessSession } from "./shared/portless.js";
-export type FusionTool = "codex" | "claude" | "cursor" | "serve";
+ *
+ * This module is the run orchestrator; the supporting pieces live in `./fusion/`
+ * (env + defaults, the observability dashboard, the model stack, and preflight)
+ * and are re-exported here so existing import paths keep working.
+ */
+import type { FusionTool, RunFusionOptions } from "./fusion/env.js";
+export * from "./fusion/env.js";
+export * from "./fusion/observability.js";
+export * from "./fusion/stack.js";
+export * from "./fusion/preflight.js";
+/** Launchable fusion tools (registry-derived) plus the `serve` pseudo-tool. */
 export declare const FUSION_TOOLS: readonly FusionTool[];
-export type PanelProvider = "mlx" | "openai" | "anthropic" | "google" | "openai-compatible";
-/**
- * One panel model. `mlx` models run locally via the in-repo provisioner; cloud
- * providers (openai/anthropic/google/openai-compatible) are fronted as
- * OpenAI-compatible endpoints by FusionKit's `serve-endpoint` command, run via
- * `uvx fusionkit` (no checkout required).
- */
-export type PanelModelSpec = {
-    id: string;
-    model: string;
-    provider?: PanelProvider;
-    baseUrl?: string;
-    keyEnv?: string;
-};
-/**
- * The PyPI version of the `fusionkit` Python distribution that provides the
- * synthesizer (`fusionkit serve`) and the single-model OpenAI shim
- * (`fusionkit serve-endpoint`). Pinned so `uvx` resolves a reproducible build.
- */
-export declare const FUSIONKIT_PYPI_VERSION = "0.2.0";
-/**
- * Default cloud panel — works cross-platform with only `OPENAI_API_KEY` and
- * `ANTHROPIC_API_KEY` set. The judge defaults to the first entry.
- */
-export declare const DEFAULT_CLOUD_PANEL: readonly PanelModelSpec[];
-/** The locally cached MLX trio (Apple Silicon only) used behind `--local`. */
-export declare const DEFAULT_TRIO: readonly PanelModelSpec[];
-/**
- * How to invoke the `fusionkit` Python CLI: from PyPI via `uvx` by default
- * (no checkout), or from a local checkout via `uv run` when `fusionkitDir` is
- * given (a dev override). Returns the command plus the argv prefix that
- * precedes the subcommand (`serve`, `serve-endpoint`, ...).
- */
-export declare function fusionkitPyCommand(fusionkitDir?: string): {
-    command: string;
-    prefix: string[];
-    cwd?: string;
-};
-/**
- * Parse a `.env` file (KEY=VALUE lines, `#` comments, optional `export`,
- * single/double quotes) and fill any keys not already present in `env`.
- * Existing env values win, so an explicitly exported key is never overridden.
- */
-export declare function loadEnvFileInto(path: string, env: Record<string, string | undefined>): void;
-/** Default env var holding the API key for each cloud provider. */
-export declare function defaultKeyEnv(provider: PanelProvider): string | undefined;
-/** The git repository root containing `dir`, or undefined if it is not in a repo. */
-export declare function gitToplevel(dir: string): string | undefined;
-/**
- * Compute the binaries and API keys the run requires given the tool, panel, and
- * options. Pre-running endpoints (`--model-endpoint`) and a pre-running
- * `--synthesis-url` drop the corresponding requirements.
- */
-export declare function preflightRequirements(tool: FusionTool, models: PanelModelSpec[], options: RunFusionOptions): {
-    requiredBins: string[];
-    requiredEnv: string[];
-};
-/** Fixed port for the local observability dashboard (the scope app). */
-export declare const SCOPE_DASHBOARD_PORT = 4317;
-/**
- * Locate the isolated scope dashboard app (handoffkit/apps/scope) by walking up
- * from this module. Works from both the compiled dist and src layouts. Only the
- * monorepo dev fallback uses this — published installs ship a prebuilt bundle.
- */
-export declare function findScopeAppDir(): string;
-/**
- * Path to the prebuilt, self-contained dashboard server staged into the CLI
- * package (`scope/server.js`, a sibling of `dist/`), or undefined when it is
- * absent — i.e. a monorepo dev checkout where the bundle was never staged. Both
- * the compiled `dist/fusion-quickstart.js` and the `src/` layout resolve to the
- * same `<cli-package>/scope/server.js`.
- */
-export declare function bundledScopeServer(): string | undefined;
-export type Observability = {
-    url: string;
-    ingestUrl: string;
-    traceDir: string;
-    close: () => Promise<void>;
-};
-export declare function startObservability(input: {
-    log: (line: string) => void;
-    logFile?: string;
-    report?: StackReporter;
-    portless: PortlessSession;
-}): Promise<Observability>;
-/**
- * The single `fusionkit serve` router: one process that fronts every panel
- * model (passthrough, routed by the endpoint id in the request `model` field)
- * and also performs trajectory synthesis. `endpoints` maps each panel id to the
- * router URL so the harness reaches its model through the one base URL.
- */
-export type Router = {
-    url: string;
-    port: number;
-    /** The router process pid (owns its portless route across runs). */
-    pid?: number;
-    endpoints: Record<string, string>;
-    models: EnsembleModel[];
-    /** The endpoint id used as the judge/synthesizer. */
-    judgeModel: string;
-    /** Sorted endpoint ids — the router's discover-or-spawn identity token. */
-    identity: string;
-    close: () => Promise<void>;
-};
-/**
- * Structured boot progress. When a reporter is supplied the stack emits these
- * events instead of the plain `fusion: ...` log lines, so a live TUI (or any
- * other consumer) can render per-stage status. Without one, callers keep getting
- * the existing line logs.
- */
-export type StackEvent = {
-    kind: "server.start";
-    id: string;
-    label: string;
-} | {
-    kind: "server.ready";
-    id: string;
-    detail: string;
-} | {
-    kind: "server.fail";
-    id: string;
-    detail: string;
-} | {
-    kind: "synth.start";
-} | {
-    kind: "synth.ready";
-    detail: string;
-} | {
-    kind: "gateway.start";
-} | {
-    kind: "gateway.ready";
-    detail: string;
-} | {
-    kind: "dashboard.start";
-} | {
-    kind: "dashboard.ready";
-    detail: string;
-} | {
-    kind: "dashboard.fail";
-    detail: string;
-};
-export type StackReporter = (event: StackEvent) => void;
-/**
- * Spawn the single `fusionkit serve` router fronting every panel model + the
- * synthesizer. MLX specs first get an in-process OpenAI-compatible gateway
- * (loopback) that the router proxies to; cloud specs call their provider
- * directly. Returns the router URL, an id->routerUrl endpoint map, and a close
- * that tears down the router process and any MLX gateways it fronts.
- */
-export declare function startRouter(options: {
-    specs: PanelModelSpec[];
-    judgeModel?: string;
-    fusionkitDir?: string;
-    logsDir?: string;
-    report?: StackReporter;
-    log: (line: string) => void;
-}): Promise<Router>;
-export type FusionStack = {
-    fusionUrl: string;
-    endpoints: Record<string, string>;
-    close: () => Promise<void>;
-};
-export type StartFusionStackOptions = {
-    repo: string;
-    outputRoot: string;
-    models: PanelModelSpec[];
-    endpoints?: Record<string, string>;
-    fusionkitDir?: string;
-    judgeModel?: string;
-    /** Pre-running fusionkit serve URL for trajectory synthesis (skips spawn). */
-    synthesisUrl?: string;
-    host?: string;
-    port?: number;
-    authToken?: string;
-    timeoutMs?: number;
-    logsDir?: string;
-    report?: StackReporter;
-    /** Active portless session; defaults to a disabled (loopback) session. */
-    portless?: PortlessSession;
-    log: (line: string) => void;
-};
-export declare function startFusionStack(options: StartFusionStackOptions): Promise<FusionStack>;
-/**
- * Start the Cursorkit bridge with its local-model backend pointed at the fusion
- * gateway, and resolve once it is listening. Returns the child and its port.
- */
-export declare function startCursorBridge(input: {
-    cursorKitDir: string;
-    fusionUrl: string;
-    logFile?: string;
-    caCertPath?: string;
-    log: (line: string) => void;
-}): Promise<{
-    child: ChildProcess;
-    port: number;
-}>;
-export type RunFusionOptions = {
-    models?: PanelModelSpec[];
-    endpoints?: Record<string, string>;
-    fusionkitDir?: string;
-    repo?: string;
-    judgeModel?: string;
-    synthesisUrl?: string;
-    cursorKitDir?: string;
-    authToken?: string;
-    port?: number;
-    timeoutMs?: number;
-    /** Use the local MLX panel trio (Apple Silicon) instead of the cloud panel. */
-    local?: boolean;
-    /** Boot the local scope dashboard and stream trace events into it. */
-    observe?: boolean;
-    /** Skip the interactive cost/scope confirmation for the cloud panel. */
-    yes?: boolean;
-    /** Route services through portless (stable named URLs + singletons). Default on. */
-    portless?: boolean;
-    log?: (line: string) => void;
-};
 /** Whether portless is enabled: explicit flag/config wins, else on unless PORTLESS=0. */
 export declare function portlessEnabled(options: RunFusionOptions): boolean;
 export declare function runFusion(tool: FusionTool, toolArgs: string[], options?: RunFusionOptions): Promise<number>;