@faable/faable 4.0.0 → 4.1.0

package/dist/commands/project/index.js

@@ -1,9 +1,11 @@
 import { subject, requireSessionToken } from '../../api/auth_admin.js';
+import { loadLiveCredentials } from '../../api/session.js';
 import { requireApi } from '../../api/context.js';
 import { resolveProjectRef, configuredProject, requireProject, SOURCE_LABEL } from '../../api/project.js';
 import { ContextStore } from '../../lib/ContextStore.js';
 import { fetch_page, print_json, table_lines, print, more_hint, list_options, json_option } from '../../lib/listing.js';
 import { log } from '../../log.js';
+import { pickProject } from './picker.js';
 
 const project_list = {
     command: 'list',
@@ -43,24 +45,73 @@ const project_list = {
     }
 };
 const project_use = {
-    command: 'use <project>',
-    describe: 'Set the active project (id, name or slug)',
+    command: 'use [project]',
+    describe: 'Set the active project — id, name or slug; none to pick from a list; - for the previous one',
     builder: yargs => yargs
-        .positional('project', { type: 'string', demandOption: true })
-        .example('$0 project use project_6a8ebd6160324d4631c12edc', 'By id')
+        .positional('project', { type: 'string' })
+        .example('$0 project use', 'Pick from your projects (type to filter)')
         .example('$0 project use "Faable Staff"', 'By name')
+        .example('$0 project use project_6a8ebd6160324d4631c12edc', 'By id')
+        .example('$0 project use -', 'Back to the previous project')
         .showHelpOnFail(false),
     handler: async (args) => {
         const { api } = await requireApi();
-        const id = await resolveProjectRef(api, args.project);
+        const store = new ContextStore();
+        const ctx = await store.load();
+        // yargs never hands over a lone `-` as the positional (it parses it as a
+        // flag-like `true`), so read it off the raw arguments.
+        const previous = args.project === '-' || process.argv.slice(2).includes('-');
+        const ref = typeof args.project === 'string' ? args.project : undefined;
+        let id;
+        if (previous) {
+            if (!ctx.previous)
+                throw new Error('No previous project to go back to.');
+            id = ctx.previous.id;
+        }
+        else if (ref) {
+            id = await resolveProjectRef(api, ref);
+        }
+        else {
+            if (!process.stdin.isTTY || !process.stderr.isTTY) {
+                throw new Error('Name the project: faable project use <id|name> (the picker needs a terminal).');
+            }
+            const token = process.env.FAABLE_TOKEN || (await loadLiveCredentials())?.token;
+            id = await pickProject(api, {
+                user_id: token ? subject(token) : undefined,
+                active: ctx.project
+            });
+            if (!id)
+                return log.info('Cancelled; the active project is unchanged.');
+        }
         // Fetching it is the membership check: the api 404s a project you can't see.
         const project = await api.getProject(id);
-        await new ContextStore().update(ctx => ({ ...ctx, project: project.id }));
+        await store.update(c => ({
+            ...c,
+            project: project.id,
+            project_name: project.name,
+            // Re-selecting the active one keeps the real previous one for `use -`.
+            previous: c.project && c.project !== project.id
+                ? { id: c.project, name: c.project_name }
+                : c.previous
+        }));
         log.info(`✅ Active project: ${project.name} (${project.id})`);
     }
 };
+const project_clear = {
+    command: 'clear',
+    describe: 'Forget the active project',
+    builder: yargs => yargs.showHelpOnFail(false),
+    handler: async () => {
+        await new ContextStore().update(c => {
+            const { project, project_name, ...rest } = c;
+            return project ? { ...rest, previous: { id: project, name: project_name } } : rest;
+        });
+        log.info('Active project cleared. Commands now need --project, FAABLE_PROJECT or faable project use.');
+    }
+};
 const project_current = {
-    command: 'current',
+    // Also what a bare `faable project` shows.
+    command: ['current', '$0'],
     describe: 'Show the active project and where it comes from',
     builder: yargs => json_option(yargs).showHelpOnFail(false),
     handler: async (args) => {
@@ -82,12 +133,12 @@ const project_current = {
 };
 const project = {
     command: 'project',
-    describe: 'Choose the project the CLI acts on (list, use, current)',
+    describe: 'Show or change the project the CLI acts on (list, use, clear)',
     builder: yargs => yargs
         .command(project_list)
         .command(project_use)
+        .command(project_clear)
         .command(project_current)
-        .demandCommand(1)
         .showHelpOnFail(false),
     handler: () => { }
 };

package/dist/commands/project/picker.js

@@ -0,0 +1,56 @@
+import prompts from 'prompts';
+
+const pickCandidates = async (api, user_id) => {
+    const page = await api.listProjects({ pageSize: 200 });
+    if (!page.next)
+        return { projects: page.results, search_remote: false };
+    const mine = user_id
+        ? (await api.listProjects({ pageSize: 200, user_id })).results
+        : [];
+    return { projects: mine, search_remote: true };
+};
+const matches = (p, input) => {
+    const q = input.trim().toLowerCase();
+    if (!q)
+        return true;
+    return [p.name, p.slug, p.id].some(v => v?.toLowerCase().includes(q));
+};
+const title = (p, active) => `${p.id === active ? '● ' : '  '}${p.name}  ${p.slug ?? p.id}`;
+const pickProject = async (api, { user_id, active }) => {
+    const { projects, search_remote } = await pickCandidates(api, user_id);
+    if (projects.length === 0 && !search_remote) {
+        throw new Error('You have no projects yet. Create one in the dashboard (https://dashboard.faable.com).');
+    }
+    const as_choice = (p) => ({
+        title: title(p, active),
+        value: p.id
+    });
+    // The active project first: Enter keeps it, and it's where you look.
+    const ordered = [
+        ...projects.filter(p => p.id === active),
+        ...projects.filter(p => p.id !== active)
+    ];
+    const { project } = await prompts({
+        type: 'autocomplete',
+        name: 'project',
+        message: search_remote
+            ? 'Project (yours listed; type to search all)'
+            : 'Project (type to filter)',
+        limit: 15,
+        choices: ordered.map(as_choice),
+        suggest: async (input) => {
+            const local = ordered.filter(p => matches(p, input));
+            if (!search_remote || input.trim().length < 2)
+                return local.map(as_choice);
+            const remote = await api
+                .listProjects({ q: input.trim(), pageSize: 20 })
+                .then(r => r.results)
+                .catch(() => []);
+            const seen = new Set(local.map(p => p.id));
+            return [...local, ...remote.filter(p => !seen.has(p.id))].map(as_choice);
+        }
+    });
+    return project;
+};
+
+export { matches, pickCandidates, pickProject };

package/dist/index.js

@@ -10,10 +10,23 @@ import { upgrade } from './commands/upgrade/index.js';
 import { whoami } from './commands/whoami/index.js';
 import { version } from './config.js';
 import { Configuration } from './lib/Configuration.js';
-import { setProjectFlag } from './api/project.js';
+import { setProjectFlag, configuredProject } from './api/project.js';
+import { ContextStore } from './lib/ContextStore.js';
 import { notifyIfUpdateAvailable } from './lib/UpdateChecker.js';
 import { log } from './log.js';
 
+// Where the command acts, on the banner — read locally, never a request.
+// The flag and the env show as typed; the stored one by the name it had when
+// it was chosen.
+const project_badge = async () => {
+    const configured = await configuredProject().catch(() => undefined);
+    if (!configured)
+        return '';
+    if (configured.source !== 'config')
+        return ` · project ${configured.ref}`;
+    const { project_name } = await new ContextStore().load();
+    return ` · project ${project_name ?? configured.ref}`;
+};
 const wants_json = () => process.argv.includes('--json');
 // yargs re-runs before-validation middlewares once per nested command level
 // (`deploy secrets` = 2 runs), so keep the banner and update check to one.
@@ -26,6 +39,8 @@ yg.scriptName('faable')
     if (banner_shown)
         return;
     banner_shown = true;
+    // This middleware runs before the one below that records --project.
+    setProjectFlag(argv.project);
     // --json mode is for piping: keep stdout machine-clean (no banner, no
     // update-check notice). Same for `auth users export` without a file,
     // whose stdout IS the export.
@@ -33,7 +48,7 @@ yg.scriptName('faable')
     // Nor when nobody is watching stderr (a script, the MCP server).
     if (argv.json || exports_to_stdout || !process.stderr.isTTY)
         return;
-    log.info(`Faable CLI ${version}`);
+    log.info(`Faable CLI ${version}${await project_badge()}`);
     // `upgrade` does its own (forced) check
     if (argv._[0] !== 'upgrade') {
         await notifyIfUpdateAvailable(version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faable/faable",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "main": "dist/index.js",
   "license": "MIT",
   "author": "Marc Pomar <marc@faable.com>",