bod-cli 0.5.1 → 0.5.2

package/dist/cli.js

@@ -19284,7 +19284,7 @@ var env_default = defineCommand2({
 });
 
 // src/commands/init/init.ts
-import { existsSync as existsSync3, mkdirSync as mkdirSync3, writeFileSync as writeFileSync3, readdirSync } from "fs";
+import { existsSync as existsSync3, mkdirSync as mkdirSync3, writeFileSync as writeFileSync3, readdirSync, readFileSync as readFileSync4 } from "fs";
 import { basename, join as join3 } from "path";
 
 // src/commands/init/templates.ts
@@ -19642,12 +19642,35 @@ var init_default = defineCommand2({
         const proc = Bun.spawnSync(["git", "remote", "get-url", "origin"], { cwd });
         repo = proc.stdout.toString().trim();
       } catch {}
-      if (existsSync3(join3(cwd, "bodify.yaml"))) {
-        console.log(source_default.dim("bodify.yaml already exists, skipping"));
-      } else {
+      const yamlPath = join3(cwd, "bodify.yaml");
+      let yamlData = {};
+      let yamlExisted = false;
+      if (existsSync3(yamlPath)) {
+        yamlExisted = true;
+        yamlData = $parse(readFileSync4(yamlPath, "utf8")) ?? {};
+      }
+      let yamlDirty = false;
+      if (!yamlData.name) {
+        yamlData.name = appName;
+        yamlDirty = true;
+      }
+      if (!yamlExisted) {
         const useDb = detected === "caab" && await esm_default5({ message: "Enable database?", default: false });
-        writeFileSync3(join3(cwd, "bodify.yaml"), generateBodifyYaml(appName, { database: useDb, repo }));
-        console.log(source_default.green("✓ Created bodify.yaml"));
+        if (useDb) {
+          yamlData.database = true;
+          yamlDirty = true;
+        }
+        if (repo) {
+          yamlData.repo = repo;
+          yamlDirty = true;
+        }
+        yamlDirty = true;
+      }
+      if (yamlDirty) {
+        writeFileSync3(yamlPath, $stringify(yamlData));
+        console.log(source_default.green(yamlExisted ? "✓ Updated bodify.yaml" : "✓ Created bodify.yaml"));
+      } else {
+        console.log(source_default.dim("bodify.yaml already up to date"));
       }
       console.log(source_default.dim("Registering app with Bodify..."));
       try {
@@ -19659,6 +19682,17 @@ var init_default = defineCommand2({
         console.log(source_default.green(`✓ App registered (id: ${app.id})`));
         if (app.domain)
           console.log(source_default.dim(`  Domain: ${app.domain}`));
+        let changed = false;
+        if (app.id && !yamlData.appId) {
+          yamlData.appId = app.id;
+          changed = true;
+        }
+        if (app.domain && !yamlData.domain) {
+          yamlData.domain = app.domain;
+          changed = true;
+        }
+        if (changed)
+          writeFileSync3(yamlPath, $stringify(yamlData));
       } catch (e2) {
         console.warn(source_default.yellow(`Warning: Could not register: ${e2.message}`));
       }
@@ -19786,7 +19820,11 @@ var open_default = defineCommand2({
 import { join as join4 } from "path";
 import { existsSync as existsSync4 } from "fs";
 function resolveBodifyServe() {
-  const sibling = join4(import.meta.dir, "../../../bodify/src/serve.ts");
+  const candidates = [
+    join4(import.meta.dir, "../../../bodify/src/serve.ts"),
+    join4(import.meta.dir, "../../bodify/src/serve.ts")
+  ];
+  const sibling = candidates.find(existsSync4) ?? candidates[0];
   if (existsSync4(sibling))
     return sibling;
   const envDir = process.env.BODIFY_DIR;
@@ -19865,7 +19903,7 @@ var ssh_default = defineCommand2({
 });
 
 // src/commands/publish.ts
-import { readFileSync as readFileSync4 } from "fs";
+import { readFileSync as readFileSync5 } from "fs";
 var publish_default = defineCommand2({
   meta: { name: "publish", description: "Publish a package to Bodify registry" },
   args: {
@@ -19874,7 +19912,7 @@ var publish_default = defineCommand2({
   async run({ args }) {
     let pkg;
     try {
-      pkg = JSON.parse(readFileSync4("package.json", "utf-8"));
+      pkg = JSON.parse(readFileSync5("package.json", "utf-8"));
     } catch {
       console.error(source_default.red("No package.json found in current directory"));
       process.exit(1);
@@ -19896,7 +19934,7 @@ var publish_default = defineCommand2({
     }
     const tarballPath = pack.stdout.toString().trim().split(`
 `).pop();
-    const tarballData = readFileSync4(tarballPath);
+    const tarballData = readFileSync5(tarballPath);
     const tarballBase64 = tarballData.toString("base64");
     const distTag = args.tag || "latest";
     const safeName = pkg.name.replace("/", "%2f");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bod-cli",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "type": "module",
   "bin": {
     "bod": "./dist/cli.js"

package/src/commands/init/init.ts

@@ -1,11 +1,12 @@
 import { defineCommand } from 'citty'
 import { select, input, confirm } from '@inquirer/prompts'
 import chalk from 'chalk'
-import { existsSync, mkdirSync, writeFileSync, readdirSync } from 'fs'
+import { existsSync, mkdirSync, writeFileSync, readdirSync, readFileSync } from 'fs'
 import { basename, join } from 'path'
 import { loadConfig, getResolvedInstance, configExists } from '../../config'
 import { BodClient } from '../../client'
 import { TEMPLATES, type TemplateId } from './templates'
+import { parse as parseYaml, stringify as stringifyYaml } from 'yaml'
 
 type AppType = 'caab' | 'static' | 'server' | 'mixed' | 'unknown'
 
@@ -232,13 +233,27 @@ export default defineCommand({
         repo = proc.stdout.toString().trim()
       } catch { /* no git remote */ }
 
-      // bodify.yaml
-      if (existsSync(join(cwd, 'bodify.yaml'))) {
-        console.log(chalk.dim('bodify.yaml already exists, skipping'))
-      } else {
+      // bodify.yaml — create or merge missing fields
+      const yamlPath = join(cwd, 'bodify.yaml')
+      let yamlData: Record<string, any> = {}
+      let yamlExisted = false
+      if (existsSync(yamlPath)) {
+        yamlExisted = true
+        yamlData = parseYaml(readFileSync(yamlPath, 'utf8')) ?? {}
+      }
+      let yamlDirty = false
+      if (!yamlData.name) { yamlData.name = appName; yamlDirty = true }
+      if (!yamlExisted) {
         const useDb = detected === 'caab' && await confirm({ message: 'Enable database?', default: false })
-        writeFileSync(join(cwd, 'bodify.yaml'), generateBodifyYaml(appName, { database: useDb, repo }))
-        console.log(chalk.green('✓ Created bodify.yaml'))
+        if (useDb) { yamlData.database = true; yamlDirty = true }
+        if (repo) { yamlData.repo = repo; yamlDirty = true }
+        yamlDirty = true
+      }
+      if (yamlDirty) {
+        writeFileSync(yamlPath, stringifyYaml(yamlData))
+        console.log(chalk.green(yamlExisted ? '✓ Updated bodify.yaml' : '✓ Created bodify.yaml'))
+      } else {
+        console.log(chalk.dim('bodify.yaml already up to date'))
       }
 
       // Register
@@ -251,6 +266,11 @@ export default defineCommand({
         })
         console.log(chalk.green(`✓ App registered (id: ${app.id})`))
         if (app.domain) console.log(chalk.dim(`  Domain: ${app.domain}`))
+        // Persist appId + domain into bodify.yaml
+        let changed = false
+        if (app.id && !yamlData.appId) { yamlData.appId = app.id; changed = true }
+        if (app.domain && !yamlData.domain) { yamlData.domain = app.domain; changed = true }
+        if (changed) writeFileSync(yamlPath, stringifyYaml(yamlData))
       } catch (e) {
         console.warn(chalk.yellow(`Warning: Could not register: ${(e as Error).message}`))
       }

package/src/commands/serve.ts

@@ -4,7 +4,12 @@ import { existsSync } from 'fs'
 
 function resolveBodifyServe(): string {
   // Sibling directory convention: bod-cli and bodify live side by side
-  const sibling = join(import.meta.dir, '../../../bodify/src/serve.ts')
+  // Try both source (src/commands/) and dist (dist/) layouts
+  const candidates = [
+    join(import.meta.dir, '../../../bodify/src/serve.ts'),  // from src/commands/
+    join(import.meta.dir, '../../bodify/src/serve.ts'),     // from dist/
+  ]
+  const sibling = candidates.find(existsSync) ?? candidates[0]
   if (existsSync(sibling)) return sibling
   // Fallback: try global BODIFY_DIR env
   const envDir = process.env.BODIFY_DIR