@getxflow/cli 0.10.2 → 0.10.4

package/dist/args.js

@@ -1,22 +1,22 @@
 "use strict";
 /** Argument parsing, dependency-free. */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.BOOLEAN_FLAGS = void 0;
 exports.parseArgs = parseArgs;
 exports.flagString = flagString;
 exports.flagBool = flagBool;
 exports.flagNumber = flagNumber;
 /** Flags that never take a value, so `--force ./dir` keeps the path as a word. */
-const BOOLEAN_FLAGS = new Set([
+exports.BOOLEAN_FLAGS = new Set([
     'force',
     'yes',
     'json',
+    'replace',
     'help',
     'version',
     'global',
     'refresh',
-    'live',
     'no-push',
-    'skip-build',
     'all',
     'dry-run',
     'allow-destructive',
@@ -40,7 +40,7 @@ function parseArgs(argv) {
                 continue;
             }
             const next = argv[i + 1];
-            if (BOOLEAN_FLAGS.has(body) || next === undefined || next.startsWith('-')) {
+            if (exports.BOOLEAN_FLAGS.has(body) || next === undefined || next.startsWith('-')) {
                 flags[body] = true;
             }
             else {

package/dist/bin.js

@@ -6,6 +6,7 @@ const args_1 = require("./args");
 const config_1 = require("./config");
 const credentials_1 = require("./credentials");
 const errors_1 = require("./errors");
+const flags_1 = require("./flags");
 const help_1 = require("./help");
 const limits_1 = require("./limits");
 const state_1 = require("./state");
@@ -51,11 +52,15 @@ async function run(args) {
                 (0, org_1.orgSwitch)({ ...args, words: args.words.slice(2) });
                 return;
             }
+            if (second === 'members') {
+                await (0, org_1.orgMembers)();
+                return;
+            }
             if (second === undefined || second === 'list') {
                 (0, org_1.orgList)();
                 return;
             }
-            throw new errors_1.CliError(`Unknown command: org ${second}`, 'Available: list and switch');
+            throw new errors_1.CliError(`Unknown command: org ${second}`, 'Available: list, members and switch');
         case 'templates':
             await (0, projects_1.templates)();
             return;
@@ -94,7 +99,7 @@ async function run(args) {
                 return;
             }
             if (second === undefined || second === 'list') {
-                await (0, functions_1.functionsList)();
+                await (0, functions_1.functionsList)(rest);
                 return;
             }
             throw new errors_1.CliError(`Unknown command: functions ${second}`, 'Available: list, invoke and logs');
@@ -115,7 +120,7 @@ async function run(args) {
                 return;
             }
             if (second === undefined || second === 'list') {
-                await (0, env_1.envList)();
+                await (0, env_1.envList)(rest);
                 return;
             }
             throw new errors_1.CliError(`Unknown command: env ${second}`, 'Available: list, check, set and rm');
@@ -129,7 +134,7 @@ async function run(args) {
                 return;
             }
             if (second === undefined || second === 'list') {
-                await (0, connections_1.connectionsList)();
+                await (0, connections_1.connectionsList)(rest);
                 return;
             }
             throw new errors_1.CliError(`Unknown command: connections ${second}`, 'Available: list, link and unlink');
@@ -143,7 +148,7 @@ async function run(args) {
                 return;
             }
             if (second === undefined || second === 'list') {
-                await (0, schedules_1.schedulesList)();
+                await (0, schedules_1.schedulesList)(rest);
                 return;
             }
             throw new errors_1.CliError(`Unknown command: schedules ${second}`, 'Available: list, set and rm');
@@ -152,6 +157,10 @@ async function run(args) {
                 await (0, db_1.dbMigrate)(rest);
                 return;
             }
+            if (second === 'list') {
+                await (0, db_1.dbList)();
+                return;
+            }
             if (second === 'schema') {
                 await (0, db_1.dbSchema)({ ...args, words: args.words.slice(2) });
                 return;
@@ -164,7 +173,7 @@ async function run(args) {
                 await (0, db_1.dbStatus)();
                 return;
             }
-            throw new errors_1.CliError(`Unknown command: db ${second}`, 'Available: status, schema, query and migrate');
+            throw new errors_1.CliError(`Unknown command: db ${second}`, 'Available: status, list, schema, query and migrate');
         case 'storage':
             if (second === 'push') {
                 await (0, storage_1.storagePush)(rest);
@@ -189,13 +198,13 @@ async function run(args) {
             await (0, deploy_1.deploy)(rest);
             return;
         case 'publish':
-            await (0, deploy_1.publish)();
+            await (0, deploy_1.publish)(rest);
             return;
         case 'rollback':
             await (0, deploy_1.rollback)(rest);
             return;
         case 'deployments':
-            await (0, deploy_1.deployments)();
+            await (0, deploy_1.deployments)(rest);
             return;
         case 'update':
             (0, update_1.update)();
@@ -255,6 +264,7 @@ async function main() {
     // carries the same advice in its hint.
     let quiet = args.words[0] === 'update';
     try {
+        (0, flags_1.checkFlags)(args);
         await run(args);
         return 0;
     }
@@ -265,8 +275,15 @@ async function main() {
                 (0, ui_1.note)((0, ui_1.dim)(`  ${(0, limits_1.limitLine)(e.limit)}`));
             if (e.hint)
                 (0, ui_1.note)((0, ui_1.dim)(`  ${e.hint}`));
-            if (e.code === 'not_found' && (0, credentials_1.anyMultipleOrgs)()) {
-                (0, ui_1.note)((0, ui_1.dim)('  Several organizations are signed in: the answer may live in another one, see xflow org'));
+            if (e.code === 'not_found') {
+                // XFLOW_TOKEN is taken as given and no organization is looked for, so a
+                // project of another one answers "not found" with nothing else to say.
+                if (process.env.XFLOW_TOKEN?.trim()) {
+                    (0, ui_1.note)((0, ui_1.dim)('  XFLOW_TOKEN is set: it is the key of one organization and is used as it comes, so a project of another one is not found'));
+                }
+                else if ((0, credentials_1.anyMultipleOrgs)()) {
+                    (0, ui_1.note)((0, ui_1.dim)('  Several organizations are signed in: the answer may live in another one, see xflow org'));
+                }
             }
             quiet = quiet || e.code === 'outdated_cli';
             return 1;

package/dist/commands/connections.js

@@ -56,10 +56,9 @@ function resolve(connections, target) {
     }
     throw new errors_1.CliError(`No connection ${target}`, 'What this project can use: xflow connections');
 }
-async function connectionsList() {
-    const { config } = (0, config_1.requireProject)();
-    const client = (0, session_1.connect)(config);
-    const data = await (0, api_1.apiJson)(client, endpoint(config.projectId));
+async function connectionsList(args) {
+    const { projectId, client } = await (0, session_1.projectTarget)(args);
+    const data = await (0, api_1.apiJson)(client, endpoint(projectId));
     if (data.connections.length === 0) {
         (0, ui_1.note)('No connections you can use in this organization');
         (0, ui_1.note)((0, ui_1.dim)('  Somebody connects an account first: platform settings, Connectors'));
@@ -92,11 +91,10 @@ async function connectionsLink(args) {
     if (!alias) {
         throw new errors_1.CliError('An alias is required', 'For example: xflow connections link "Яндекс Метрика" --as YANDEX_METRIKA');
     }
-    const { config } = (0, config_1.requireProject)();
-    const client = (0, session_1.connect)(config);
-    const data = await (0, api_1.apiJson)(client, endpoint(config.projectId));
+    const { projectId, client } = await (0, session_1.projectTarget)(args);
+    const data = await (0, api_1.apiJson)(client, endpoint(projectId));
     const connectionId = resolve(data.connections, target).id;
-    const result = await (0, api_1.apiJson)(client, endpoint(config.projectId), { method: 'POST', body: { connection_id: connectionId, alias } });
+    const result = await (0, api_1.apiJson)(client, endpoint(projectId), { method: 'POST', body: { connection_id: connectionId, alias } });
     (0, ui_1.ok)(`${(0, ui_1.bold)(result.label)} linked as ${result.alias}`);
     if (result.env.length > 0)
         (0, ui_1.note)((0, ui_1.dim)(`  The functions will get: ${result.env.join(', ')}`));

package/dist/commands/db.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dbStatus = dbStatus;
+exports.dbList = dbList;
 exports.dbSchema = dbSchema;
 exports.dbQuery = dbQuery;
 exports.dbMigrate = dbMigrate;
@@ -76,6 +77,33 @@ async function dbStatus() {
         (0, ui_1.warn)('A changed file will not be applied again: write a new migration');
     }
 }
+/**
+ * Logical databases of the organization, and who is attached to them.
+ *
+ * The identifier is what `xflow init --database <id>` asks for, and the list of
+ * projects is not decoration: a database is shared, so a migration written for
+ * one application lands in the others too.
+ */
+async function dbList() {
+    const client = (0, session_1.connect)((0, config_1.localConfig)());
+    const data = await (0, api_1.apiJson)(client, '/api/v1/org/databases');
+    if (data.databases.length === 0) {
+        (0, ui_1.note)('The organization has no databases');
+        (0, ui_1.note)((0, ui_1.dim)('  One is created with the first project: xflow init'));
+        return;
+    }
+    (0, ui_1.table)(data.databases.map((database) => [
+        database.name,
+        database.id,
+        database.schema ?? '-',
+        database.projects.length === 0
+            ? 'no projects'
+            : database.projects.map((project) => project.name).join(', '),
+    ]));
+    if (data.truncated)
+        (0, ui_1.note)((0, ui_1.dim)(`  Shown ${data.databases.length} of ${data.total}`));
+    (0, ui_1.note)((0, ui_1.dim)('  One database is shared across projects: a migration affects all of them'));
+}
 /** Long values would tear the columns apart; the cut is marked, never silent. */
 const CELL_LIMIT = 60;
 function cell(value) {
@@ -92,10 +120,9 @@ function cell(value) {
  * in there".
  */
 async function dbSchema(args) {
-    const { config } = (0, config_1.requireProject)();
-    const client = (0, session_1.connect)(config);
+    const { projectId, client } = await (0, session_1.projectTarget)(args);
     const wanted = args.words[0];
-    const path = `/api/v1/projects/${config.projectId}/db/schema${wanted ? `?table=${encodeURIComponent(wanted)}` : ''}`;
+    const path = `/api/v1/projects/${projectId}/db/schema${wanted ? `?table=${encodeURIComponent(wanted)}` : ''}`;
     if (wanted) {
         const data = await (0, api_1.apiJson)(client, path);
         (0, ui_1.out)(`${(0, ui_1.bold)(`${data.schema}.${data.table}`)}`);
@@ -134,13 +161,12 @@ async function dbSchema(args) {
  * database itself rather than by us guessing at the text of the SQL.
  */
 async function dbQuery(args) {
-    const { config } = (0, config_1.requireProject)();
     const sql = args.words.join(' ').trim();
     if (!sql) {
         throw new errors_1.CliError('A query is required', 'For example: xflow db query "select * from orders order by created_at desc limit 20"');
     }
-    const client = (0, session_1.connect)(config);
-    const data = await (0, api_1.apiJson)(client, `/api/v1/projects/${config.projectId}/db/query`, {
+    const { projectId, client } = await (0, session_1.projectTarget)(args);
+    const data = await (0, api_1.apiJson)(client, `/api/v1/projects/${projectId}/db/query`, {
         method: 'POST',
         body: { sql, limit: (0, args_1.flagNumber)(args, 'limit') },
         timeoutMs: 60_000,

package/dist/commands/deploy.js

@@ -122,7 +122,7 @@ async function assertBuildAllowed(client, projectId) {
 }
 async function deploy(args) {
     const { root, config } = (0, config_1.requireProject)();
-    const client = await (0, session_1.connectProject)(root, config);
+    const client = await (0, session_1.connectProject)(config.projectId, root, config);
     let revision;
     if ((0, args_1.flagBool)(args, 'no-push')) {
         const server = await (0, sources_1.latestRevision)(client, config.projectId);
@@ -170,11 +170,10 @@ async function deploy(args) {
     (0, ui_1.note)((0, ui_1.dim)('  and are not held back by publishing'));
     (0, ui_1.note)((0, ui_1.dim)('  Show the new pages to visitors: xflow publish'));
 }
-async function publish() {
-    const { root, config } = (0, config_1.requireProject)();
-    const client = await (0, session_1.connectProject)(root, config);
+async function publish(args) {
+    const { projectId, client } = await (0, session_1.projectTarget)(args, { probe: true });
     (0, ui_1.step)('Publishing the current dev version');
-    const result = await (0, api_1.apiJson)(client, `/api/v1/projects/${config.projectId}/publish`, { method: 'POST', timeoutMs: 120_000 });
+    const result = await (0, api_1.apiJson)(client, `/api/v1/projects/${projectId}/publish`, { method: 'POST', timeoutMs: 120_000 });
     if (result.already_published) {
         (0, ui_1.ok)('This version is already published');
     }
@@ -186,13 +185,12 @@ async function publish() {
     (0, ui_1.note)((0, ui_1.dim)('  have been running the code of the last xflow deploy since it finished'));
 }
 async function rollback(args) {
-    const { root, config } = (0, config_1.requireProject)();
     const deployId = args.words[0];
     if (!deployId) {
         throw new errors_1.CliError('A version number is required', 'To see the versions: xflow deployments. For example: xflow rollback 481203');
     }
-    const client = await (0, session_1.connectProject)(root, config);
-    const result = await (0, api_1.apiJson)(client, `/api/v1/projects/${config.projectId}/rollback`, { method: 'POST', body: { deploy_id: deployId } });
+    const { projectId, client } = await (0, session_1.projectTarget)(args, { probe: true });
+    const result = await (0, api_1.apiJson)(client, `/api/v1/projects/${projectId}/rollback`, { method: 'POST', body: { deploy_id: deployId } });
     (0, ui_1.ok)(`The project now serves the pages of build ${result.deploy_id}`);
     (0, ui_1.out)(result.project_url);
     (0, ui_1.note)((0, ui_1.dim)('  Only the pages came back. Cloud functions and the database are one per project:'));
@@ -203,10 +201,9 @@ async function rollback(args) {
     }
     (0, ui_1.note)((0, ui_1.dim)('  Visitors see these pages only after xflow publish'));
 }
-async function deployments() {
-    const { root, config } = (0, config_1.requireProject)();
-    const client = await (0, session_1.connectProject)(root, config);
-    const data = await (0, api_1.apiJson)(client, `/api/v1/projects/${config.projectId}/deployments`);
+async function deployments(args) {
+    const { projectId, client } = await (0, session_1.projectTarget)(args, { probe: true });
+    const data = await (0, api_1.apiJson)(client, `/api/v1/projects/${projectId}/deployments`);
     if (data.deployments.length === 0) {
         (0, ui_1.note)('No versions yet. To build and release: xflow deploy');
         return;

package/dist/commands/env.js

@@ -82,14 +82,17 @@ function referencedByFunctions(root) {
     }
     return { needed, provided, opaque };
 }
-async function fetchVariables() {
-    const { root, config } = (0, config_1.requireProject)();
-    const client = (0, session_1.connect)(config);
-    const data = await (0, api_1.apiJson)(client, `/api/v1/projects/${config.projectId}/env`);
-    return { names: new Set(data.variables.map((row) => row.name)), rows: data.variables, root };
+/**
+ * The stored variables. The project is resolved by the caller: list takes
+ * --project, check reads the sources and so needs the folder it is standing in.
+ */
+async function fetchVariables(client, projectId) {
+    const data = await (0, api_1.apiJson)(client, `/api/v1/projects/${projectId}/env`);
+    return { names: new Set(data.variables.map((row) => row.name)), rows: data.variables };
 }
-async function envList() {
-    const { rows } = await fetchVariables();
+async function envList(args) {
+    const { projectId, client } = await (0, session_1.projectTarget)(args);
+    const { rows } = await fetchVariables(client, projectId);
     if (rows.length === 0) {
         (0, ui_1.note)('No variables');
         (0, ui_1.note)((0, ui_1.dim)('  To store one: xflow env set SMTP_PASSWORD=secret'));
@@ -100,7 +103,8 @@ async function envList() {
 }
 /** Check that every referenced variable is stored. */
 async function envCheck() {
-    const { names, root } = await fetchVariables();
+    const { root, config } = (0, config_1.requireProject)();
+    const { names } = await fetchVariables((0, session_1.connect)(config), config.projectId);
     const { needed, provided, opaque } = referencedByFunctions(root);
     if (needed.size === 0 && provided.size === 0 && opaque.size === 0) {
         (0, ui_1.note)('The functions of this project read no environment variables');
@@ -164,7 +168,10 @@ async function envSet(args) {
     const value = pair.slice(pair.indexOf('=') + 1);
     const result = await (0, api_1.apiJson)(client, `/api/v1/projects/${config.projectId}/env`, {
         method: 'POST',
-        body: { name, value, scope: (0, args_1.flagString)(args, 'scope') === 'project' ? 'project' : 'organization' },
+        // The word goes to the platform as typed: it knows the two scopes and
+        // refuses a third. Guessing here would have made --scope proj mean the
+        // whole organization, which is the opposite of what such a typo means.
+        body: { name, value, scope: (0, args_1.flagString)(args, 'scope') },
     });
     (0, ui_1.ok)(`${(0, ui_1.bold)(result.name)} stored (${result.scope === 'project' ? 'this project only' : 'the whole organization'})`);
     // Values reach a function on its next deploy.
@@ -174,12 +181,11 @@ async function envSet(args) {
     }
 }
 async function envRemove(args) {
-    const { config } = (0, config_1.requireProject)();
-    const client = (0, session_1.connect)(config);
     const name = args.words[1];
     if (!name)
         throw new errors_1.CliError('A variable name is required', 'What is stored: xflow env');
-    const result = await (0, api_1.apiJson)(client, `/api/v1/projects/${config.projectId}/env?name=${encodeURIComponent(name)}`, { method: 'DELETE' });
+    const { projectId, client } = await (0, session_1.projectTarget)(args);
+    const result = await (0, api_1.apiJson)(client, `/api/v1/projects/${projectId}/env?name=${encodeURIComponent(name)}`, { method: 'DELETE' });
     if (!result.removed) {
         (0, ui_1.note)(`There is no variable ${name}`);
         return;

package/dist/commands/functions.js

@@ -4,8 +4,8 @@ exports.functionsList = functionsList;
 exports.functionsInvoke = functionsInvoke;
 const api_1 = require("../api");
 const args_1 = require("../args");
-const config_1 = require("../config");
 const errors_1 = require("../errors");
+const json_arg_1 = require("../json-arg");
 const session_1 = require("../session");
 const ui_1 = require("../ui");
 /** Who can call the function: inside the app only, or an outside service holding a key. */
@@ -15,10 +15,9 @@ function accessLabel(fn) {
     return `external (${fn.external_keys} key${fn.external_keys > 1 ? 's' : ''})`;
 }
 const FUNCTIONS_DIR = 'functions';
-async function functionsList() {
-    const { config } = (0, config_1.requireProject)();
-    const client = (0, session_1.connect)(config);
-    const data = await (0, api_1.apiJson)(client, `/api/v1/projects/${config.projectId}/functions`);
+async function functionsList(args) {
+    const { projectId, client } = await (0, session_1.projectTarget)(args);
+    const data = await (0, api_1.apiJson)(client, `/api/v1/projects/${projectId}/functions`);
     if (data.functions.length === 0) {
         (0, ui_1.note)(`No functions. Put the code in ${FUNCTIONS_DIR}/<name>/index.ts and run xflow deploy`);
         return;
@@ -41,27 +40,28 @@ function prettyBody(text) {
 }
 /** Call a function the same way the application does. */
 async function functionsInvoke(args) {
-    const { config } = (0, config_1.requireProject)();
-    const client = (0, session_1.connect)(config);
+    const { projectId, client } = await (0, session_1.projectTarget)(args);
     const name = args.words[1];
     if (!name)
         throw new errors_1.CliError('A function name is required', 'What is deployed: xflow functions list');
-    const card = await (0, api_1.apiJson)(client, `/api/v1/projects/${config.projectId}`);
+    // The body is judged before anything goes over the network: a broken one is the
+    // user's own line, and it costs nothing to say so at once.
+    const data = (0, json_arg_1.jsonArg)(args, 'data');
+    const method = ((0, args_1.flagString)(args, 'method') ?? (data ? 'POST' : 'GET')).toUpperCase();
+    const sendsBody = method !== 'GET' && method !== 'HEAD';
+    const card = await (0, api_1.apiJson)(client, `/api/v1/projects/${projectId}`);
     const fn = card.functions.find((item) => item.name === name);
     if (!fn || !fn.invoke_url) {
         throw new errors_1.CliError(`Function ${name} is not deployed`, card.functions.length > 0
             ? `Deployed: ${card.functions.map((item) => item.name).join(', ')}`
             : 'Functions ship with the build: xflow deploy');
     }
-    const data = (0, args_1.flagString)(args, 'data');
-    const method = ((0, args_1.flagString)(args, 'method') ?? (data ? 'POST' : 'GET')).toUpperCase();
-    const sendsBody = method !== 'GET' && method !== 'HEAD';
     // A pass for the person who owns the key: the project token alone is not an
     // identity, and a project built with the current template refuses without one.
     // A read-only key cannot get a pass, so the call still goes out without it.
     let pass = '';
     try {
-        const issued = await (0, api_1.apiJson)(client, `/api/v1/projects/${config.projectId}/pass`, { method: 'POST' });
+        const issued = await (0, api_1.apiJson)(client, `/api/v1/projects/${projectId}/pass`, { method: 'POST' });
         pass = issued.pass;
     }
     catch {

package/dist/commands/logs.js

@@ -4,7 +4,6 @@ exports.logs = logs;
 exports.functionsLogs = functionsLogs;
 const api_1 = require("../api");
 const args_1 = require("../args");
-const config_1 = require("../config");
 const session_1 = require("../session");
 const ui_1 = require("../ui");
 const DEFAULT_LIMIT = 10;
@@ -15,12 +14,11 @@ function stamp(iso) {
     return `${pad(date.getDate())}.${pad(date.getMonth() + 1)} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`;
 }
 async function fetchLogs(source, name, args) {
-    const { config } = (0, config_1.requireProject)();
-    const client = (0, session_1.connect)(config);
+    const { projectId, client } = await (0, session_1.projectTarget)(args);
     const query = new URLSearchParams({ source, limit: String((0, args_1.flagNumber)(args, 'limit') ?? DEFAULT_LIMIT) });
     if (name)
         query.set('name', name);
-    const data = await (0, api_1.apiJson)(client, `/api/v1/projects/${config.projectId}/logs?${query.toString()}`);
+    const data = await (0, api_1.apiJson)(client, `/api/v1/projects/${projectId}/logs?${query.toString()}`);
     return data.logs;
 }
 /** Newest at the bottom. */

package/dist/commands/org.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.orgList = orgList;
+exports.orgMembers = orgMembers;
 exports.orgSwitch = orgSwitch;
+const api_1 = require("../api");
 const config_1 = require("../config");
 const credentials_1 = require("../credentials");
 const errors_1 = require("../errors");
+const session_1 = require("../session");
 const ui_1 = require("../ui");
 const mcp_1 = require("./mcp");
 function label(org) {
@@ -35,6 +38,22 @@ function orgList() {
         (0, ui_1.note)((0, ui_1.dim)('  Switch: xflow org switch <name or id>'));
     (0, ui_1.note)((0, ui_1.dim)('  To add an organization, sign in to it: xflow login'));
 }
+/**
+ * Who is in the organization this key belongs to, and with which role. Reading
+ * only: people and money are the owner's, in the platform interface.
+ */
+async function orgMembers() {
+    const client = (0, session_1.connect)((0, config_1.localConfig)());
+    const data = await (0, api_1.apiJson)(client, '/api/v1/org/members');
+    if (data.members.length === 0) {
+        (0, ui_1.note)('The organization has no members');
+        return;
+    }
+    (0, ui_1.table)(data.members.map((member) => [member.name ?? '(unnamed)', member.email ?? '-', member.role]));
+    const org = (0, credentials_1.listOrgs)(client.apiUrl).find((entry) => entry.organizationId === client.organizationId);
+    const count = data.truncated ? `${data.members.length} of ${data.total}` : String(data.total);
+    (0, ui_1.note)((0, ui_1.dim)(`  ${count} in "${org ? label(org) : 'the organization'}". Inviting and removing people happens in the platform interface`));
+}
 /** Local switch of the active organization: a pointer move, no browser. */
 function orgSwitch(args) {
     const wanted = args.words[0];

package/dist/commands/schedules.js

@@ -4,15 +4,13 @@ exports.schedulesList = schedulesList;
 exports.schedulesSet = schedulesSet;
 exports.schedulesRemove = schedulesRemove;
 const api_1 = require("../api");
-const args_1 = require("../args");
-const config_1 = require("../config");
 const errors_1 = require("../errors");
+const json_arg_1 = require("../json-arg");
 const session_1 = require("../session");
 const ui_1 = require("../ui");
-async function schedulesList() {
-    const { config } = (0, config_1.requireProject)();
-    const client = (0, session_1.connect)(config);
-    const data = await (0, api_1.apiJson)(client, `/api/v1/projects/${config.projectId}/schedules`);
+async function schedulesList(args) {
+    const { projectId, client } = await (0, session_1.projectTarget)(args);
+    const data = await (0, api_1.apiJson)(client, `/api/v1/projects/${projectId}/schedules`);
     if (data.schedules.length === 0) {
         (0, ui_1.note)('No schedules');
         (0, ui_1.note)((0, ui_1.dim)('  To run a function on a timer: xflow schedules set <function> "0 3 ? * * *"'));
@@ -26,23 +24,21 @@ async function schedulesList() {
     ]));
 }
 async function schedulesSet(args) {
-    const { config } = (0, config_1.requireProject)();
-    const client = (0, session_1.connect)(config);
     const functionName = args.words[1];
     const cron = args.words[2];
     if (!functionName || !cron) {
         throw new errors_1.CliError('A function name and a schedule are required', 'For example: xflow schedules set nightly-report "0 3 ? * * *" runs every day at 03:00 UTC');
     }
-    const row = await (0, api_1.apiJson)(client, `/api/v1/projects/${config.projectId}/schedules`, {
+    const payload = (0, json_arg_1.jsonArg)(args, 'payload') ?? null;
+    const { projectId, client } = await (0, session_1.projectTarget)(args);
+    const row = await (0, api_1.apiJson)(client, `/api/v1/projects/${projectId}/schedules`, {
         method: 'POST',
-        body: { function: functionName, cron, payload: (0, args_1.flagString)(args, 'payload') ?? null },
+        body: { function: functionName, cron, payload },
     });
     (0, ui_1.ok)(`${(0, ui_1.bold)(row.function)} runs ${row.description}`);
     (0, ui_1.note)((0, ui_1.dim)(`  The time is UTC. To check by hand: xflow functions invoke ${row.function}`));
 }
 async function schedulesRemove(args) {
-    const { config } = (0, config_1.requireProject)();
-    const client = (0, session_1.connect)(config);
     const functionName = args.words[1];
     if (!functionName) {
         throw new errors_1.CliError('A function name is required', 'What runs on a timer: xflow schedules list');
@@ -51,7 +47,8 @@ async function schedulesRemove(args) {
     const query = new URLSearchParams({ function: functionName });
     if (cron)
         query.set('cron', cron);
-    const result = await (0, api_1.apiJson)(client, `/api/v1/projects/${config.projectId}/schedules?${query.toString()}`, { method: 'DELETE' });
+    const { projectId, client } = await (0, session_1.projectTarget)(args);
+    const result = await (0, api_1.apiJson)(client, `/api/v1/projects/${projectId}/schedules?${query.toString()}`, { method: 'DELETE' });
     if (result.removed === 0) {
         (0, ui_1.note)(`Function ${functionName} has no such schedule`);
         return;

package/dist/commands/sources.js

@@ -154,7 +154,7 @@ async function pull(args) {
     const { root, config } = (0, config_1.requireProject)();
     const into = (0, args_1.flagString)(args, 'into');
     const target = into ? (0, node_path_1.resolve)(into) : root;
-    const client = await (0, session_1.connectProject)(root, config);
+    const client = await (0, session_1.connectProject)(config.projectId, root, config);
     if (hasContent(target) && !(0, args_1.flagBool)(args, 'force')) {
         throw new errors_1.CliError(`The directory ${target} is not empty`, 'The platform cannot merge changes, that is git work. Fetch the server copy alongside: ' +
             'xflow pull --into ./server-copy, or overwrite the folder completely: xflow pull --force');
@@ -172,7 +172,7 @@ async function pull(args) {
 }
 async function status() {
     const { root, config } = (0, config_1.requireProject)();
-    const client = await (0, session_1.connectProject)(root, config);
+    const client = await (0, session_1.connectProject)(config.projectId, root, config);
     const tree = prepareTree(root, config);
     const state = (0, config_1.readState)(root);
     const [card, server, history] = await Promise.all([

package/dist/commands/storage.js

@@ -11,7 +11,6 @@ const node_path_1 = require("node:path");
 const node_stream_1 = require("node:stream");
 const api_1 = require("../api");
 const args_1 = require("../args");
-const config_1 = require("../config");
 const errors_1 = require("../errors");
 const session_1 = require("../session");
 const ui_1 = require("../ui");
@@ -158,10 +157,9 @@ async function fetchAll(client, projectId, folder) {
     return files;
 }
 async function storageList(args) {
-    const { config } = (0, config_1.requireProject)();
-    const client = (0, session_1.connect)(config);
+    const { projectId, client } = await (0, session_1.projectTarget)(args);
     const folder = args.words[1] ?? '';
-    const files = await fetchAll(client, config.projectId, folder);
+    const files = await fetchAll(client, projectId, folder);
     if ((0, args_1.flagBool)(args, 'json')) {
         (0, ui_1.out)(JSON.stringify({ files }, null, 2));
         return;
@@ -210,8 +208,6 @@ async function inParallel(items, limit, task) {
     return results;
 }
 async function storagePush(args) {
-    const { config } = (0, config_1.requireProject)();
-    const client = (0, session_1.connect)(config);
     const source = args.words[1];
     if (!source) {
         throw new errors_1.CliError('A folder or a file is required', 'For example: xflow storage push ./media --to media');
@@ -239,9 +235,10 @@ async function storagePush(args) {
     }
     const replace = (0, args_1.flagBool)(args, 'replace');
     const asJson = (0, args_1.flagBool)(args, 'json');
+    const { projectId, client } = await (0, session_1.projectTarget)(args);
     // What is already there decides what to send: the same run repeated has to be
     // cheap and quiet, not a pile of conflicts.
-    const known = new Map((await fetchAll(client, config.projectId, target)).map((f) => [f.path, f]));
+    const known = new Map((await fetchAll(client, projectId, target)).map((f) => [f.path, f]));
     const outcome = { uploaded: [], skipped: [], failed: [] };
     const pending = [];
     for (const file of files) {
@@ -270,7 +267,7 @@ async function storagePush(args) {
         (0, ui_1.step)(`Uploading ${pending.length} file(s), ${(0, ui_1.formatBytes)(bytes)}`);
     }
     for (const batch of batches) {
-        const { files: tickets } = await (0, api_1.apiJson)(client, `/api/v1/projects/${config.projectId}/storage/upload-url`, {
+        const { files: tickets } = await (0, api_1.apiJson)(client, `/api/v1/projects/${projectId}/storage/upload-url`, {
             method: 'POST',
             body: {
                 files: batch.map((file) => ({
@@ -306,7 +303,7 @@ async function storagePush(args) {
         // Confirm right after the batch, not at the end: an object that is in the
         // bucket without a record is invisible to the project and still takes up
         // the quota.
-        const confirmed = await (0, api_1.apiJson)(client, `/api/v1/projects/${config.projectId}/storage/confirm`, {
+        const confirmed = await (0, api_1.apiJson)(client, `/api/v1/projects/${projectId}/storage/confirm`, {
             method: 'POST',
             body: { files: done.map(({ ticket }) => ({ s3_key: ticket.s3_key })) },
         });
@@ -343,8 +340,6 @@ function report(outcome, asJson) {
     }
 }
 async function storageRemove(args) {
-    const { config } = (0, config_1.requireProject)();
-    const client = (0, session_1.connect)(config);
     const folder = (0, args_1.flagString)(args, 'folder');
     const url = args.words[1];
     if ((!url && !folder) || (url && folder)) {
@@ -353,9 +348,10 @@ async function storageRemove(args) {
     const query = new URLSearchParams(url ? { url } : { folder: folder });
     if ((0, args_1.flagBool)(args, 'yes'))
         query.set('confirm', 'true');
+    const { projectId, client } = await (0, session_1.projectTarget)(args);
     let result;
     try {
-        result = await (0, api_1.apiJson)(client, `/api/v1/projects/${config.projectId}/storage?${query.toString()}`, { method: 'DELETE' });
+        result = await (0, api_1.apiJson)(client, `/api/v1/projects/${projectId}/storage?${query.toString()}`, { method: 'DELETE' });
     }
     catch (e) {
         // The platform counts what a folder holds and refuses until the answer is

package/dist/flags.js

@@ -0,0 +1,136 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkFlags = checkFlags;
+const args_1 = require("./args");
+const errors_1 = require("./errors");
+const help_1 = require("./help");
+/**
+ * Which flags each command answers to.
+ *
+ * An unknown flag used to pass in silence, and one written before a word ate that
+ * word: `functions logs --nosuch flows` answered for every function instead of the
+ * one asked for, and the answer looked truthful. A mistyped switch is worse still:
+ * `db migrate --dryrun` applied the migrations for real.
+ *
+ * Keys are the command as it is typed. A command that is not here is not checked,
+ * so a new one keeps working until it is added, and the list also drives the hint:
+ * whoever is at the keyboard gets the flags of this very command back.
+ *
+ * `--project` is a flag like any other here, and it is written against a command
+ * only when that command does not read the working copy. The ones that do (deploy,
+ * pull, status, db migrate, db status, env check, env set, connections unlink) have
+ * a folder to stand in, and naming a project they cannot read would be a lie.
+ */
+const KNOWN = {
+    help: [],
+    login: [],
+    logout: ['all'],
+    whoami: [],
+    org: [],
+    'org list': [],
+    'org members': [],
+    'org switch': [],
+    templates: [],
+    init: ['name', 'template', 'database'],
+    link: [],
+    projects: [],
+    'projects list': [],
+    'projects get': [],
+    skills: ['refresh', 'global', 'agent', 'yes'],
+    mcp: ['show-token'],
+    'mcp install': ['show-token'],
+    functions: ['project'],
+    'functions list': ['project'],
+    'functions invoke': ['data', 'data-file', 'method', 'project'],
+    'functions logs': ['limit', 'project'],
+    logs: ['limit', 'project'],
+    env: ['project'],
+    'env list': ['project'],
+    'env set': ['scope'],
+    'env rm': ['project'],
+    'env remove': ['project'],
+    'env check': [],
+    connections: ['project'],
+    'connections list': ['project'],
+    'connections link': ['as', 'project'],
+    'connections unlink': ['force'],
+    schedules: ['project'],
+    'schedules list': ['project'],
+    'schedules set': ['payload', 'payload-file', 'project'],
+    'schedules rm': ['project'],
+    'schedules remove': ['project'],
+    db: [],
+    'db status': [],
+    'db list': [],
+    'db schema': ['project'],
+    'db query': ['limit', 'project'],
+    'db migrate': ['dry-run', 'allow-destructive'],
+    storage: ['json', 'project'],
+    'storage ls': ['json', 'project'],
+    'storage list': ['json', 'project'],
+    'storage push': ['to', 'replace', 'json', 'project'],
+    'storage rm': ['folder', 'yes', 'project'],
+    'storage remove': ['folder', 'yes', 'project'],
+    status: [],
+    pull: ['into', 'force', 'revision'],
+    deploy: ['no-push', 'force', 'allow-removals'],
+    publish: ['project'],
+    rollback: ['project'],
+    deployments: ['project'],
+    update: [],
+};
+/** Answered everywhere: both are handled before the command runs. */
+const GLOBAL = new Set(['help', 'version']);
+/**
+ * Commands whose second word is a subcommand rather than a value. An unknown one
+ * belongs to the dispatcher, which names it and lists the real ones: complaining
+ * about a flag of a command that does not exist would send the reader the wrong way.
+ */
+const NAMESPACES = new Set([
+    'org',
+    'projects',
+    'functions',
+    'env',
+    'connections',
+    'schedules',
+    'db',
+    'storage',
+    'mcp',
+]);
+/** The command these words name, as far as the table knows it. */
+function commandOf(words) {
+    const [first, second] = words;
+    if (!first)
+        return null;
+    if (second !== undefined) {
+        if (Object.hasOwn(KNOWN, `${first} ${second}`))
+            return `${first} ${second}`;
+        if (NAMESPACES.has(first))
+            return null;
+    }
+    return Object.hasOwn(KNOWN, first) ? first : null;
+}
+function checkFlags(args) {
+    const command = commandOf(args.words);
+    if (command === null)
+        return;
+    const allowed = KNOWN[command];
+    const topic = command.split(' ')[0];
+    // Not every command has a page, and sending the reader to "No page for login"
+    // would be a second dead end in the same breath as the first.
+    const page = (0, help_1.hasHelpPage)(topic) ? `xflow help ${topic}` : 'xflow help';
+    for (const [name, value] of Object.entries(args.flags)) {
+        if (GLOBAL.has(name))
+            continue;
+        if (!allowed.includes(name)) {
+            throw new errors_1.CliError(`xflow ${command} has no flag --${name}`, allowed.length > 0
+                ? `It takes ${allowed.map((flag) => `--${flag}`).join(', ')}. What each one does: ${page}`
+                : `It takes no flags. What it does: ${page}`);
+        }
+        // The value went missing, so the flag arrived as a bare switch. Left alone it
+        // would mean the default, which is never what the person typing it wanted.
+        if (value === true && !args_1.BOOLEAN_FLAGS.has(name)) {
+            throw new errors_1.CliError(`--${name} needs a value`, `Put it after the flag, or write --${name}=value when the value starts with a dash`);
+        }
+    }
+}

package/dist/help.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.hasHelpPage = hasHelpPage;
 exports.help = help;
 const ui_1 = require("./ui");
 const version_1 = require("./version");
@@ -14,6 +15,10 @@ const ALIASES = {
     deployments: 'rollback',
 };
 /** Help text. For agents this is the reference documentation. */
+/** Whether `xflow help <topic>` has a page: a hint that sends nowhere is a second dead end. */
+function hasHelpPage(topic) {
+    return Object.hasOwn(TOPICS, ALIASES[topic] ?? topic);
+}
 function help(topic) {
     if (topic) {
         const page = TOPICS[ALIASES[topic] ?? topic];
@@ -77,6 +82,7 @@ ${(0, ui_1.bold)('Functions')}
 
 ${(0, ui_1.bold)('Database')}
   xflow db status                 which migrations are applied and which are waiting
+  xflow db list                   databases of the organization and the projects on them
   xflow db schema [table]         tables of the project, or the columns of one
   xflow db query "select ..."     read data, in a read-only transaction
   xflow db migrate [--dry-run] [--allow-destructive]
@@ -87,12 +93,17 @@ ${(0, ui_1.bold)('Reference')}
   xflow projects list             projects of the organization
   xflow projects get [id]         project card
   xflow org                       organizations with a stored key, the active one marked
+  xflow org members               who is in the organization, and with which role
   xflow org switch <name|id>      make another organization the active one
   xflow whoami                    whose key this is and what it can do
   xflow logout [--all]            forget the key of the active organization (--all: every one)
   xflow update                    update the CLI itself, and the skill that ships with it
   xflow --version                 which version is installed
 
+${(0, ui_1.bold)('Outside a project folder')}
+  --project <id>                  name the project by id, for every command that does
+                                  not read the local files (xflow help project)
+
 ${(0, ui_1.bold)('Environment')}
   XFLOW_TOKEN                     access key (for CI, instead of xflow login)
   XFLOW_API_URL                   platform address when it is not app.getxflow.com
@@ -112,10 +123,14 @@ Which key a command then uses, in order:
   3. the active organization
 
   xflow org                      the stored organizations, the active one marked
+  xflow org members              who is in this one, and with which role
   xflow org switch <name|id>     make another one active, no browser involved
   xflow logout                   forget the key of the active organization
   xflow logout --all             forget every key of this platform address
 
+${(0, ui_1.bold)('members')} reads only. Inviting people, changing a role and removing somebody stay
+in the platform interface, with the owner: there is no command for any of them.
+
 The switch is local: it changes which stored key is used and nothing happens on
 the platform. A folder bound to an organization is not affected, its commands
 stay in its own organization: two projects of two organizations in two terminals
@@ -129,6 +144,37 @@ A project id is unique across the whole platform, so "project not found" under
 the wrong organization can never touch somebody else's project. When that error
 names a project you know exists, the key is simply from another organization:
 check ${(0, ui_1.bold)('xflow org')}.`,
+    project: `${(0, ui_1.bold)('--project <id>')}: a project without its folder
+
+Every command that only talks to the platform takes it, so a service project needs
+no working copy of its own:
+
+  xflow db query --project 3f2a… "select id, title from tasks where done = false"
+  xflow functions invoke kanban --project 3f2a… --data-file card.json
+
+Which commands: ${(0, ui_1.bold)('db query')}, ${(0, ui_1.bold)('db schema')}, ${(0, ui_1.bold)('functions list')},
+${(0, ui_1.bold)('functions invoke')}, ${(0, ui_1.bold)('functions logs')}, ${(0, ui_1.bold)('logs')}, ${(0, ui_1.bold)('env')}, ${(0, ui_1.bold)('env rm')},
+${(0, ui_1.bold)('connections')}, ${(0, ui_1.bold)('connections link')}, ${(0, ui_1.bold)('schedules')}, ${(0, ui_1.bold)('schedules set')},
+${(0, ui_1.bold)('schedules rm')}, ${(0, ui_1.bold)('storage ls')}, ${(0, ui_1.bold)('storage push')}, ${(0, ui_1.bold)('storage rm')},
+${(0, ui_1.bold)('deployments')}, ${(0, ui_1.bold)('publish')}, ${(0, ui_1.bold)('rollback')}.
+
+The rest read the working copy and have nothing to do with an id instead:
+${(0, ui_1.bold)('deploy')}, ${(0, ui_1.bold)('pull')}, ${(0, ui_1.bold)('status')}, ${(0, ui_1.bold)('db migrate')}, ${(0, ui_1.bold)('db status')},
+${(0, ui_1.bold)('env check')}, ${(0, ui_1.bold)('env set')}, ${(0, ui_1.bold)('connections unlink')}. They answer about the files
+next to them, so they keep asking for a folder.
+
+The folder is then ignored whole, and that includes its ${(0, ui_1.bold)('xflow.json')}: the address
+is app.getxflow.com, or ${(0, ui_1.bold)('XFLOW_API_URL')} when it is set, and never the ${(0, ui_1.bold)('api')} field
+of a config that happens to be lying around. Standing in the folder of a self-hosted
+project, the flag therefore goes somewhere else than the folder does.
+
+The id is echoed back on every run. It is the one place a project is named by hand,
+and a wrong id answers "not found" on a read but works on a write.
+
+With several organizations signed in, the one holding the project is looked for on
+every call: there is no folder to write the answer into, and a second place to
+remember it would be a second thing to keep true. One ${(0, ui_1.bold)('xflow org switch')} to the
+right organization spares that search.`,
     update: `${(0, ui_1.bold)('xflow update')}: bring the CLI up to date
 
 Installs the published version and, if anything changed, rewrites the platform
@@ -155,10 +201,15 @@ will work.`,
     db: `${(0, ui_1.bold)('xflow db')}: schema, data, migrations
 
   xflow db status                  what is applied and what is waiting
+  xflow db list                    databases of the organization, and who is on them
   xflow db schema [table]          tables of the project, or the columns of one
   xflow db query "select ..."      read data (--limit N)
   xflow db migrate                 apply migrations/*.sql
 
+${(0, ui_1.bold)('list')} is about the organization, not about this project: it names the logical
+databases, the identifier ${(0, ui_1.bold)('xflow init --database <id>')} asks for, and the projects
+attached to each one. That last column is the one to read before a migration.
+
 ${(0, ui_1.bold)('schema')} answers a different question than the ${(0, ui_1.bold)('migrations/')} directory: one logical
 database is shared by several projects, so the files say what you did, and the schema
 says what is actually in there. ${(0, ui_1.bold)('query')} runs inside a READ ONLY transaction, so
@@ -259,7 +310,11 @@ the function. So keep your own copy wherever you got it from.
   xflow env set SMTP_PASSWORD=…    store
   xflow env rm SMTP_PASSWORD       delete
 
-  --scope project                  visible to this project only, not the whole organization
+  --scope project                  visible to this project only
+  --scope organization             visible to every project of the organization (the default)
+
+Those two words are the whole list: a third is refused rather than read as the default,
+because a value meant for one project would have gone out to all of them.
 
 ${(0, ui_1.bold)('check')} reads the sources in ${(0, ui_1.bold)('functions/')} and looks for ${(0, ui_1.bold)('process.env.NAME')}
 references. The same rule applies on deploy: a function receives only the variables it
@@ -326,6 +381,7 @@ the day-of-month and day-of-week fields has to be ${(0, ui_1.bold)('?')}, which
 how Yandex works. ${(0, ui_1.bold)('The time is always UTC')}, local time is not understood.
 
   --payload '{"mode":"full"}'      the body the function will receive
+  --payload-file body.json         the same body from a file
 
 A scheduled run arrives at the handler as a POST with no headers, and the project
 token is not checked on it: such an event cannot be forged from outside. The function
@@ -339,8 +395,13 @@ Calls it exactly the way the application does: the project token plus a visitor
 for the person who owns the key, so the function sees a real caller and its role.
 Both are taken from the platform, no local .env is needed.
 
-  --data '{"a":1}'   request body (the method becomes POST by default)
-  --method GET       a different method
+  --data '{"a":1}'        request body (the method becomes POST by default)
+  --data-file body.json   the same body from a file
+  --method GET            a different method
+
+The body has to be JSON, and it is checked before the call goes out: PowerShell
+strips double quotes from a native call, so ${(0, ui_1.bold)('--data')} needs them escaped there
+(${(0, ui_1.bold)('--data \'{\\"a\\":1}\'')}) and a file needs nothing.
 
 Prints the status, the response time and the body. A non-zero exit code on 4xx and
 5xx: in CI such a call has to fail the step. The cause of a crash is shown by
@@ -460,7 +521,7 @@ is not a formality: your own palette on top of them looks foreign inside the pla
 
   --name <name>       project name (the folder name by default)
   --template <id>     a different template (the list: xflow templates)
-  --database <id>     attach a logical database of the organization
+  --database <id>     attach a logical database of the organization (the list: xflow db list)
 
 The order: the project is created on the platform first, because without it there is
 nowhere to get the token for .env. If writing the files fails, the project stays empty

package/dist/json-arg.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.jsonProblem = jsonProblem;
+exports.jsonHint = jsonHint;
+exports.jsonArg = jsonArg;
+const node_fs_1 = require("node:fs");
+const args_1 = require("./args");
+const errors_1 = require("./errors");
+/**
+ * A JSON body typed on the command line: --data for a call, --payload for a
+ * schedule. Checked here, before it leaves: PowerShell strips the double quotes
+ * out of a native call, and an unchecked body arrives at the function as garbage,
+ * so a shell problem looks like a crash in the project's own code.
+ */
+/** No quote left where JSON needs them: a shell ate them, this is not a typo. */
+function quotesStripped(raw) {
+    return !raw.includes('"') && /^[{[]/.test(raw);
+}
+/** What the parser says about the text, or null when it is JSON. */
+function jsonProblem(raw) {
+    const text = raw.trim();
+    if (!text)
+        return 'the value is empty';
+    try {
+        JSON.parse(text);
+        return null;
+    }
+    catch (e) {
+        return e instanceof Error ? e.message : String(e);
+    }
+}
+/** Where to look, and on a stripped value the shell is the first suspect. */
+function jsonHint(flag, raw) {
+    const file = `--${flag}-file body.json`;
+    if (quotesStripped(raw.trim())) {
+        return (`Not one double quote survived: the shell removed them, PowerShell does this to ` +
+            `native calls. Escape them: --${flag} '{\\"key\\":\\"value\\"}', or keep the body ` +
+            `in a file: ${file}`);
+    }
+    return `A single JSON value is expected, or keep the body in a file: ${file}`;
+}
+/** The body from --<flag> or --<flag>-file, already known to be JSON. */
+function jsonArg(args, flag) {
+    const fileFlag = `${flag}-file`;
+    const inline = args.flags[flag];
+    const path = (0, args_1.flagString)(args, fileFlag);
+    if (inline !== undefined && path !== undefined) {
+        throw new errors_1.CliError(`--${flag} and --${fileFlag} cannot be used together`, 'Give the body once');
+    }
+    if (path !== undefined) {
+        if (!(0, node_fs_1.existsSync)(path)) {
+            throw new errors_1.CliError(`No file ${path}`, `--${fileFlag} takes the path to a file with one JSON value`);
+        }
+        const text = (0, node_fs_1.readFileSync)(path, 'utf-8').trim();
+        const problem = jsonProblem(text);
+        if (problem)
+            throw new errors_1.CliError(`${path} is not valid JSON: ${problem}`, 'The file has to hold one JSON value');
+        return text;
+    }
+    if (inline === undefined)
+        return undefined;
+    if (inline === true)
+        throw new errors_1.CliError(`--${flag} needs a value`, `For example: --${flag} '{"mode":"full"}'`);
+    const raw = String(inline).trim();
+    const problem = jsonProblem(raw);
+    if (problem)
+        throw new errors_1.CliError(`--${flag} is not valid JSON: ${raw}`, jsonHint(flag, raw));
+    return raw;
+}

package/dist/session.js

@@ -4,15 +4,24 @@ exports.connect = connect;
 exports.anonymous = anonymous;
 exports.findProjectOrg = findProjectOrg;
 exports.connectProject = connectProject;
+exports.isProjectId = isProjectId;
+exports.projectTarget = projectTarget;
 const api_1 = require("./api");
+const args_1 = require("./args");
 const config_1 = require("./config");
 const credentials_1 = require("./credentials");
 const errors_1 = require("./errors");
 const ui_1 = require("./ui");
-/** Platform connection: address plus key. */
-function connect(config) {
+/**
+ * Platform connection: address plus key.
+ *
+ * `ignoreFolder` is what --project needs: the folder around it belongs to another
+ * project, so its organization must not decide the key. Taking it would hand the
+ * flag the key of the wrong organization, and the answer would be a bare 404.
+ */
+function connect(config, options) {
     const apiUrl = (0, config_1.apiUrlFor)(config);
-    const root = (0, config_1.findProjectRoot)();
+    const root = options?.ignoreFolder === true ? null : (0, config_1.findProjectRoot)();
     const picked = (0, credentials_1.pickKey)({
         env: process.env.XFLOW_TOKEN?.trim() || null,
         // XFLOW_TOKEN never follows an address taken from the repo's xflow.json:
@@ -63,23 +72,76 @@ async function findProjectOrg(apiUrl, projectId) {
  * gets probed once: the organization that serves the project is found and
  * written into .xflow/state.json, so every later command resolves the key
  * synchronously. With one stored key there is nothing to probe.
+ *
+ * Without a folder (--project) there is nowhere to write the answer, so the
+ * probe repeats on every command. Kept that way on purpose: a second store of
+ * "which organization holds what" would be a second truth to keep in step, and
+ * the price is paid only by whoever did not switch the active organization.
  */
-async function connectProject(root, config) {
-    const session = connect(config);
+async function connectProject(projectId, root, config) {
+    const session = connect(config, { ignoreFolder: root === null });
     if (session.source !== 'active' || session.organizationId === null)
         return session;
     const orgs = (0, credentials_1.listOrgs)(session.apiUrl);
     if (orgs.length <= 1)
         return session;
-    const { hit, dead } = await findProjectOrg(session.apiUrl, config.projectId);
+    const { hit, dead } = await findProjectOrg(session.apiUrl, projectId);
     if (!hit) {
-        throw new errors_1.CliError(`No signed-in organization holds the project ${config.projectId}`, dead.length > 0
+        throw new errors_1.CliError(`No signed-in organization holds the project ${projectId}`, dead.length > 0
             ? `The key of ${dead.map((d) => d.name ?? d.organizationId).join(', ')} is not working (sign in again: xflow login); the project may live there`
-            : 'Check projectId in xflow.json, or sign in to the organization that owns it: xflow login');
+            : root === null
+                ? 'Check the id, or sign in to the organization that owns it: xflow login'
+                : 'Check projectId in xflow.json, or sign in to the organization that owns it: xflow login');
+    }
+    if (root !== null) {
+        (0, config_1.writeState)(root, { organizationId: hit.organizationId });
+        if (hit.organizationId !== session.organizationId) {
+            (0, ui_1.note)((0, ui_1.dim)(`  The project belongs to "${hit.name ?? hit.organizationId}", not to the active organization: the folder is bound to it`));
+        }
+    }
+    else if (hit.organizationId !== session.organizationId) {
+        // Nothing was written down, so the next command pays for the same search.
+        (0, ui_1.note)((0, ui_1.dim)(`  The project belongs to "${hit.name ?? hit.organizationId}": xflow org switch spares the next command this search`));
     }
-    (0, config_1.writeState)(root, { organizationId: hit.organizationId });
-    if (hit.organizationId !== session.organizationId) {
-        (0, ui_1.note)((0, ui_1.dim)(`  The project belongs to "${hit.name ?? hit.organizationId}", not to the active organization: the folder is bound to it`));
+    return {
+        apiUrl: session.apiUrl,
+        token: hit.token,
+        source: root === null ? 'probe' : 'folder',
+        organizationId: hit.organizationId,
+    };
+}
+/**
+ * A project id, and nothing that could be mistaken for one. A name passed where
+ * the id belongs would answer a bare 404, and that reads as "no such project"
+ * rather than "wrong argument".
+ */
+function isProjectId(value) {
+    return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(value);
+}
+/**
+ * The project a command works on: the --project flag, or the folder it runs in.
+ *
+ * The flag ignores the folder whole, its xflow.json included, so the address is
+ * the default one or XFLOW_API_URL and nothing else: a config lying around must
+ * not be able to redirect a call made by id.
+ *
+ * `probe` is the difference the folder path already has and keeps: publish,
+ * rollback and deployments look for the organization of an unbound folder,
+ * everything else takes the key it resolves to. Named by id there is no binding
+ * to lean on, so the search always happens.
+ */
+async function projectTarget(args, options) {
+    const named = (0, args_1.flagString)(args, 'project');
+    if (named !== undefined) {
+        if (!isProjectId(named)) {
+            throw new errors_1.CliError(`--project takes a project id, got "${named}"`, 'The ids: xflow projects list');
+        }
+        // Unconditional: the flag is the only place the id is typed by hand, and a
+        // wrong one answers 404 on a read and works on a write.
+        (0, ui_1.note)((0, ui_1.dim)(`  Project ${named} (--project)`));
+        return { projectId: named, client: await connectProject(named, null) };
     }
-    return { apiUrl: session.apiUrl, token: hit.token, source: 'folder', organizationId: hit.organizationId };
+    const { root, config } = (0, config_1.requireProject)();
+    const client = options?.probe === true ? await connectProject(config.projectId, root, config) : connect(config);
+    return { projectId: config.projectId, client };
 }

package/dist/version.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_API_URL = exports.CLI_VERSION = void 0;
 /** Keep in sync with cli/package.json. */
-exports.CLI_VERSION = '0.10.2';
+exports.CLI_VERSION = '0.10.4';
 /** Overridden by XFLOW_API_URL or the `api` field in xflow.json. */
 exports.DEFAULT_API_URL = 'https://app.getxflow.com';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getxflow/cli",
-  "version": "0.10.2",
+  "version": "0.10.4",
   "description": "CLI for the XFlow platform: source sync, deployment and publishing of applications",
   "license": "UNLICENSED",
   "engines": {

package/skills/xflow/SKILL.md

@@ -24,7 +24,7 @@ contains the fix.
 
 ## Keeping these instructions current
 
-These instructions ship with xflow CLI 0.10.2. They travel inside the package, so the copy
+These instructions ship with xflow CLI 0.10.4. They travel inside the package, so the copy
 you are reading can be older than the CLI answering your commands, and nothing about that
 is visible in the text itself.
 
@@ -234,10 +234,15 @@ you to delete. Put the directories back instead, and if the removal really is in
 which functions are about to go and let the user answer.
 
 Debugging a deployed function is two commands: `xflow functions invoke <name>` calls it
-the way the app does and prints status, timing and body (`--data '{"a":1}'` sends a body),
-and `xflow functions logs <name>` shows the failures, each with its stack and the console
-output of that call. Only failed calls are logged, so an empty output means the function
-never crashed, not that logging is broken.
+the way the app does and prints status, timing and body (`--data '{"a":1}'` sends a body,
+`--data-file body.json` sends the same from a file), and `xflow functions logs <name>` shows
+the failures, each with its stack and the console output of that call. Only failed calls are
+logged, so an empty output means the function never crashed, not that logging is broken.
+
+The body has to be JSON and the CLI checks it before calling. In PowerShell the double
+quotes never reach the CLI: `--data '{"a":1}'` arrives as `{a:1}`, so escape them
+(`--data '{\"a\":1}'`) or pass a file. This is a shell habit, not a bug in the function, and
+it bites `--payload` of a schedule the same way.
 
 From the app, call a function through `src/lib/xflow.ts`:
 `await xflow.functions.invoke('send-mail', { body: { to } })`. It carries the credentials
@@ -303,6 +308,11 @@ writes one, `xflow env` lists the names, `xflow env check` tells you which varia
 functions read but the platform does not have. Values never come back out — the only place
 they exist is inside the running function.
 
+A variable goes to the whole organization unless you say otherwise: `--scope project` keeps it
+to this project alone, `--scope organization` is the default, and a third word is refused
+rather than read as the default. Pick the narrow one for anything that belongs to one
+application.
+
 These commands see only what this project can see: variables shared across the organization
 and the ones bound to this project. A variable bound to another project is invisible here, so
 `env rm` reports it as missing even though names are unique within the organization.
@@ -342,7 +352,9 @@ grant it to itself. Connecting a new account and switching one off stay with a p
 `xflow schedules set report "0 3 ? * * *"` runs a function daily at 03:00. Six fields, UTC,
 and exactly one of day-of-month / day-of-week must be `?` — that is how Yandex wants it.
 A scheduled run reaches the handler as a POST with no headers, and `--payload '{"mode":"full"}'`
-is how it gets a body. How often a schedule may run is a plan limit, see **Plan limits**.
+(or `--payload-file body.json`) is how it gets a body. The payload has to be JSON: a broken one
+is refused when the schedule is set, not at three in the morning with nobody watching. How often
+a schedule may run is a plan limit, see **Plan limits**.
 
 The pieces line up in one pass. From a new function to a verified schedule:
 
@@ -386,7 +398,9 @@ place the affected tables are dumped first and kept for 7 days. Check with `--dr
 
 One logical database can be shared by several projects, so your migration can break an app
 you do not see, and `xflow db status` lists applied migrations that have no file in your
-repository: that is somebody else's project. For the same reason `migrations/` is not the
+repository: that is somebody else's project. `xflow db list` names the databases of the
+organization and the projects on each, which is where you find out who else is on yours.
+For the same reason `migrations/` is not the
 schema. It says what you did; `xflow db schema [table]` says what is in the database right
 now, and `xflow db query "select ..."` reads it inside a READ ONLY transaction. Look before
 you write a migration against a shared database.
@@ -482,7 +496,9 @@ One key per organization, stored side by side rather than replacing each other:
 
 Inside a project folder there is nothing to switch: commands follow the organization the
 folder is bound to, whatever the active one is. That is what lets two projects of two
-organizations work side by side.
+organizations work side by side. The exception is `--project <id>`, which every command
+that does not read the working copy takes (`xflow help project` lists them): it ignores the
+folder whole, so a second project needs no second checkout.
 
 A "not found" on a project you know exists usually means the key belongs to another
 organization, not that the project is gone: ids are unique across the platform, so a