bod-cli 0.3.1 → 0.3.2

package/dist/cli.js

@@ -11694,8 +11694,8 @@ function getDefaultInstance(config) {
   return { name, instance: config.instances[name] };
 }
 var instanceOverride2;
-function getResolvedInstance(config) {
-  const override = instanceOverride2 ?? process.env.BOD_INSTANCE;
+function getResolvedInstance(config, yamlInstance) {
+  const override = instanceOverride2 ?? process.env.BOD_INSTANCE ?? yamlInstance;
   if (override) {
     const inst = config.instances[override];
     if (!inst)
@@ -11858,6 +11858,23 @@ function readAppNameFromYaml() {
     return;
   }
 }
+function readInstanceFromYaml() {
+  try {
+    const yaml = readFileSync3("bodify.yaml", "utf-8");
+    return yaml.match(/instance:\s*(.+)/)?.[1]?.trim();
+  } catch {
+    return;
+  }
+}
+function readDeployModeFromYaml() {
+  try {
+    const yaml = readFileSync3("bodify.yaml", "utf-8");
+    const mode = yaml.match(/deploy:\s*(.+)/)?.[1]?.trim();
+    return mode === "upload" ? "upload" : mode === "git" ? "git" : undefined;
+  } catch {
+    return;
+  }
+}
 function resolveAppName(arg) {
   if (arg)
     return arg;
@@ -11986,17 +12003,21 @@ var deploy_default = defineCommand2({
   meta: { name: "deploy", description: "Trigger a deployment" },
   args: {
     app: { type: "positional", description: "App name (or reads from bodify.yaml)", required: false },
-    branch: { type: "string", description: "Branch to deploy (default: current git branch)" }
+    branch: { type: "string", description: "Branch to deploy (default: current git branch)" },
+    upload: { type: "boolean", description: "Upload local source instead of git clone", default: false }
   },
   async run({ args }) {
-    const { url, apiKey } = getResolvedInstance(loadConfig());
+    const { url, apiKey, name: instanceName } = getResolvedInstance(loadConfig(), readInstanceFromYaml());
+    if (readInstanceFromYaml())
+      console.log(source_default.dim(`Using instance "${instanceName}" from bodify.yaml`));
     const client = new BodClient(url, apiKey);
     const appName = resolveAppName(args.app);
     const appId = await resolveAppId(client, appName);
     const branch = await detectBranch(args.branch);
     const detail = await client.get(`/apps/${appId}`);
+    const forceUpload = args.upload || readDeployModeFromYaml() === "upload";
     let hasRepo = !!detail.repo;
-    if (!hasRepo) {
+    if (!hasRepo && !forceUpload) {
       const proc = Bun.spawnSync(["git", "remote", "get-url", "origin"]);
       const repo = proc.exitCode === 0 ? proc.stdout.toString().trim() : "";
       if (repo) {
@@ -12005,12 +12026,13 @@ var deploy_default = defineCommand2({
         hasRepo = true;
       }
     }
-    console.log(source_default.dim(`Deploying ${appName} (branch: ${branch})${hasRepo ? "" : " via upload"}...`));
+    const useUpload = forceUpload || !hasRepo;
+    console.log(source_default.dim(`Deploying ${appName} (branch: ${branch})${useUpload ? " via upload" : ""}...`));
     const since = Date.now();
-    if (hasRepo) {
-      await gitDeploy(client, appId, branch);
-    } else {
+    if (useUpload) {
       await uploadDeploy(client, appId, branch);
+    } else {
+      await gitDeploy(client, appId, branch);
     }
     console.log(source_default.green(`✓ Deployment queued`));
     await pollDeploy(client, appId, since);
@@ -12025,7 +12047,7 @@ var rollback_default = defineCommand2({
     branch: { type: "string", description: "Branch to rollback (default: production branch)" }
   },
   async run({ args }) {
-    const { url, apiKey } = getResolvedInstance(loadConfig());
+    const { url, apiKey } = getResolvedInstance(loadConfig(), readInstanceFromYaml());
     const client = new BodClient(url, apiKey);
     const appName = resolveAppName(args.app);
     const appId = await resolveAppId(client, appName);

package/package.json

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

package/src/commands/deploy.ts

@@ -2,7 +2,7 @@ import { defineCommand } from 'citty'
 import chalk from 'chalk'
 import { loadConfig, getResolvedInstance } from '../config'
 import { BodClient } from '../client'
-import { resolveAppId, resolveAppName } from '../utils/resolve'
+import { resolveAppId, resolveAppName, readInstanceFromYaml, readDeployModeFromYaml } from '../utils/resolve'
 
 async function detectBranch(explicit?: string): Promise<string> {
   if (explicit) return explicit
@@ -66,9 +66,11 @@ export default defineCommand({
   args: {
     app: { type: 'positional', description: 'App name (or reads from bodify.yaml)', required: false },
     branch: { type: 'string', description: 'Branch to deploy (default: current git branch)' },
+    upload: { type: 'boolean', description: 'Upload local source instead of git clone', default: false },
   },
   async run({ args }) {
-    const { url, apiKey } = getResolvedInstance(loadConfig())
+    const { url, apiKey, name: instanceName } = getResolvedInstance(loadConfig(), readInstanceFromYaml())
+    if (readInstanceFromYaml()) console.log(chalk.dim(`Using instance "${instanceName}" from bodify.yaml`))
     const client = new BodClient(url, apiKey)
 
     const appName = resolveAppName(args.app)
@@ -77,8 +79,10 @@ export default defineCommand({
     const branch = await detectBranch(args.branch)
     const detail = await client.get<any>(`/apps/${appId}`)
 
+    const forceUpload = args.upload || readDeployModeFromYaml() === 'upload'
+
     let hasRepo = !!detail.repo
-    if (!hasRepo) {
+    if (!hasRepo && !forceUpload) {
       const proc = Bun.spawnSync(['git', 'remote', 'get-url', 'origin'])
       const repo = proc.exitCode === 0 ? proc.stdout.toString().trim() : ''
       if (repo) {
@@ -88,13 +92,14 @@ export default defineCommand({
       }
     }
 
-    console.log(chalk.dim(`Deploying ${appName} (branch: ${branch})${hasRepo ? '' : ' via upload'}...`))
+    const useUpload = forceUpload || !hasRepo
+    console.log(chalk.dim(`Deploying ${appName} (branch: ${branch})${useUpload ? ' via upload' : ''}...`))
 
     const since = Date.now()
-    if (hasRepo) {
-      await gitDeploy(client, appId, branch)
-    } else {
+    if (useUpload) {
       await uploadDeploy(client, appId, branch)
+    } else {
+      await gitDeploy(client, appId, branch)
     }
 
     console.log(chalk.green(`✓ Deployment queued`))

package/src/commands/rollback.ts

@@ -2,7 +2,7 @@ import { defineCommand } from 'citty'
 import chalk from 'chalk'
 import { loadConfig, getResolvedInstance } from '../config'
 import { BodClient } from '../client'
-import { resolveAppId, resolveAppName } from '../utils/resolve'
+import { resolveAppId, resolveAppName, readInstanceFromYaml } from '../utils/resolve'
 
 export default defineCommand({
   meta: { name: 'rollback', description: 'Rollback to previous deployment' },
@@ -11,7 +11,7 @@ export default defineCommand({
     branch: { type: 'string', description: 'Branch to rollback (default: production branch)' },
   },
   async run({ args }) {
-    const { url, apiKey } = getResolvedInstance(loadConfig())
+    const { url, apiKey } = getResolvedInstance(loadConfig(), readInstanceFromYaml())
     const client = new BodClient(url, apiKey)
 
     const appName = resolveAppName(args.app)

package/src/config.ts

@@ -70,8 +70,8 @@ export function setInstanceOverride(name: string | undefined) {
   instanceOverride = name
 }
 
-export function getResolvedInstance(config: Config): { name: string; url: string; apiKey: string; instance: Instance } {
-  const override = instanceOverride ?? process.env.BOD_INSTANCE
+export function getResolvedInstance(config: Config, yamlInstance?: string): { name: string; url: string; apiKey: string; instance: Instance } {
+  const override = instanceOverride ?? process.env.BOD_INSTANCE ?? yamlInstance
   if (override) {
     const inst = config.instances[override]
     if (!inst) throw new Error(`Instance "${override}" not found in config. Available: ${Object.keys(config.instances).join(', ')}`)

package/src/utils/resolve.ts

@@ -19,6 +19,21 @@ export function readAppNameFromYaml(): string | undefined {
   } catch { return undefined }
 }
 
+export function readInstanceFromYaml(): string | undefined {
+  try {
+    const yaml = readFileSync('bodify.yaml', 'utf-8')
+    return yaml.match(/instance:\s*(.+)/)?.[1]?.trim()
+  } catch { return undefined }
+}
+
+export function readDeployModeFromYaml(): 'upload' | 'git' | undefined {
+  try {
+    const yaml = readFileSync('bodify.yaml', 'utf-8')
+    const mode = yaml.match(/deploy:\s*(.+)/)?.[1]?.trim()
+    return mode === 'upload' ? 'upload' : mode === 'git' ? 'git' : undefined
+  } catch { return undefined }
+}
+
 /** Resolve app name from explicit arg or bodify.yaml fallback. Logs clearly when falling back. */
 export function resolveAppName(arg: string | undefined): string {
   if (arg) return arg