@faable/faable 1.5.29 → 1.5.30

package/dist/api/context.js

@@ -7,12 +7,8 @@ import { CredentialsStore } from '../lib/CredentialsStore.js';
 
 const context = async () => {
     let api;
-    if (process.env.FAABLE_APIKEY) {
-        // Apikey in environment
-        const apikey = process.env.FAABLE_APIKEY;
-        api = FaableApi.create({ authStrategy: apikey_strategy, auth: { apikey } });
-    }
-    else if (process.env.FAABLE_TOKEN) {
+    // Auth resolution: FAABLE_TOKEN → OIDC (CI) → local `faable login` credentials.
+    if (process.env.FAABLE_TOKEN) {
         // Token in environment
         const token = process.env.FAABLE_TOKEN;
         api = FaableApi.create({ authStrategy: bearer_strategy, auth: { token } });

package/dist/api/strategies/oidc.strategy.js

@@ -1,12 +1,34 @@
+import axios from 'axios';
 import { create_base_client } from '../base_client.js';
 
 const exchangeGithubOidcToken = async (gh_token) => {
     const client = create_base_client();
-    const res = await client.post("/auth/github-oidc", {
-        token: gh_token
-    });
-    const { access_token, app_id } = res.data;
-    return { access_token, app_id };
+    try {
+        const res = await client.post("/auth/github-oidc", {
+            token: gh_token
+        });
+        const { access_token, app_id } = res.data;
+        return { access_token, app_id };
+    }
+    catch (err) {
+        if (axios.isAxiosError(err)) {
+            const status = err.response?.status;
+            const serverMessage = err.response?.data?.message;
+            // No app is linked to this repository — turn the cryptic 404 into an
+            // actionable next step.
+            if (status === 404) {
+                throw new Error('No app linked to this repository. Run "faable link" locally to link it, ' +
+                    "or link it from the dashboard (https://dashboard.faable.com).");
+            }
+            // Monorepo: several apps are linked to the same repository.
+            if (status === 400) {
+                throw new Error(serverMessage ||
+                    "This repository has multiple linked apps. Specify which one with `faable deploy <app_id>`.");
+            }
+            throw new Error(`Faable OIDC token exchange failed (${status ?? "network error"})${serverMessage ? `: ${serverMessage}` : ""}`);
+        }
+        throw err;
+    }
 };
 const oidc_strategy = (config) => {
     const { idToken } = config;

package/dist/commands/deploy/index.js

@@ -1,5 +1,6 @@
 import { context } from '../../api/context.js';
 import { cmd } from '../../lib/cmd.js';
+import { Configuration } from '../../lib/Configuration.js';
 import { log } from '../../log.js';
 import { check_environment } from './check_environment.js';
 import { git_context } from './git_context.js';
@@ -30,9 +31,13 @@ const deploy = {
         const { api } = ctx;
         // Resolve runtime
         const { runtime } = await runtime_detection(workdir);
-        const app_id = args.app_id || ctx.appId;
+        // app_id resolution (the user never has to look one up):
+        //  1. explicit positional (monorepo escape hatch)
+        //  2. OIDC in CI — the backend resolves the app from the linked repository
+        //  3. locally — the app saved by `faable link` in faable.json
+        const app_id = args.app_id || ctx.appId || Configuration.instance().app_id;
         if (!app_id) {
-            throw new Error('Missing <app_id>, run inside github action or pass <app_id> after deploy command');
+            throw new Error('No app linked to this repository. Run "faable link" to link it (or link it from the dashboard).');
         }
         const app = await api.getApp(app_id);
         // Check if we can build docker images

package/dist/commands/link/index.js

@@ -24,14 +24,10 @@ const getGitRemoteUrl = async (workdir) => {
     }
 };
 const link = {
-    command: "link [app_id]",
+    command: "link",
     describe: "Link the local repository with a Faable app",
     builder: (yargs) => {
         return yargs
-            .positional("app_id", {
-            type: "string",
-            description: "app_id to link this repository",
-        })
             .option("workdir", {
             alias: "w",
             type: "string",
@@ -41,7 +37,14 @@ const link = {
     },
     handler: async (args) => {
         const workdir = args.workdir || process.cwd();
-        const { app_id } = args;
+        // `faable link <app_id>` is deprecated. Linking is now fully interactive and
+        // the repository is auto-detected from the current folder — users never need
+        // to look up an app_id. Warn if an extra positional was passed and ignore it.
+        const stray = (args._ ?? []).slice(1);
+        if (stray.length > 0) {
+            log.warn('Passing an app_id to "faable link" is deprecated and ignored. ' +
+                'Just run "faable link" and select the app from the list.');
+        }
         const config = Configuration.instance();
         if (config.app_id) {
             log.info(`This repository is already linked to app: "${config.app_slug}" (${config.app_id})`);
@@ -60,26 +63,20 @@ const link = {
         const { api } = await context();
         log.info("Checking local git repository...");
         const gitUrl = await getGitRemoteUrl(workdir);
-        let selectedApp;
-        if (!app_id) {
-            const apps = await api.list();
-            if (apps.length === 0) {
-                log.error("No apps found in your account. Create one first at https://faable.com");
-                return;
-            }
-            selectedApp = await prompts({
-                type: "select",
-                name: "selectedApp",
-                message: "Select the Faable app to link with this repository:",
-                choices: apps.map((app) => ({
-                    title: `${app.name} (${app.url})`,
-                    value: app,
-                })),
-            });
-        }
-        else {
-            selectedApp = await api.getApp(app_id);
+        const apps = await api.list();
+        if (apps.length === 0) {
+            log.error("No apps found in your account. Create one first at https://faable.com");
+            return;
         }
+        const { selectedApp } = await prompts({
+            type: "select",
+            name: "selectedApp",
+            message: "Select the Faable app to link with this repository:",
+            choices: apps.map((app) => ({
+                title: `${app.name} (${app.url})`,
+                value: app,
+            })),
+        });
         if (!selectedApp) {
             log.info("Link cancelled.");
             return;

package/dist/lib/Configuration.js

@@ -49,7 +49,7 @@ class Configuration {
         return this.config.app_slug;
     }
     get app_id() {
-        return this.config.app_slug;
+        return this.config.app_id;
     }
 }
 

package/package.json

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