@m6d/cortex-cli 0.13.0 → 0.15.0

package/src/commands/new.ts

@@ -6,7 +6,8 @@ import type { Command } from "@commander-js/extra-typings";
 import { CORTEX_MANIFEST_ID } from "@cortex/contracts/manifest";
 
 import pkg from "../../package.json";
-import { manifestIdOf, scaffoldFiles } from "@/scaffold/files";
+import { askProvider } from "@/commands/setup";
+import { AGENT_SLUG, manifestIdOf, scaffoldFiles } from "@/scaffold/files";
 import { allocatePorts, type Ports } from "@/scaffold/ports";
 import { askConfirm, askName, intro, log, outro, runSteps } from "@/ui/prompts";
 import * as report from "@/ui/report";
@@ -24,12 +25,13 @@ export function registerNew(program: Command<[], { verbose?: true }>) {
         .helpGroup("Project:")
         .description("Scaffold a backend, its agent, and Cortex to run it on")
         .argument("[name]", "Directory to create, and the generated package name")
-        // Both halves of the toggle, so the flag can answer its question either
-        // way and `--yes` is not the only way to say "no". Declaring the positive
-        // first leaves the value `undefined` when neither is passed, which is
-        // what marks the question as still unanswered.
         .option("--datasets", "Serve an example table as a dataset host")
-        .option("--no-datasets", "Leave the dataset host out")
+        // Both halves of the toggle, so the flag can answer its question either
+        // way and `--yes` is not the only way to say "yes". Declaring the
+        // positive first leaves the value `undefined` when neither is passed,
+        // which is what marks the question as still unanswered.
+        .option("--setup", `Set up the ${AGENT_SLUG} agent on the first bun run dev`)
+        .option("--no-setup", "Leave Cortex empty; you register the backend yourself")
         .option("--yes", "Accept the defaults instead of asking");
 
     command.action(async function (name, options) {
@@ -39,7 +41,7 @@ export function registerNew(program: Command<[], { verbose?: true }>) {
     });
 }
 
-type Options = { datasets?: boolean; yes?: boolean; verbose: boolean };
+type Options = { datasets?: true; setup?: boolean; yes?: true; verbose: boolean };
 
 async function scaffold(name: string | undefined, options: Options) {
     const { verbose } = options;
@@ -61,17 +63,15 @@ async function scaffold(name: string | undefined, options: Options) {
 
     const project = name ?? (await askName(checkName)).trim();
 
-    // A flag settles the question; otherwise it is asked, or under `--yes` left out.
-    const datasets =
-        options.datasets ??
-        (interactive && (await askConfirm("Serve an example table as a dataset host?")));
+    const datasets = options.datasets === true;
+    const { setup, provider } = await askSetup(options.setup, interactive);
 
     const target = resolve(process.cwd(), project);
 
     // Drawn here rather than inside the generators, which stay pure: picking a
     // port means probing the machine for a free one.
     const ports = allocatePorts();
-    const files = scaffoldFiles({ name: project, datasets, ports });
+    const files = scaffoldFiles({ name: project, datasets, setup, ports, env: provider?.env });
     let failedInstall: string | undefined;
 
     await runSteps([
@@ -81,7 +81,8 @@ async function scaffold(name: string | undefined, options: Options) {
                 for (const [path, contents] of Object.entries(files)) {
                     const file = join(target, path);
                     mkdirSync(dirname(file), { recursive: true });
-                    writeFileSync(file, contents);
+                    // .env holds the provider's key before setup.ts adds the rest.
+                    writeFileSync(file, contents, { mode: path === ".env" ? 0o600 : 0o644 });
                 }
 
                 const summary = [
@@ -89,6 +90,7 @@ async function scaffold(name: string | undefined, options: Options) {
                     ...(datasets ? ["dataset host"] : []),
                     "manifest",
                     "Cortex",
+                    ...(setup ? ["first-run setup"] : []),
                 ];
                 return `Wrote ${Object.keys(files).length} files to ./${project}\n${summary.join(" · ")}`;
             },
@@ -136,7 +138,25 @@ async function scaffold(name: string | undefined, options: Options) {
     if (failedInstall !== undefined) warnInstall(project, failedInstall, verbose);
 
     outro(`Done in ${seconds(started)}`);
-    process.stdout.write(nextSteps(project, ports));
+    process.stdout.write(nextSteps(project, ports, setup, provider !== undefined));
+}
+
+/**
+ * Whether the first `bun run dev` sets up the agent, and the model provider
+ * it runs on. A flag settles the first question; otherwise it is asked, or
+ * under `--yes` answered yes. The provider has no default, so only a terminal
+ * asks for one; without it, setup registers the server and stops.
+ */
+async function askSetup(flag: boolean | undefined, interactive: boolean) {
+    const setup =
+        flag ??
+        (!interactive ||
+            (await askConfirm(
+                `Set up the ${AGENT_SLUG} agent when you first run bun run dev?`,
+                true,
+            )));
+    const provider = setup && interactive ? await askProvider() : undefined;
+    return { setup, provider };
 }
 
 /**
@@ -156,17 +176,20 @@ function warnInstall(project: string, output: string, verbose: boolean) {
     );
 }
 
-function nextSteps(project: string, ports: Ports) {
-    return (
-        `\nNext steps:\n\n` +
-        step(`cd ${project}`) +
-        step("edit cortex.env", "fill in EMBEDDING_API_KEY") +
-        step("docker compose up -d", `→ http://localhost:${ports.cortex}`) +
-        // The port the generated index.ts listens on; only Cortex's ports move.
-        step("bun run dev", "→ http://localhost:3331") +
-        step("README.md", "register the server, then cortex apply") +
-        `\n`
-    );
+/** What the first `bun run dev` sets up: the agent, the server alone (no model yet), or nothing. */
+function nextSteps(project: string, ports: Ports, setup: boolean, provider: boolean) {
+    const runs = {
+        agent: step("bun run dev", `→ sets up ${AGENT_SLUG}, then prints where to chat`),
+        server:
+            step("bun run dev", "→ registers the server") +
+            step("bun cortex setup", "adds a model provider, then applies"),
+        none:
+            step("bun run dev", `→ Cortex at http://localhost:${ports.cortex}`) +
+            step("README.md", "register the server, then bun cortex apply"),
+    };
+    const run = setup ? (provider ? runs.agent : runs.server) : runs.none;
+
+    return `\nNext steps:\n\n${step(`cd ${project}`)}${run}\n`;
 }
 
 async function install(cwd: string) {