@getxflow/cli 0.22.0 → 0.23.0

package/dist/commands/sources.js

@@ -75,21 +75,27 @@ async function pushSources(root, config, client, options) {
     const tree = prepareTree(root, config);
     const state = (0, config_1.readState)(root);
     const server = await latestRevision(client, config.projectId);
-    if (server && server.tree_hash === tree.hash) {
-        (0, config_1.writeState)(root, {
-            treeHash: server.tree_hash,
-            organizationId: client.organizationId ?? undefined,
-        });
-        (0, ui_1.ok)(`No changes, revision ${server.revision}`);
-        return { revision: server.revision, status: 'unchanged' };
-    }
-    // Asked before the upload, so a doomed archive never leaves the machine.
-    if (server && server.tree_hash !== state.treeHash && !options.force) {
-        throw new errors_1.CliError(`The server holds revision ${server.revision}, and this folder does not stand on it`, 'Someone deployed before you, or this folder worked on a different project. ' +
-            'Fetch the server copy alongside and compare: xflow pull --into ./server-copy');
-    }
-    if (options.force && server && server.tree_hash !== tree.hash) {
-        await confirmForce(client, config.projectId, server, tree.files);
+    if (server) {
+        const relation = (0, tree_1.syncState)(tree.hash, server.tree_hash, state.treeHash);
+        if (relation === 'matches') {
+            (0, config_1.writeState)(root, {
+                treeHash: server.tree_hash,
+                organizationId: client.organizationId ?? undefined,
+            });
+            (0, ui_1.ok)(`No changes, revision ${server.revision}`);
+            return { revision: server.revision, status: 'unchanged' };
+        }
+        // Asked before the upload, so a doomed archive never leaves the machine.
+        if (relation === 'diverged' && !options.force) {
+            throw new errors_1.CliError(`The server holds revision ${server.revision}, and this folder does not stand on it`, 'Someone deployed before you, or this folder worked on a different project. ' +
+                'Fetch the server copy alongside and compare: xflow pull --into ./server-copy');
+        }
+        if (options.force) {
+            await confirmForce(client, config.projectId, server, tree.files);
+        }
+        else if (relation === 'unrecorded') {
+            (0, ui_1.warn)(`This folder has no record of the server revision: the code goes up on top of revision ${server.revision}`);
+        }
     }
     (0, ui_1.step)(`Sending ${tree.files.length} files (${(0, ui_1.formatBytes)(tree.archive.length)})`);
     const headers = {};
@@ -161,13 +167,10 @@ async function pull(args) {
             'xflow pull --into ./server-copy, or overwrite the folder completely: xflow pull --force');
     }
     const { info, files } = await downloadRevision(client, config.projectId, target, (0, args_1.flagNumber)(args, 'revision'));
-    // Only the working folder tracks revisions; a side copy (--into) must not reset them.
-    if (!into) {
-        (0, config_1.writeState)(root, {
-            treeHash: info.tree_hash,
-            organizationId: client.organizationId ?? undefined,
-        });
-    }
+    (0, config_1.writeState)(target, {
+        treeHash: info.tree_hash,
+        organizationId: client.organizationId ?? undefined,
+    });
     (0, ui_1.ok)(`Revision ${info.revision}: ${files} files in ${target}`);
 }
 async function status() {
@@ -191,13 +194,18 @@ async function status() {
     }
     else {
         (0, ui_1.out)(`On the server: revision ${server.revision}, ${server.file_count} files, ${(0, ui_1.formatAge)(server.created_at)}`);
-        if (server.tree_hash === tree.hash) {
+        const relation = (0, tree_1.syncState)(tree.hash, server.tree_hash, state.treeHash);
+        if (relation === 'matches') {
             (0, ui_1.out)('State: matches the server');
         }
-        else if (server.tree_hash !== state.treeHash) {
+        else if (relation === 'diverged') {
             (0, ui_1.out)(`State: ${(0, ui_1.bold)('diverged')}, the server holds a version this folder has not seen`);
             (0, ui_1.note)((0, ui_1.dim)('  Fetch the server copy alongside: xflow pull --into ./server-copy'));
         }
+        else if (relation === 'unrecorded') {
+            (0, ui_1.out)(`State: ${(0, ui_1.bold)('differs')}, this folder has no record of the server revision`);
+            (0, ui_1.note)((0, ui_1.dim)(`  xflow deploy sends this code on top of revision ${server.revision}; to compare first: xflow pull --into ./server-copy`));
+        }
         else {
             (0, ui_1.out)(`State: ${(0, ui_1.bold)('local changes')}`);
             (0, ui_1.note)((0, ui_1.dim)('  Send and build them: xflow deploy'));

package/dist/help.js

@@ -580,7 +580,9 @@ ignore field of xflow.json.
 If the server holds a revision newer than the one you worked from, the sources are
 rejected and the build does not start. That means somebody deployed before you: fetch
 their changes alongside (${(0, ui_1.bold)('xflow pull --into ./server-copy')}), merge them in git on
-your side, and retry. ${(0, ui_1.bold)('--force')} overwrites the server revision, and before that the
+your side, and retry. A folder with no record of the server revision (a fresh clone, a CI
+checkout) is not rejected: its first deploy goes on top of the current revision and says
+so, the check applies from the next one. ${(0, ui_1.bold)('--force')} overwrites the server revision, and before that the
 CLI shows whose work you are about to destroy and asks for confirmation by typing the
 project name. In a non-interactive run (CI, an agent) there is no way to confirm: a
 version conflict has to fail the build rather than silently destroy somebody else's work.

package/dist/tree.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isSkillCopy = isSkillCopy;
 exports.loadIgnoreRules = loadIgnoreRules;
 exports.collectFiles = collectFiles;
+exports.syncState = syncState;
 exports.treeHash = treeHash;
 exports.heaviest = heaviest;
 const node_crypto_1 = require("node:crypto");
@@ -130,6 +131,17 @@ function collectFiles(root, rules) {
     files.sort((a, b) => (a.path < b.path ? -1 : a.path > b.path ? 1 : 0));
     return { files, skippedLinks };
 }
+/**
+ * How the folder stands against the server tree. A folder with no record (a fresh
+ * clone, a CI checkout) has not diverged: nothing is known about what it started from.
+ */
+function syncState(local, server, remembered) {
+    if (local === server)
+        return 'matches';
+    if (remembered === undefined)
+        return 'unrecorded';
+    return remembered === server ? 'local-changes' : 'diverged';
+}
 /** Computed identically on the server. */
 function treeHash(files) {
     const parts = files.map((file) => `${file.path}\0${(0, node_crypto_1.createHash)('sha256').update(file.content).digest('hex')}`);

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.22.0';
+exports.CLI_VERSION = '0.23.0';
 /** 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.22.0",
+  "version": "0.23.0",
   "description": "CLI for the XFlow platform: source sync, deployment and publishing of applications",
   "license": "UNLICENSED",
   "engines": {

package/skills/xflow/SKILL.md

@@ -22,7 +22,7 @@ contains the fix.
 
 ## Keeping these instructions current
 
-These instructions ship with xflow CLI 0.22.0, so the copy you are reading can be older than
+These instructions ship with xflow CLI 0.23.0, so the copy you are reading can be older than
 the CLI answering your commands.
 
 When the CLI says this file does not match it, run `xflow skills --refresh` and then **read
@@ -108,7 +108,9 @@ one exception is the very first version of a project, which publishes automatica
 `xflow status` says how the local copy differs from the server revision. A deploy rejected
 before the build starts means the server holds a version this folder has never seen: somebody
 deployed first, or the folder was linked elsewhere. Fetch it next to yours (`xflow pull --into
-./server-copy`), merge in git, deploy again. `--force` destroys that work.
+./server-copy`), merge in git, deploy again. `--force` destroys that work. A folder with no
+record of the server revision (a fresh clone, a CI checkout) is not rejected: its first deploy
+goes on top of the current revision and says so, the check applies from the next one.
 
 **Only pages are versioned.** Cloud functions and the database are one per project: they
 are not versioned, and dev and live share them. So `xflow deploy` changes the running