@glash/cli 0.2.2 → 0.2.4

package/README.md

@@ -17,6 +17,8 @@ glash deploy
 | `glash whoami` | Show the signed-in user |
 | `glash projects` | List your projects |
 | `glash projects:new <name>` | Create a project and link it to the current directory |
+| `glash new <name>` | Alias for `projects:new` |
+| `glash new deploy` | Deploy to a brand new project, ignoring any existing link |
 | `glash projects:rm <slug>` | Delete a project |
 | `glash link <slug>` | Link the current directory to an existing project |
 | `glash open` | Open the linked project's primary domain |
@@ -31,7 +33,7 @@ glash deploy
 | `glash env:rm KEY` | Remove an env var |
 | `glash env:pull [--out .env.local]` | Pull env vars to a local file |
 | `glash env:push [<file>]` | Bulk upload from a `.env` file |
-| `glash pull --from vercel --project <id>` | Import a Vercel project (source + env) |
+| `glash update` | Update `@glash/cli` to the latest version |
 
 Pass `--project <slug>` to any command to operate on a project other than
 the one linked in the current directory.

package/bin/glash.mjs

@@ -3,7 +3,7 @@ import { argv, exit } from 'node:process';
 import { parseArgs } from '../lib/args.mjs';
 import { info, fail, color } from '../lib/ui.mjs';
 
-const VERSION = '0.2.2';
+const VERSION = '0.2.4';
 
 const sub = argv[2];
 const rest = argv.slice(3);
@@ -19,6 +19,14 @@ const commands = {
   'projects:rm':   () => import('../commands/projects.mjs').then((m) => m.removeProject(parsed)),
   link:            () => import('../commands/projects.mjs').then((m) => m.linkProject(parsed)),
 
+  new:             () => {
+    if (parsed.positional[0] === 'deploy') {
+      const nextParsed = { ...parsed, flags: { ...parsed.flags, new: true } };
+      return import('../commands/deploy.mjs').then((m) => m.deploy(nextParsed));
+    }
+    return import('../commands/projects.mjs').then((m) => m.createProject(parsed));
+  },
+
   deploy:          () => import('../commands/deploy.mjs').then((m) => m.deploy(parsed)),
   deployments:     () => import('../commands/deployments.mjs').then((m) => m.listDeployments(parsed)),
   status:          () => import('../commands/deployments.mjs').then((m) => m.status(parsed)),
@@ -34,6 +42,7 @@ const commands = {
 
   pull:            () => import('../commands/pull.mjs').then((m) => m.pull(parsed)),
   open:            () => import('../commands/open.mjs').then((m) => m.open(parsed)),
+  update:          () => import('../commands/update.mjs').then((m) => m.update(parsed)),
 };
 
 function usage() {
@@ -50,12 +59,14 @@ ${color.bold('AUTH')}
 ${color.bold('PROJECTS')}
   projects                    List your projects
   projects:new <name>         Create a project (auto-links to cwd)
+  new <name>                  Alias for projects:new
   projects:rm <slug>          Delete a project (--yes to skip confirm)
   link <slug>                 Link the current directory to a project
   open                        Open the project's primary domain in a browser
 
 ${color.bold('DEPLOY')}
   deploy [--prod] [--detach]  Deploy the linked project, syncing .env files first
+  new deploy                  Deploy to a brand new project, ignoring any existing link
   deployments                 List recent deployments
   status <id>                 Show deployment pipeline + events
   logs <id>                   Stream deployment events (alias of status)
@@ -71,7 +82,9 @@ ${color.bold('ENV VARS')}
 
 ${color.bold('PULL')}
   pull [<slug>] [--out dir] [--no-env]  Pull source + .env from a glashDB project
-  pull --from vercel --project <id>     Pull source + env from a Vercel project
+
+${color.bold('SYSTEM')}
+  update                      Update @glash/cli to the latest version
 
 ${color.bold('FLAGS')}
   --project <slug|id>         Override the linked project for this command

package/commands/deploy.mjs

@@ -20,19 +20,69 @@ function currentBranch() {
 }
 
 async function resolveProjectId(flags) {
-  if (flags.project) {
-    if (/^[0-9a-f-]{36}$/.test(flags.project)) return flags.project;
-    const list = await apiGet('/projects');
-    const found = list.find((p) => p.slug === flags.project || p.id === flags.project);
-    if (!found) throw new Error(`No project matches "${flags.project}". Run \`glash projects\`.`);
-    return found.id;
-  }
-  const link = await readProjectLink();
-  if (link?.projectId) {
-    return link.projectId;
+  if (flags.new) {
+    info(color.dim('Initiating new project deployment...'));
+  } else if (flags.project) {
+    if (/^[0-9a-f-]{36}$/.test(flags.project)) {
+      try {
+        await apiGet(`/projects/${flags.project}`);
+        return flags.project;
+      } catch (err) {
+        if (err.status === 404 || err.message?.toLowerCase().includes('not found')) {
+          warn(`Project "${flags.project}" is no longer available or was deleted.`);
+          info('Let\'s set up a new project.');
+        } else {
+          throw err;
+        }
+      }
+    } else {
+      const list = await apiGet('/projects');
+      const found = list.find((p) => p.slug === flags.project || p.id === flags.project);
+      if (!found) {
+        warn(`No project matches "${flags.project}".`);
+        info('Let\'s set up a new project.');
+      } else {
+        return found.id;
+      }
+    }
+  } else {
+    const link = await readProjectLink();
+    if (link?.projectId) {
+      const confirm = await prompt(`Deploy to linked project "${color.bold(link.slug || link.projectId)}"? [Y/n/select] `);
+      if (confirm.toLowerCase() === 'y' || confirm === '') {
+        try {
+          await apiGet(`/projects/${link.projectId}`);
+          return link.projectId;
+        } catch (err) {
+          if (err.status === 404 || err.message?.toLowerCase().includes('not found')) {
+            warn(`Linked project "${link.slug || link.projectId}" is no longer available or was deleted.`);
+            info('Let\'s set up a new project.');
+          } else {
+            throw err;
+          }
+        }
+      } else if (confirm.toLowerCase() === 'n') {
+        throw new Error('Deployment aborted.');
+      } else {
+        // If they chose 'select' / 's', let them pick from existing projects
+        const list = await apiGet('/projects');
+        if (list.length === 0) {
+          info('No existing projects found. Proceeding to create a new one.');
+        } else {
+          info('\nYour existing projects:');
+          list.forEach((p, i) => info(`  ${color.dim(i + 1 + '.')} ${color.bold(p.name)} ${color.dim('(' + p.slug + ')')}`));
+          const choice = await prompt('\nWhich project do you want to deploy to? (enter number or slug): ');
+          const p = list.find((x, i) => x.slug === choice || String(i + 1) === choice);
+          if (!p) throw new Error(`Project "${choice}" not found.`);
+          await writeProjectLink({ projectId: p.id, slug: p.slug, name: p.name });
+          ok(`Linked to ${p.name} (${p.slug})`);
+          return p.id;
+        }
+      }
+    }
   }
 
-  // INTERACTIVE PROJECT SETUP (Vercel-style)
+  // INTERACTIVE PROJECT SETUP
   const dirName = basename(process.cwd());
   const setup = await prompt(`Set up and deploy "${dirName}"? [Y/n] `);
   if (setup.toLowerCase() === 'n') {
@@ -50,7 +100,7 @@ async function resolveProjectId(flags) {
       const choice = await prompt('\nWhich project do you want to link to? (enter number or slug): ');
       const p = list.find((x, i) => x.slug === choice || String(i + 1) === choice);
       if (!p) throw new Error(`Project "${choice}" not found.`);
-      await writeProjectLink({ projectId: p.id, slug: p.slug });
+      await writeProjectLink({ projectId: p.id, slug: p.slug, name: p.name });
       ok(`Linked to ${p.name} (${p.slug})`);
       return p.id;
     }
@@ -62,7 +112,7 @@ async function resolveProjectId(flags) {
   
   info(color.dim(`Creating project "${name}"...`));
   const p = await apiPost('/projects', { name, slug });
-  await writeProjectLink({ projectId: p.id, slug: p.slug });
+  await writeProjectLink({ projectId: p.id, slug: p.slug, name: p.name });
   ok(`Created and linked to ${p.name} (${p.slug})`);
   return p.id;
 }

package/commands/pull.mjs

@@ -7,9 +7,6 @@
 //   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
-//
-// Vercel mode (unchanged): glash pull --from vercel --project <id> [--team <id>]
-// delegates to the existing reference implementation in glash-pull.mjs.
 
 import { spawnSync } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
@@ -25,14 +22,6 @@ export async function pull(parsed) {
   const flags = parsed?.flags ?? {};
   const positional = parsed?.positional ?? [];
 
-  // Vercel-import compatibility path.
-  if (flags.from === 'vercel') {
-    const here = dirname(fileURLToPath(import.meta.url));
-    const script = join(here, '..', 'glash-pull.mjs');
-    const r = spawnSync(process.execPath, [script, ...argv.slice(3)], { stdio: 'inherit' });
-    exit(r.status ?? 0);
-  }
-
   const token = await getToken();
   if (!token) return fail('Not signed in. Run `glash login` first.');
 

package/commands/update.mjs

@@ -0,0 +1,11 @@
+import { spawnSync } from 'node:child_process';
+import { ok, fail, info, color } from '../lib/ui.mjs';
+
+export async function update() {
+  info(color.dim('→ updating @glash/cli to latest...'));
+  const child = spawnSync('npm', ['install', '-g', '@glash/cli@latest'], { stdio: 'inherit' });
+  if (child.status !== 0) {
+    return fail(`Update failed with exit code ${child.status ?? 'unknown'}. Please run \`npm install -g @glash/cli@latest\` manually.`);
+  }
+  ok('Successfully updated @glash/cli to the latest version.');
+}

package/lib/zip.mjs

@@ -23,7 +23,6 @@ export async function zipDirectory(sourceDir, outPath, { ignore = [] } = {}) {
       '.nuxt*/**',
       '.output/**',
       '.svelte-kit/**',
-      '.vercel/**',
       '.wrangler/**',
       '.netlify/**',
       'dist/**',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@glash/cli",
-  "version": "0.2.2",
-  "description": "glashDB command-line interface — deploy projects, pull source + env, manage env vars, import from Vercel.",
+  "version": "0.2.4",
+  "description": "glashDB command-line interface — deploy projects, pull source + env, manage env vars.",
   "license": "Apache-2.0",
   "homepage": "https://glashdb.com",
   "repository": {
@@ -20,7 +20,6 @@
     "bin",
     "lib",
     "commands",
-    "glash-pull.mjs",
     "README.md"
   ],
   "keywords": [

package/glash-pull.mjs

@@ -1,132 +0,0 @@
-#!/usr/bin/env node
-/**
- * glash pull — reference implementation
- *
- *   glash pull --from vercel --project <id> [--team <id>] [--token <vercel-token>] [--out .]
- *
- * Pulls the latest production deployment from Vercel into the current
- * working directory:
- *   • walks /v6/deployments/<uid>/files
- *   • downloads each file via /v7/deployments/<uid>/files/<file-uid>
- *   • writes them at the same paths locally
- *   • dumps env vars to .env.local
- *
- * Token sources, in order: --token flag, $VERCEL_TOKEN, ~/.glash/credentials.json (vercelToken).
- *
- * No external deps — pure Node 20+. The shipping `@glashdb/cli` wraps this
- * with a nicer UX (interactive prompts, progress bars, `glash login`-aware).
- */
-
-import { argv, env, exit, cwd, stdout, stderr } from 'node:process';
-import { readFile, writeFile, mkdir } from 'node:fs/promises';
-import { homedir } from 'node:os';
-import { join, dirname } from 'node:path';
-
-const VERCEL = 'https://api.vercel.com';
-
-function parseArgs(argv) {
-  const out = {};
-  for (let i = 2; i < argv.length; i++) {
-    const a = argv[i];
-    if (a.startsWith('--')) {
-      const k = a.slice(2);
-      const v = argv[i + 1] && !argv[i + 1].startsWith('--') ? argv[++i] : 'true';
-      out[k] = v;
-    }
-  }
-  return out;
-}
-
-async function readToken(flag) {
-  if (flag) return flag;
-  if (env.VERCEL_TOKEN) return env.VERCEL_TOKEN;
-  try {
-    const raw = await readFile(join(homedir(), '.glash', 'credentials.json'), 'utf8');
-    const j = JSON.parse(raw);
-    if (j.vercelToken) return j.vercelToken;
-  } catch {}
-  stderr.write("error: no Vercel token. Pass --token, set VERCEL_TOKEN, or run `glash login --vercel`.\n");
-  exit(2);
-}
-
-async function vercel(token, path, teamId) {
-  const url = `${VERCEL}${path}${teamId ? (path.includes('?') ? '&' : '?') + 'teamId=' + encodeURIComponent(teamId) : ''}`;
-  const r = await fetch(url, { headers: { Authorization: `Bearer ${token}` } });
-  if (!r.ok) throw new Error(`Vercel ${r.status} ${r.statusText} on ${path}`);
-  return r.json();
-}
-
-async function vercelRaw(token, path, teamId) {
-  const url = `${VERCEL}${path}${teamId ? (path.includes('?') ? '&' : '?') + 'teamId=' + encodeURIComponent(teamId) : ''}`;
-  const r = await fetch(url, { headers: { Authorization: `Bearer ${token}` } });
-  if (!r.ok) throw new Error(`Vercel ${r.status} on ${path}`);
-  return Buffer.from(await r.arrayBuffer());
-}
-
-async function walk(token, deploymentUid, teamId, tree, prefix, out) {
-  for (const node of tree) {
-    const rel = prefix ? `${prefix}/${node.name}` : node.name;
-    if (node.type === 'directory' && node.children) {
-      await walk(token, deploymentUid, teamId, node.children, rel, out);
-    } else if (node.type === 'file' && node.uid) {
-      out.push({ rel, uid: node.uid });
-    }
-  }
-}
-
-async function main() {
-  const args = parseArgs(argv);
-  if (args.from !== 'vercel') {
-    stderr.write("usage: glash pull --from vercel --project <id> [--team <id>] [--out .]\n");
-    exit(2);
-  }
-  if (!args.project) { stderr.write("error: --project <vercel-project-id> required\n"); exit(2); }
-
-  const token = await readToken(args.token);
-  const team = args.team;
-  const outDir = args.out || cwd();
-
-  stdout.write(`→ pulling vercel project ${args.project}${team ? ` (team ${team})` : ''} into ${outDir}\n`);
-
-  // 1) latest production deployment
-  const list = await vercel(token, `/v6/deployments?projectId=${encodeURIComponent(args.project)}&limit=1&target=production&state=READY`, team);
-  const dep = list.deployments?.[0];
-  if (!dep) { stderr.write("error: no production deployment on Vercel for that project.\n"); exit(1); }
-  stdout.write(`✓ deployment ${dep.uid}\n`);
-
-  // 2) file tree
-  const tree = await vercel(token, `/v6/deployments/${dep.uid}/files`, team);
-  const files = [];
-  await walk(token, dep.uid, team, tree, '', files);
-  stdout.write(`✓ ${files.length} files to download\n`);
-
-  // 3) write each file
-  let n = 0;
-  for (const f of files) {
-    const buf = await vercelRaw(token, `/v7/deployments/${dep.uid}/files/${f.uid}`, team);
-    const dest = join(outDir, f.rel);
-    await mkdir(dirname(dest), { recursive: true });
-    await writeFile(dest, buf);
-    n++;
-    if (n % 10 === 0 || n === files.length) stdout.write(`  ${n}/${files.length}\r`);
-  }
-  stdout.write(`\n✓ wrote ${n} files\n`);
-
-  // 4) env vars → .env.local
-  try {
-    const env = await vercel(token, `/v9/projects/${encodeURIComponent(args.project)}/env?decrypt=true`, team);
-    const lines = (env.envs ?? [])
-      .filter((e) => !e.target || e.target.includes('production'))
-      .map((e) => `${e.key}=${JSON.stringify(e.value ?? '')}`);
-    if (lines.length) {
-      await writeFile(join(outDir, '.env.local'), lines.join('\n') + '\n');
-      stdout.write(`✓ wrote ${lines.length} env vars to .env.local\n`);
-    }
-  } catch (e) {
-    stdout.write(`! skipped env vars: ${e.message}\n`);
-  }
-
-  stdout.write(`done.\n  next:  cd ${outDir} && glash deploy\n`);
-}
-
-main().catch((e) => { stderr.write(`error: ${e.message}\n`); exit(1); });