@glash/cli 0.2.45 → 0.2.47

package/bin/glash.mjs

@@ -88,7 +88,7 @@ ${color.bold('DATABASE')}
   database upload             Restore the latest/local dump into linked glashDB database
 
 ${color.bold('PULL')}
-  pull [<slug>] [--out dir] [--no-env]  Pull source + .env from a glashDB project
+  pull [<slug>] [--out dir] [--no-env]  Unpack a project (asks which, if no slug)
 
 ${color.bold('SYSTEM')}
   update                      Update @glash/cli to the latest version

package/commands/pull.mjs

@@ -1,9 +1,9 @@
 // glash pull
 //
-// Default mode: pulls the linked glashDB project's source + .env to the
-// current directory.
+// Unpacks a glashDB project's active deployed image to the current directory,
+// plus its .env. Works however long ago the project was deployed.
 //
-//   glash pull                    → uses the linked project (.glash/project.json)
+//   glash pull                    → pick a project from your glashDB account
 //   glash pull <slug>             → pulls a specific project by slug
 //   glash pull --out ../somewhere → write to a different directory
 //   glash pull --no-env           → skip writing .env
@@ -16,7 +16,8 @@ import { createWriteStream } from 'node:fs';
 import { Readable } from 'node:stream';
 import { argv, cwd, exit, stdout, stderr } from 'node:process';
 import { API_URL, getToken, readProjectLink } from '../lib/config.mjs';
-import { color, info, fail } from '../lib/ui.mjs';
+import { apiGet } from '../lib/api.mjs';
+import { color, info, fail, prompt } from '../lib/ui.mjs';
 
 export async function pull(parsed) {
   const flags = parsed?.flags ?? {};
@@ -25,15 +26,12 @@ export async function pull(parsed) {
   const token = await getToken();
   if (!token) return fail('Not signed in. Run `glash login` first.');
 
-  // Resolve which project to pull
+  // Resolve which project to pull. With no argument, pick from the projects on
+  // this glashDB account rather than guessing.
   let slugOrId = positional[0] ?? flags.project;
   if (!slugOrId) {
-    const link = await readProjectLink();
-    if (link?.slug) slugOrId = link.slug;
-    else if (link?.projectId) slugOrId = link.projectId;
-  }
-  if (!slugOrId) {
-    return fail('No project specified. Pass `glash pull <slug>` or run `glash link <slug>` first.');
+    slugOrId = await chooseProject();
+    if (!slugOrId) return;
   }
 
   const outDir = resolve(flags.out ? String(flags.out) : cwd());
@@ -52,6 +50,51 @@ export async function pull(parsed) {
   stdout.write(color.dim(`\n  next:  cd ${outDir} && glash deploy\n`));
 }
 
+// Lists this account's projects and asks which one to pull. The project linked
+// to the current directory, if any, is the default on Enter.
+async function chooseProject() {
+  let projects;
+  try {
+    projects = await apiGet('/projects');
+  } catch (e) {
+    fail(`Could not list your projects: ${e.message}`);
+    return null;
+  }
+  if (!projects?.length) {
+    fail('This account has no projects yet. Run `glash projects:new` first.');
+    return null;
+  }
+
+  const link = await readProjectLink().catch(() => null);
+  const linkedIndex = projects.findIndex(
+    (p) => (link?.projectId && p.id === link.projectId) || (link?.slug && p.slug === link.slug),
+  );
+
+  stdout.write('\n  Your projects:\n\n');
+  projects.forEach((p, i) => {
+    const marker = i === linkedIndex ? color.dim('  (linked here)') : '';
+    stdout.write(`  ${String(i + 1).padStart(2)}. ${p.slug}${p.name && p.name !== p.slug ? color.dim(` - ${p.name}`) : ''}${marker}\n`);
+  });
+
+  const fallback = linkedIndex >= 0 ? projects[linkedIndex] : null;
+  const suffix = fallback ? ` [${fallback.slug}]` : '';
+  const answer = (await prompt(`\n  Which project do you want to pull?${suffix} `)).trim();
+
+  if (!answer) {
+    if (fallback) return fallback.slug;
+    fail('No project selected.');
+    return null;
+  }
+  const byNumber = Number(answer);
+  if (Number.isInteger(byNumber) && byNumber >= 1 && byNumber <= projects.length) {
+    return projects[byNumber - 1].slug;
+  }
+  const byName = projects.find((p) => p.slug === answer || p.id === answer);
+  if (byName) return byName.slug;
+  fail(`No project named "${answer}" on this account.`);
+  return null;
+}
+
 async function downloadAndExtract(token, slugOrId, outDir) {
   const url = `${API_URL}/projects/${encodeURIComponent(slugOrId)}/source.tar.gz`;
   const res = await fetch(url, { headers: { Authorization: `Bearer ${token}` } });
@@ -61,12 +104,20 @@ async function downloadAndExtract(token, slugOrId, outDir) {
   }
   if (!res.body) throw new Error('empty response from server');
 
+  // The server says which of the two sources it could serve.
+  if (res.headers.get('x-glash-pull-mode') === 'build-directory') {
+    stderr.write(color.dim(
+      '  ! this host runs an older glash agent, so the live image could not be unpacked\n' +
+      '    you are getting the build directory instead, which may hold only a Dockerfile and env files\n',
+    ));
+  }
+
   // Stream-pipe into `tar -xz -C outDir` via stdin
   const child = spawnSync('tar', ['-xz', '-C', outDir], { input: Buffer.from(await res.arrayBuffer()) });
   if (child.status !== 0) {
     throw new Error(`tar extract failed: ${child.stderr?.toString() || 'unknown'}`);
   }
-  info(color.dim(`  ✓ source written to ${outDir}`));
+  info(color.dim(`  ✓ project files unpacked to ${outDir}`));
 }
 
 async function downloadEnv(token, slugOrId, outDir, force) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glash/cli",
-  "version": "0.2.45",
+  "version": "0.2.47",
   "description": "glashDB command-line interface - deploy projects, pull source + env, manage env vars.",
   "license": "Apache-2.0",
   "homepage": "https://glashdb.com",