@yadurajfleetos/cli 0.17.1 → 0.17.2

package/dist/args.js

@@ -43,7 +43,7 @@ export function parseArgs(argv) {
 export const KNOWN_FLAGS = new Set([
     // global
     'fleet', 'api', 'json', 'yes', 'y', 'help', 'h', 'version', 'v', 'no-wait',
-    'plan', 'dry-run', 'force',
+    'plan', 'dry-run', 'force', 'dir', 'file', 'manifest',
     // per command
     'ai', 'all', 'apply', 'channel', 'deploy', 'email', 'events', 'f', 'follow', 'limit',
     'name', 'node', 'only', 'out', 'password', 'secret', 'service', 'sha',

package/dist/commands/services.js

@@ -1,5 +1,5 @@
 import { readFile, writeFile, access } from 'node:fs/promises';
-import { join } from 'node:path';
+import { join, dirname } from 'node:path';
 import { request, requireFleet, CliError, EXIT } from '../api.js';
 import { c, table, statusColour, keyValues, relativeTime, mb } from '../render.js';
 import { task, glyph } from '../ui.js';
@@ -213,10 +213,15 @@ async function waitUntilRunning(fleetId, name, timeoutMs = 180_000) {
  * repository is legitimate for a prebuilt `image:` service, and should not
  * become an error about a file the operator never needed.
  */
-async function buildContextFor(serviceName) {
+async function buildContextFor(serviceName, manifestPath, baseDir) {
     try {
-        const source = await readFile('fleet.yaml', 'utf8');
-        return planFromManifest(source).find((s) => s.name === serviceName)?.build;
+        const file = manifestPath ?? (baseDir ? join(baseDir, 'fleet.yaml') : 'fleet.yaml');
+        const source = await readFile(file, 'utf8');
+        const buildRel = planFromManifest(source).find((s) => s.name === serviceName)?.build;
+        if (!buildRel)
+            return undefined;
+        const dir = baseDir ?? (manifestPath ? dirname(manifestPath) : process.cwd());
+        return join(dir, buildRel);
     }
     catch {
         return undefined;
@@ -227,7 +232,7 @@ export const deployCommand = {
         const fleetId = await requireFleet(typeof flags.fleet === 'string' ? flags.fleet : undefined);
         const [name] = args;
         if (!name)
-            throw new CliError('usage: fleet deploy <service> [--sha <git-sha>] [--no-wait]', EXIT.usage);
+            throw new CliError('usage: fleet deploy <service> [--sha <git-sha>] [--no-wait] [--dir <path>]', EXIT.usage);
         const service = await findService(fleetId, name);
         const gitSha = typeof flags.sha === 'string' ? flags.sha : undefined;
         const plan = await task('checking deployment plan', async () => deployPlan(fleetId, service));
@@ -252,12 +257,16 @@ export const deployCommand = {
         }
         // A service that builds from source needs its directory sent, or the
         // control plane has nothing to build and says the context does not exist.
-        // Read from the manifest here rather than from the service row, because
-        // the build path is relative to the file the operator is standing in.
         let contextId;
-        const buildContext = await buildContextFor(service.name);
-        if (buildContext) {
-            const uploaded = await task(`packaging ${c.bold(service.name)}`, async () => uploadContext(service.id, join(process.cwd(), buildContext)), { done: (r) => `uploaded ${humanBytes(r.bytes)} of build context` });
+        const baseDir = typeof flags.dir === 'string' ? flags.dir : undefined;
+        const manifestFile = typeof flags.file === 'string'
+            ? flags.file
+            : typeof flags.manifest === 'string'
+                ? flags.manifest
+                : undefined;
+        const buildPath = await buildContextFor(service.name, manifestFile, baseDir);
+        if (buildPath) {
+            const uploaded = await task(`packaging ${c.bold(service.name)}`, async () => uploadContext(service.id, buildPath), { done: (r) => `uploaded ${humanBytes(r.bytes)} of build context` });
             contextId = uploaded.contextId;
         }
         const body = await withLadder(DEPLOY_STEPS, async (ladder) => {

package/dist/commands/up.js

@@ -8,7 +8,7 @@
  * the operator from the loop between them.
  */
 import { readFile, writeFile, access } from 'node:fs/promises';
-import { join } from 'node:path';
+import { join, dirname } from 'node:path';
 import { request, requireFleet, CliError, EXIT } from '../api.js';
 import { c } from '../render.js';
 import { task, glyph } from '../ui.js';
@@ -20,7 +20,12 @@ const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 export const upCommand = {
     async run(args, flags) {
         const fleetId = await requireFleet(typeof flags.fleet === 'string' ? flags.fleet : undefined);
-        const manifestPath = 'fleet.yaml';
+        const rootDir = typeof flags.dir === 'string' ? flags.dir : process.cwd();
+        const manifestPath = typeof flags.file === 'string'
+            ? flags.file
+            : typeof flags.manifest === 'string'
+                ? flags.manifest
+                : join(rootDir, 'fleet.yaml');
         // ── Step 1: scaffold if needed ────────────────────────────────────
         let needsApply = false;
         try {
@@ -29,14 +34,14 @@ export const upCommand = {
         catch {
             // No fleet.yaml — run the smart init inline.
             const { detect, manifestTemplate } = await import('../detect.js');
-            const d = await task('detecting project framework', async () => detect());
+            const d = await task('detecting project framework', async () => detect(rootDir));
             const name = (typeof flags.name === 'string' ? flags.name : '') ||
                 args[0] ||
-                process.cwd().split('/').pop()?.toLowerCase().replace(/[^a-z0-9-]+/g, '-') ||
+                rootDir.split('/').pop()?.toLowerCase().replace(/[^a-z0-9-]+/g, '-') ||
                 'app';
             // Write Dockerfile if generated
             if (d.dockerfile) {
-                await writeFile(join(process.cwd(), 'Dockerfile'), d.dockerfile);
+                await writeFile(join(rootDir, 'Dockerfile'), d.dockerfile);
                 console.log(`${glyph.ok} ${c.green('created')} Dockerfile  ${c.dim(`(${d.label}, port ${d.port})`)}`);
             }
             // Write manifest
@@ -47,7 +52,7 @@ export const upCommand = {
         // ── Step 2: read and apply the manifest ───────────────────────────
         const manifest = await readFile(manifestPath, 'utf8');
         const applyResult = await task(`applying ${manifestPath}`, async () => (await request('POST', `/fleets/${fleetId}/services`, {
-            body: { manifest, project: projectNameFor(process.cwd()) },
+            body: { manifest, project: projectNameFor(rootDir) },
         })).body, {
             done: (b) => b.created.length || b.updated.length
                 ? `applied ${b.created.length + b.updated.length} service(s) to project ${b.project}`
@@ -76,13 +81,6 @@ export const upCommand = {
             return service;
         });
         // A database that is already serving is left alone.
-        //
-        // Redeploying one replaces a running container for no reason, and every
-        // service that talks to it loses its connections while it restarts. It is
-        // in the plan so that a database which is *not* running comes back — which
-        // is the case that used to need `fleet up db` by name — not so that every
-        // deploy of the stack restarts the database underneath it. Naming it
-        // explicitly still redeploys it.
         const skipped = args[0]
             ? []
             : resolved.filter((s) => isDatabase.has(s.name) && s.current?.status === 'running');
@@ -101,6 +99,7 @@ export const upCommand = {
                 gitSha,
                 buildContext: buildContexts.get(service.name),
                 wait: !flags['no-wait'],
+                rootDir: typeof flags.file === 'string' ? dirname(flags.file) : rootDir,
             });
             deployed.push({ service, url });
         }
@@ -123,18 +122,11 @@ export const upCommand = {
 /**
  * Deploy one service: upload its build context if it has one, run the deploy,
  * and wait for it to report running.
- *
- * Returns the URL the control plane handed back, or null for a service that
- * has none — an internal one, which is reached by name from its neighbours
- * rather than from outside.
  */
 async function deployOne(service, opts) {
-    // A service that builds from source sends its directory first. The control
-    // plane then builds it for every architecture the fleet has, which is the
-    // part that is easy to get wrong by hand and silent when you do.
     let contextId;
     if (opts.buildContext) {
-        const dir = join(process.cwd(), opts.buildContext);
+        const dir = join(opts.rootDir, opts.buildContext);
         const uploaded = await task(`packaging ${c.bold(service.name)}`, async () => uploadContext(service.id, dir), { done: (r) => `uploaded ${humanBytes(r.bytes)} of build context` });
         contextId = uploaded.contextId;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yadurajfleetos/cli",
-  "version": "0.17.1",
+  "version": "0.17.2",
   "description": "Fleet OS command-line interface for deploying and orchestrating services on user-owned hardware",
   "type": "module",
   "license": "MIT",