@superblocksteam/cli 1.8.0 → 1.9.0

package/README.md

@@ -12,7 +12,7 @@ $ npm install -g @superblocksteam/cli
 $ superblocks COMMAND
 running command...
 $ superblocks (--version)
-@superblocksteam/cli/1.8.0 linux-x64 node-v18.20.2
+@superblocksteam/cli/1.9.0 linux-x64 node-v18.20.4
 $ superblocks --help [COMMAND]
 USAGE
   $ superblocks COMMAND
@@ -21,6 +21,7 @@ USAGE
 <!-- usagestop -->
 # Commands
 <!-- commands -->
+* [`superblocks commits [RESOURCE_PATH]`](#superblocks-commits-resource_path)
 * [`superblocks components create`](#superblocks-components-create)
 * [`superblocks components register`](#superblocks-components-register)
 * [`superblocks components upload`](#superblocks-components-upload)
@@ -34,6 +35,37 @@ USAGE
 * [`superblocks push [RESOURCE_PATH]`](#superblocks-push-resource_path)
 * [`superblocks rm [RESOURCE_PATH]`](#superblocks-rm-resource_path)
 
+## `superblocks commits [RESOURCE_PATH]`
+
+List Superblocks commits for a resource
+
+```
+USAGE
+  $ superblocks commits [RESOURCE_PATH] [-b <value>] [-l <value>] [-o <value>]
+
+ARGUMENTS
+  RESOURCE_PATH  Superblocks resource location to show commits for (i.e. apps/my-app)
+
+FLAGS
+  -b, --branch=<value>  Superblocks branch to show commits for, the current git branch will be used by default
+  -l, --limit=<value>   [default: 10] Number of commits to be displayed, default is 10
+  -o, --offset=<value>  Number of commits to be skipped before displaying by creation time, default is 0
+
+DESCRIPTION
+  List Superblocks commits for a resource
+
+EXAMPLES
+  $ superblocks commits
+
+  $ superblocks commits  apps/my-app
+
+  $ superblocks commits  apps/my-app -b feature-branch
+
+  $ superblocks commits  --limit 20
+
+  $ superblocks commits  --offset 10
+```
+
 ## `superblocks components create`
 
 Creates a new Superblocks component in the current application folder
@@ -144,15 +176,16 @@ Interactively configure the current directory as a Superblocks project or initia
 
 ```
 USAGE
-  $ superblocks init [RESOURCE_URL] [-m latest-edits|most-recent-commit|deployed]
+  $ superblocks init [RESOURCE_URL] [-m latest-edits|most-recent-commit|deployed] [-s]
 
 ARGUMENTS
   RESOURCE_URL  Superblocks resource URL (i.e. https://app.superblocks.com/applications/<application_id> or
                 https://app.superblocks.com/applications/edit/<application_id>)
 
 FLAGS
-  -m, --mode=<option>  Pull mode
-                       <options: latest-edits|most-recent-commit|deployed>
+  -m, --mode=<option>              Pull mode
+                                   <options: latest-edits|most-recent-commit|deployed>
+  -s, --skip-signing-verification  If true, signature verification for signing enabled organizations will be skipped.
 
 DESCRIPTION
   Interactively configure the current directory as a Superblocks project or initialize new services in an already
@@ -200,15 +233,18 @@ Download objects from Superblocks and save them locally
 
 ```
 USAGE
-  $ superblocks pull [RESOURCE_PATH] [-m latest-edits|most-recent-commit|deployed] [-b <value>]
+  $ superblocks pull [RESOURCE_PATH] [-m latest-edits|most-recent-commit|deployed] [-b <value>] [-c
+    <value>] [-s]
 
 ARGUMENTS
   RESOURCE_PATH  Superblocks resource location to pull (i.e. apps/my-app)
 
 FLAGS
-  -b, --branch=<value>  Superblocks branch to pull from, the current git branch will be used by default
-  -m, --mode=<option>   [default: latest-edits] Pull mode
-                        <options: latest-edits|most-recent-commit|deployed>
+  -b, --branch=<value>             Superblocks branch to pull from, the current git branch will be used by default
+  -c, --commit-id=<value>          Superblocks commit id to pull, the live edit will be used by default
+  -m, --mode=<option>              [default: latest-edits] Pull mode
+                                   <options: latest-edits|most-recent-commit|deployed>
+  -s, --skip-signing-verification  If true, signature verification for signing enabled organizations will be skipped.
 
 DESCRIPTION
   Download objects from Superblocks and save them locally
@@ -219,6 +255,8 @@ EXAMPLES
   $ superblocks pull  apps/my-app
 
   $ superblocks pull  apps/my-app -b feature-branch
+
+  $ superblocks pull  apps/my-app -c commit-id
 ```
 
 ## `superblocks push [RESOURCE_PATH]`
@@ -227,13 +265,15 @@ Import objects from local filesystem to Superblocks
 
 ```
 USAGE
-  $ superblocks push [RESOURCE_PATH] [-b <value>]
+  $ superblocks push [RESOURCE_PATH] [-b <value>] [-s]
 
 ARGUMENTS
   RESOURCE_PATH  Superblocks resource location to push (e.g. apps/my-app)
 
 FLAGS
   -b, --branch=<value>  Superblocks branch to push to, the current git branch will be used by default
+  -s, --skip-commit     If true, push command will only update live edit state along with signature without creating a
+                        commit.
 
 DESCRIPTION
   Import objects from local filesystem to Superblocks
@@ -244,6 +284,8 @@ EXAMPLES
   $ superblocks push  apps/my-app
 
   $ superblocks push  apps/my-app -b feature-branch
+
+  $ superblocks push  apps/my-app --skip-commit
 ```
 
 ## `superblocks rm [RESOURCE_PATH]`

package/assets/custom-components/setup/package.json

@@ -7,7 +7,7 @@
     "lint:fix": "npx eslint . --fix"
   },
   "dependencies": {
-    "@superblocksteam/custom-components": "1.8.0",
+    "@superblocksteam/custom-components": "1.9.0",
     "react": "^18",
     "react-dom": "^18"
   },

package/dist/commands/commits.d.ts

@@ -0,0 +1,18 @@
+import { GetCommitsResponseBody } from "@superblocksteam/sdk";
+import { AuthenticatedCommand } from "../common/authenticated-command";
+export default class Commits extends AuthenticatedCommand {
+    static description: string;
+    static examples: string[];
+    static flags: {
+        branch: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        limit: import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        offset: import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
+    static args: {
+        resource_path: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
+    };
+    run(): Promise<void>;
+    private createTasks;
+    private getResourceIdToShowCommits;
+    printCommits(commits: GetCommitsResponseBody, branch?: string): void;
+}

package/dist/commands/commits.js

@@ -0,0 +1,298 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
+const core_1 = require("@oclif/core");
+const util_1 = require("@superblocksteam/util");
+const listr2_1 = require("listr2");
+const authenticated_command_1 = require("../common/authenticated-command");
+const version_control_1 = require("../common/version-control");
+class Commits extends authenticated_command_1.AuthenticatedCommand {
+    async run() {
+        const { flags, args } = await this.parse(Commits);
+        const tasks = this.createTasks(args.resource_path, flags.branch, flags.limit, flags.offset);
+        await tasks.run();
+    }
+    createTasks(resourcePath, branch, limit, offset) {
+        const tasks = new listr2_1.Listr([
+            {
+                title: "Checking for existing Superblocks project...",
+                task: async (ctx) => {
+                    ctx.writtenResources = {};
+                    ctx.removedResourceIds = [];
+                    try {
+                        [
+                            ctx.existingSuperblocksRootConfig,
+                            ctx.superblocksRootConfigPath,
+                        ] = await (0, util_1.getSuperblocksMonorepoConfigJson)(true);
+                        ctx.existingSuperblocksResourceConfig =
+                            await (0, util_1.getSuperblocksResourceConfigIfExists)();
+                        ctx.superblocksRootPath = node_path_1.default.resolve(node_path_1.default.dirname(ctx.superblocksRootConfigPath), "..");
+                    }
+                    catch {
+                        // no existing superblocks config
+                        this.error("No Superblocks project found in the current folder hierarchy. Run 'superblocks init' to initialize a new project.");
+                    }
+                },
+            },
+            {
+                title: "Checking for existing git repository...",
+                task: async (ctx) => {
+                    ctx.branchToShowCommitsFor = new Map();
+                    try {
+                        ctx.localBranchName =
+                            branch || (await (0, version_control_1.getCurrentGitBranchIfGit)()) || version_control_1.DEFAULT_BRANCH;
+                    }
+                    catch (e) {
+                        this.error(`Failed to check for existing git repository: ${e.message}. Please make sure to clone or initialize a git repository.`);
+                    }
+                },
+            },
+            {
+                title: "Checking for deleted Superblocks resources...",
+                task: async (ctx, task) => {
+                    var _a, _b;
+                    try {
+                        for (const [resourceId, resource] of Object.entries((_b = (_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.resources) !== null && _b !== void 0 ? _b : {})) {
+                            switch (resource === null || resource === void 0 ? void 0 : resource.resourceType) {
+                                case "APPLICATION": {
+                                    try {
+                                        await this.getSdk().fetchApplication({
+                                            applicationId: resourceId,
+                                            // signing check is not relevant to find deleted resources
+                                            skipSigningVerification: true,
+                                        });
+                                    }
+                                    catch (error) {
+                                        if (error instanceof util_1.NotFoundError) {
+                                            ctx.removedResourceIds.push(resourceId);
+                                        }
+                                        else {
+                                            throw error;
+                                        }
+                                    }
+                                    break;
+                                }
+                                case "BACKEND": {
+                                    try {
+                                        await this.getSdk().fetchApi({
+                                            apiId: resourceId,
+                                            // signing check is not relevant to find deleted resources
+                                            skipSigningVerification: true,
+                                        });
+                                    }
+                                    catch (error) {
+                                        if (error instanceof util_1.NotFoundError) {
+                                            ctx.removedResourceIds.push(resourceId);
+                                        }
+                                        else {
+                                            throw error;
+                                        }
+                                    }
+                                    break;
+                                }
+                                default: {
+                                    this.warn(`Unsupported resource type, resource: ${JSON.stringify(resource)}`);
+                                }
+                            }
+                        }
+                        if (ctx.removedResourceIds.length === 0) {
+                            return;
+                        }
+                        const listOfDeletedResources = ctx.removedResourceIds
+                            .map((id) => `- ${ctx.existingSuperblocksRootConfig.resources[id].location}`)
+                            .join("\n");
+                        const removeResourcesFromDisk = await task.prompt([
+                            {
+                                name: "removeResourcesFromDisk",
+                                type: "confirm",
+                                message: `Warning: The following resources could not be found in Superblocks.
+${listOfDeletedResources}
+
+Automatically removing resources from your local Superblocks project.
+
+Would you like to also delete these resources from your filesystem?`,
+                            },
+                        ]);
+                        if (removeResourcesFromDisk) {
+                            await (0, version_control_1.deleteResourcesAndUpdateRootConfig)(ctx.removedResourceIds, ctx.existingSuperblocksRootConfig, ctx.superblocksRootPath, ctx.superblocksRootConfigPath);
+                        }
+                    }
+                    catch (e) {
+                        this.warn(`Could not check for deleted Superblocks resources. Continuing...: ${e.message}`);
+                    }
+                },
+            },
+            {
+                task: async (ctx, task) => {
+                    task.title = `Determining what resource to show commits for...`;
+                    ctx.resourceIdToShowCommits = await this.getResourceIdToShowCommits(ctx, task, resourcePath);
+                },
+            },
+            {
+                task: async (ctx, task) => {
+                    var _a, _b;
+                    task.title = `Get commits for the resource from branch ${ctx.localBranchName}...`;
+                    const subtasks = [];
+                    const resourceId = ctx.resourceIdToShowCommits;
+                    const resource = (_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.resources[resourceId];
+                    const branchName = (_b = ctx.branchToShowCommitsFor.get(resourceId)) !== null && _b !== void 0 ? _b : ctx.localBranchName;
+                    switch (resource === null || resource === void 0 ? void 0 : resource.resourceType) {
+                        case "APPLICATION": {
+                            subtasks.push({
+                                title: `Fetching commits for application ${resource.location} from branch ${branchName}...`,
+                                task: async (_ctx, task) => {
+                                    const headers = {
+                                        [util_1.COMPONENT_EVENT_HEADER]: util_1.ComponentEvent.COMMITS,
+                                    };
+                                    try {
+                                        task.title += `: fetched`;
+                                        const applicationCommits = (await this.getSdk().fetchApplicationCommits({
+                                            applicationId: resourceId,
+                                            branch: branchName,
+                                            headers,
+                                            limit,
+                                            offset,
+                                        }));
+                                        this.printCommits(applicationCommits, branchName);
+                                        task.title += `: done`;
+                                    }
+                                    catch (e) {
+                                        if (e instanceof util_1.NotFoundError) {
+                                            task.title += `: not found in this branch. skipped`;
+                                        }
+                                        else {
+                                            throw e;
+                                        }
+                                    }
+                                },
+                            });
+                            break;
+                        }
+                        case "BACKEND": {
+                            subtasks.push({
+                                title: `Fetching commits for backend ${resource.location}...`,
+                                task: async (_ctx, task) => {
+                                    const apiCommits = await this.getSdk().fetchApiCommits({
+                                        apiId: resourceId,
+                                        branch: branchName,
+                                        limit,
+                                        offset,
+                                    });
+                                    task.title += `: fetched`;
+                                    this.printCommits(apiCommits, branchName);
+                                    task.title += `: done`;
+                                },
+                            });
+                            break;
+                        }
+                        default: {
+                            this.error(`Unsupported resource type, resource: ${JSON.stringify(resource)}
+                    `);
+                        }
+                    }
+                    return task.newListr(subtasks, {
+                        concurrent: true,
+                    });
+                },
+            },
+        ], {
+            concurrent: false,
+        });
+        return tasks;
+    }
+    async getResourceIdToShowCommits(ctx, task, resourcePath) {
+        var _a, _b, _c, _d, _e;
+        if (resourcePath) {
+            for (const [resourceId, resource] of Object.entries((_b = (_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.resources) !== null && _b !== void 0 ? _b : {})) {
+                if (resource.location === resourcePath) {
+                    return resourceId;
+                }
+            }
+            throw new Error(`No resource found with the given location: ${resourcePath}`);
+        }
+        const resourceConfig = await (0, util_1.getSuperblocksResourceConfigIfExists)();
+        if (resourceConfig) {
+            return resourceConfig.id;
+        }
+        const choices = [];
+        const initialSelections = [];
+        let counter = 0;
+        for (const [resourceId, resource] of Object.entries((_d = (_c = ctx.existingSuperblocksRootConfig) === null || _c === void 0 ? void 0 : _c.resources) !== null && _d !== void 0 ? _d : {})) {
+            if (ctx.removedResourceIds.includes(resourceId)) {
+                continue;
+            }
+            choices.push({
+                name: resourceId,
+                message: resource.location,
+            });
+            if (((_e = ctx.existingSuperblocksResourceConfig) === null || _e === void 0 ? void 0 : _e.id) === resourceId) {
+                initialSelections.push(counter);
+            }
+            counter++;
+        }
+        if (choices.length === 0) {
+            throw new Error("No resources found in the Superblocks project");
+        }
+        const resourceIdToShowCommitFor = choices.length === 1
+            ? [choices[0].name]
+            : await task.prompt([
+                {
+                    type: "Select",
+                    name: "resourceIdToShowCommits",
+                    message: `Select a resource to see commits (${version_control_1.SELECT_PROMPT_HELP})`,
+                    choices: choices,
+                    initial: initialSelections,
+                    validate: version_control_1.atLeastOneSelection,
+                    prefix: "▸",
+                    indicator: "◉",
+                },
+            ]);
+        return resourceIdToShowCommitFor;
+    }
+    printCommits(commits, branch) {
+        var _a;
+        if (commits.commits.length === 0) {
+            console.log("No commits have been created.");
+            return;
+        }
+        for (const commit of commits.commits) {
+            console.log(`commit ${commit.commitId}`, branch ? `(${branch})` : "");
+            console.log(`Author: ${(_a = commit.committer.name) !== null && _a !== void 0 ? _a : ""} <${commit.committer.email}>`);
+            console.log(`Date: ${new Date(commit.commitDate).toLocaleString()}`);
+            console.log(`Message: ${commit.commitMessage}`);
+            console.log("---");
+        }
+    }
+}
+Commits.description = "List Superblocks commits for a resource";
+Commits.examples = [
+    "<%= config.bin %> <%= command.id %>",
+    "<%= config.bin %> <%= command.id %>  apps/my-app",
+    "<%= config.bin %> <%= command.id %>  apps/my-app -b feature-branch",
+    "<%= config.bin %> <%= command.id %>  --limit 20",
+    "<%= config.bin %> <%= command.id %>  --offset 10",
+];
+Commits.flags = {
+    branch: core_1.Flags.string({
+        char: "b",
+        description: "Superblocks branch to show commits for, the current git branch will be used by default",
+    }),
+    limit: core_1.Flags.integer({
+        char: "l",
+        default: 10,
+        description: "Number of commits to be displayed, default is 10",
+    }),
+    offset: core_1.Flags.integer({
+        char: "o",
+        default: 0,
+        description: "Number of commits to be skipped before displaying by creation time, default is 0",
+    }),
+};
+Commits.args = {
+    resource_path: core_1.Args.string({
+        description: "Superblocks resource location to show commits for (i.e. apps/my-app)",
+        required: false,
+    }),
+};
+exports.default = Commits;

package/dist/commands/init.d.ts

@@ -4,6 +4,7 @@ export default class Initialize extends AuthenticatedCommand {
     static examples: string[];
     static flags: {
         mode: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        "skip-signing-verification": import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     static args: {
         resource_url: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;

package/dist/commands/init.js

@@ -21,6 +21,7 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
         }
     }
     createTasks(flags, args) {
+        const skipSigningVerification = flags["skip-signing-verification"];
         const tasks = new listr2_1.Listr([
             {
                 title: "Checking for existing Superblocks project...",
@@ -86,6 +87,7 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                                     applicationId: resourceId,
                                     branch: version_control_1.DEFAULT_BRANCH,
                                     headers,
+                                    skipSigningVerification,
                                 });
                                 if (!application) {
                                     throw new util_1.NotFoundError(`Application ${resourceId} was not found`);
@@ -96,7 +98,10 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                                 };
                             }
                             else if (resourceType === "BACKEND") {
-                                const api = await this.getSdk().fetchApi(resourceId);
+                                const api = await this.getSdk().fetchApi({
+                                    apiId: resourceId,
+                                    skipSigningVerification,
+                                });
                                 ctx.fetchedResources[api.id] = {
                                     resourceType,
                                     name: (0, version_control_1.extractApiName)(api),
@@ -143,6 +148,7 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                                             branch: version_control_1.DEFAULT_BRANCH,
                                             viewMode: ctx.viewMode,
                                             headers,
+                                            skipSigningVerification,
                                         }));
                                         task.title += `: fetched`;
                                         if (application) {
@@ -158,7 +164,12 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                                 subtasks.push({
                                     title: `Fetching backend ${resource.name}...`,
                                     task: async (_ctx, task) => {
-                                        const backend = await this.getSdk().fetchApi(resourceId, ctx.viewMode, version_control_1.DEFAULT_BRANCH);
+                                        const backend = await this.getSdk().fetchApi({
+                                            apiId: resourceId,
+                                            viewMode: ctx.viewMode,
+                                            branch: version_control_1.DEFAULT_BRANCH,
+                                            skipSigningVerification,
+                                        });
                                         task.title += `: fetched`;
                                         ctx.writtenResources[resourceId] =
                                             await (0, version_control_1.writeResourceToDisk)("BACKEND", resourceId, backend, process.cwd());
@@ -292,6 +303,11 @@ Initialize.flags = {
         description: "Pull mode",
         options: Object.keys(version_control_1.modeFlagValuesMap),
     }),
+    "skip-signing-verification": core_1.Flags.boolean({
+        char: "s",
+        description: "If true, signature verification for signing enabled organizations will be skipped.",
+        default: false,
+    }),
 };
 Initialize.args = {
     resource_url: core_1.Args.string({

package/dist/commands/migrate.js

@@ -121,8 +121,7 @@ class Migrate extends authenticated_command_1.AuthenticatedCommand {
     }
     async migrateSinglePageApplicationToMultiPage(applicationResource, superblocksRootPath) {
         const fileStructure = await (0, version_control_1.getFileStructureType)(superblocksRootPath, applicationResource.location);
-        if (fileStructure == version_control_1.FileStructureType.SINGLE_PAGE &&
-            (await this.getSdk().fetchCurrentUser()).flagBootstrap["server.multipage.enabled"]) {
+        if (fileStructure == version_control_1.FileStructureType.SINGLE_PAGE) {
             this.log(`Migrating single page application at ${applicationResource.location} to multi-page application...`);
             const singlePageApplication = await (0, version_control_1.readApplicationFromDisk)(superblocksRootPath, applicationResource.location);
             const multiPageApplication = {

package/dist/commands/pull.d.ts

@@ -5,6 +5,8 @@ export default class Pull extends AuthenticatedCommand {
     static flags: {
         mode: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         branch: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        "commit-id": import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        "skip-signing-verification": import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     static args: {
         resource_path: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;

package/dist/commands/pull.js

@@ -11,10 +11,10 @@ const version_control_1 = require("../common/version-control");
 class Pull extends authenticated_command_1.AuthenticatedCommand {
     async run() {
         const { flags, args } = await this.parse(Pull);
-        const tasks = this.createTasks(args.resource_path, flags.mode, flags.branch);
+        const tasks = this.createTasks(args.resource_path, flags.mode, flags.branch, flags["skip-signing-verification"], flags["commit-id"]);
         await tasks.run();
     }
-    createTasks(resourcePath, mode, branch) {
+    createTasks(resourcePath, mode, branch, skipSigningVerification = false, commitId) {
         const tasks = new listr2_1.Listr([
             {
                 title: "Checking for existing Superblocks project...",
@@ -60,6 +60,8 @@ class Pull extends authenticated_command_1.AuthenticatedCommand {
                                     try {
                                         await this.getSdk().fetchApplication({
                                             applicationId: resourceId,
+                                            // signing check is not relevant to find deleted resources
+                                            skipSigningVerification: true,
                                         });
                                     }
                                     catch (error) {
@@ -74,7 +76,11 @@ class Pull extends authenticated_command_1.AuthenticatedCommand {
                                 }
                                 case "BACKEND": {
                                     try {
-                                        await this.getSdk().fetchApi(resourceId);
+                                        await this.getSdk().fetchApi({
+                                            apiId: resourceId,
+                                            // signing check is not relevant to find deleted resources
+                                            skipSigningVerification: true,
+                                        });
                                     }
                                     catch (error) {
                                         if (error instanceof util_1.NotFoundError) {
@@ -143,11 +149,11 @@ Would you like to also delete these resources from your filesystem?`,
                                 catch (error) {
                                     if ((0, version_control_1.isCI)() && error instanceof sdk_1.ValidateGitSetupError) {
                                         this.log(`WARN: Failed to validate git setup for ${resourceTitle}. Skipping pull.\n\n${error.message}.`);
+                                        ctx.resourceIdsToSkip.add(resourceId);
                                     }
                                     else {
                                         throw error;
                                     }
-                                    ctx.resourceIdsToSkip.add(resourceId);
                                 }
                             },
                         });
@@ -157,13 +163,31 @@ Would you like to also delete these resources from your filesystem?`,
                     });
                 },
             },
+            {
+                task: async (ctx, task) => {
+                    return task.newListr([
+                        {
+                            title: `Filtering out resources with git validation errors...`,
+                            enabled: () => ctx.resourceIdsToSkip.size > 0,
+                            task: () => {
+                                // Remove resources to skip from list of resources to pull
+                                ctx.resourceIdsToPull = ctx.resourceIdsToPull.filter((id) => !ctx.resourceIdsToSkip.has(id));
+                            },
+                        },
+                    ]);
+                },
+            },
             {
                 task: async (ctx, task) => {
                     var _a, _b;
                     task.title = `Pulling resources from branch ${ctx.localBranchName}...`;
-                    const viewMode = await (0, version_control_1.getMode)(task, mode);
-                    // Remove resources to skip from list of resources to push
-                    ctx.resourceIdsToPull = ctx.resourceIdsToPull.filter((id) => !ctx.resourceIdsToSkip.has(id));
+                    let viewMode;
+                    if (commitId) {
+                        viewMode = "export-commit";
+                    }
+                    else {
+                        viewMode = await (0, version_control_1.getMode)(task, mode);
+                    }
                     const subtasks = [];
                     for (const resourceId of ctx.resourceIdsToPull) {
                         const resource = (_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.resources[resourceId];
@@ -180,22 +204,7 @@ Would you like to also delete these resources from your filesystem?`,
                                             task.title += `: fetched`;
                                             const fileStructureType = await (0, version_control_1.getFileStructureType)(ctx.superblocksRootPath, resource.location);
                                             if (fileStructureType === version_control_1.FileStructureType.SINGLE_PAGE) {
-                                                const multiPageEnabled = (await this.getSdk().fetchCurrentUser()).flagBootstrap["server.multipage.enabled"];
-                                                if (multiPageEnabled) {
-                                                    this.error(`Application files at ${resource.location} are in single page format, but the multi-page feature is enabled for your account. Please run superblocks migrate to convert your application to multi-page format and commit the changes before pulling.`);
-                                                }
-                                                const application = await this.getSdk().fetchApplicationWithComponents({
-                                                    applicationId: resourceId,
-                                                    branch: branchName,
-                                                    viewMode,
-                                                    headers,
-                                                    fetchSinglePageApplication: true,
-                                                });
-                                                if (!application) {
-                                                    return;
-                                                }
-                                                ctx.writtenResources[resourceId] =
-                                                    await (0, version_control_1.writeResourceToDisk)("APPLICATION", resourceId, application, ctx.superblocksRootPath, resource.location);
+                                                this.error(`Application files at ${resource.location} are in single page format, but the multi-page feature is enabled for your account. Please run superblocks migrate to convert your application to multi-page format and commit the changes before pulling.`);
                                             }
                                             else {
                                                 const application = (await this.getSdk().fetchApplicationWithComponents({
@@ -203,6 +212,8 @@ Would you like to also delete these resources from your filesystem?`,
                                                     branch: branchName,
                                                     viewMode,
                                                     headers,
+                                                    commitId,
+                                                    skipSigningVerification,
                                                 }));
                                                 if (!application) {
                                                     return;
@@ -230,7 +241,13 @@ Would you like to also delete these resources from your filesystem?`,
                                 subtasks.push({
                                     title: `Fetching backend ${resource.location}...`,
                                     task: async (_ctx, task) => {
-                                        const backend = await this.getSdk().fetchApi(resourceId, viewMode, branchName);
+                                        const backend = await this.getSdk().fetchApi({
+                                            apiId: resourceId,
+                                            viewMode,
+                                            branch: branchName,
+                                            commitId,
+                                            skipSigningVerification,
+                                        });
                                         task.title += `: fetched`;
                                         ctx.writtenResources[resourceId] =
                                             await (0, version_control_1.writeResourceToDisk)("BACKEND", resourceId, backend, ctx.superblocksRootPath, resource.location);
@@ -256,23 +273,23 @@ Would you like to also delete these resources from your filesystem?`,
         return tasks;
     }
     async getResourceIdsToPull(ctx, task, resourcePath) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e;
         if (resourcePath) {
             for (const [resourceId, resource] of Object.entries((_b = (_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.resources) !== null && _b !== void 0 ? _b : {})) {
                 if (resource.location === resourcePath) {
                     return [resourceId];
                 }
             }
-            const resource = Object.entries((_d = (_c = ctx.existingSuperblocksRootConfig) === null || _c === void 0 ? void 0 : _c.resources) !== null && _d !== void 0 ? _d : {}).find(([, resource]) => resource.location === resourcePath);
-            if (resource) {
-                return [resource[0]];
-            }
             throw new Error(`No resource found with the given location: ${resourcePath}`);
         }
+        const resourceConfig = await (0, util_1.getSuperblocksResourceConfigIfExists)();
+        if (resourceConfig) {
+            return [resourceConfig.id];
+        }
         const choices = [];
         const initialSelections = [];
         let counter = 0;
-        for (const [resourceId, resource] of Object.entries((_f = (_e = ctx.existingSuperblocksRootConfig) === null || _e === void 0 ? void 0 : _e.resources) !== null && _f !== void 0 ? _f : {})) {
+        for (const [resourceId, resource] of Object.entries((_d = (_c = ctx.existingSuperblocksRootConfig) === null || _c === void 0 ? void 0 : _c.resources) !== null && _d !== void 0 ? _d : {})) {
             if (ctx.removedResourceIds.includes(resourceId)) {
                 continue;
             }
@@ -280,7 +297,7 @@ Would you like to also delete these resources from your filesystem?`,
                 name: resourceId,
                 message: resource.location,
             });
-            if (((_g = ctx.existingSuperblocksResourceConfig) === null || _g === void 0 ? void 0 : _g.id) === resourceId) {
+            if (((_e = ctx.existingSuperblocksResourceConfig) === null || _e === void 0 ? void 0 : _e.id) === resourceId) {
                 initialSelections.push(counter);
             }
             counter++;
@@ -307,6 +324,7 @@ Pull.examples = [
     "<%= config.bin %> <%= command.id %>",
     "<%= config.bin %> <%= command.id %>  apps/my-app",
     "<%= config.bin %> <%= command.id %>  apps/my-app -b feature-branch",
+    "<%= config.bin %> <%= command.id %>  apps/my-app -c commit-id",
 ];
 Pull.flags = {
     mode: core_1.Flags.string({
@@ -319,6 +337,15 @@ Pull.flags = {
         char: "b",
         description: "Superblocks branch to pull from, the current git branch will be used by default",
     }),
+    "commit-id": core_1.Flags.string({
+        char: "c",
+        description: "Superblocks commit id to pull, the live edit will be used by default",
+    }),
+    "skip-signing-verification": core_1.Flags.boolean({
+        char: "s",
+        description: "If true, signature verification for signing enabled organizations will be skipped.",
+        default: false,
+    }),
 };
 Pull.args = {
     resource_path: core_1.Args.string({

package/dist/commands/push.d.ts

@@ -4,6 +4,7 @@ export default class Push extends AuthenticatedCommand {
     static examples: string[];
     static flags: {
         branch: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        "skip-commit": import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     static args: {
         resource_path: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;

package/dist/commands/push.js

@@ -12,10 +12,10 @@ const version_control_1 = require("../common/version-control");
 class Push extends authenticated_command_1.AuthenticatedCommand {
     async run() {
         const { flags, args } = await this.parse(Push);
-        const tasks = this.createTasks(args.resource_path, flags.branch);
+        const tasks = this.createTasks(args.resource_path, flags.branch, flags["skip-commit"]);
         await tasks.run();
     }
-    createTasks(resourceName, branch) {
+    createTasks(resourceName, branch, skipCommit) {
         const tasks = new listr2_1.Listr([
             {
                 title: "Checking for existing Superblocks project...",
@@ -41,16 +41,29 @@ class Push extends authenticated_command_1.AuthenticatedCommand {
                 title: "Checking for existing git repository...",
                 task: async (ctx) => {
                     ctx.branchToPushTo = new Map();
+                    if (skipCommit) {
+                        const repoState = await (0, version_control_1.getLocalGitRepoState)();
+                        if (repoState.status === "NO_GIT") {
+                            if (!branch) {
+                                this.error(`No git repository found in the current folder hierarchy. Please make sure to pass branch name. E.g. superblocks push --branch feature-branch. 
+If resource is not connected to git repository, pass "main" as branch name.`);
+                            }
+                            ctx.localBranchName = branch || version_control_1.DEFAULT_BRANCH;
+                            return;
+                        }
+                    }
                     try {
                         ctx.localBranchName =
                             branch || (await (0, version_control_1.getCurrentGitBranchIfGit)()) || version_control_1.DEFAULT_BRANCH;
-                        [ctx.headCommitId, ctx.headCommitMessage] = await (0, version_control_1.getHeadCommit)(ctx.localBranchName);
+                        if (!skipCommit) {
+                            [ctx.headCommitId, ctx.headCommitMessage] = await (0, version_control_1.getHeadCommit)(ctx.localBranchName);
+                        }
                     }
                     catch (e) {
                         this.error(`Failed to check for existing git repository: ${e.message}. Please make sure to clone or initialize a git repository.`);
                     }
                     const isDirtyRepo = await (0, version_control_1.isGitRepoDirty)();
-                    if (isDirtyRepo) {
+                    if (isDirtyRepo && !skipCommit) {
                         this.error(`Your git repository is dirty. Please commit or stash your changes before pushing to Superblocks.`);
                     }
                 },
@@ -59,6 +72,10 @@ class Push extends authenticated_command_1.AuthenticatedCommand {
                 title: "Checking for deleted Superblocks resources...",
                 task: async (ctx, task) => {
                     var _a, _b;
+                    if ((0, version_control_1.isCI)()) {
+                        this.log("Skipping check for deleted Superblocks resources in CI environment.");
+                        return;
+                    }
                     try {
                         for (const [resourceId, resource] of Object.entries((_b = (_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.resources) !== null && _b !== void 0 ? _b : {})) {
                             switch (resource === null || resource === void 0 ? void 0 : resource.resourceType) {
@@ -66,6 +83,8 @@ class Push extends authenticated_command_1.AuthenticatedCommand {
                                     try {
                                         await this.getSdk().fetchApplication({
                                             applicationId: resourceId,
+                                            // signing check is not relevant to find deleted resources
+                                            skipSigningVerification: true,
                                         });
                                     }
                                     catch (error) {
@@ -80,7 +99,11 @@ class Push extends authenticated_command_1.AuthenticatedCommand {
                                 }
                                 case "BACKEND": {
                                     try {
-                                        await this.getSdk().fetchApi(resourceId);
+                                        await this.getSdk().fetchApi({
+                                            apiId: resourceId,
+                                            // signing check is not relevant to find deleted resources
+                                            skipSigningVerification: true,
+                                        });
                                     }
                                     catch (error) {
                                         if (error instanceof util_1.NotFoundError) {
@@ -133,6 +156,10 @@ Would you like to also delete these resources from your filesystem?`,
             {
                 task: async (ctx, task) => {
                     var _a, _b;
+                    if (skipCommit) {
+                        this.log("Skipping git validation as --skip-commit flag is set");
+                        return;
+                    }
                     task.title = `Validating git configuration...`;
                     const subtasks = [];
                     ctx.resourceIdsToSkip = new Set();
@@ -150,11 +177,11 @@ Would you like to also delete these resources from your filesystem?`,
                                 catch (error) {
                                     if ((0, version_control_1.isCI)() && error instanceof sdk_1.ValidateGitSetupError) {
                                         this.log(`WARN: Failed to validate git setup for ${resourceTitle}. Skipping push.\n\n${error.message}.`);
+                                        ctx.resourceIdsToSkip.add(resourceId);
                                     }
                                     else {
                                         throw error;
                                     }
-                                    ctx.resourceIdsToSkip.add(resourceId);
                                 }
                             },
                         });
@@ -164,6 +191,23 @@ Would you like to also delete these resources from your filesystem?`,
                     });
                 },
             },
+            {
+                task: async (ctx, task) => {
+                    if (skipCommit) {
+                        return;
+                    }
+                    return task.newListr([
+                        {
+                            title: `Filtering out resources with git validation errors...`,
+                            enabled: () => ctx.resourceIdsToSkip.size > 0,
+                            task: () => {
+                                // Remove resources to skip from list of resources to push
+                                ctx.resourceIdsToPush = ctx.resourceIdsToPush.filter((id) => !ctx.resourceIdsToSkip.has(id));
+                            },
+                        },
+                    ]);
+                },
+            },
             {
                 task: async (ctx, task) => {
                     var _a, _b;
@@ -192,8 +236,6 @@ Would you like to also delete these resources from your filesystem?`,
                 task: async (ctx, task) => {
                     var _a;
                     task.title = `Pushing resources to branch ${ctx.localBranchName}...`;
-                    // Remove resources to skip from list of resources to push
-                    ctx.resourceIdsToPush = ctx.resourceIdsToPush.filter((id) => !ctx.resourceIdsToSkip.has(id));
                     const subtasks = [];
                     const superblocksRootPath = node_path_1.default.resolve(node_path_1.default.dirname(ctx.superblocksRootConfigPath), "..");
                     for (const resourceId of ctx.resourceIdsToPush) {
@@ -205,33 +247,30 @@ Would you like to also delete these resources from your filesystem?`,
                                     task: async (_ctx, task) => {
                                         var _a;
                                         const fileStructureType = await (0, version_control_1.getFileStructureType)(superblocksRootPath, resource.location);
-                                        if (fileStructureType === version_control_1.FileStructureType.SINGLE_PAGE &&
-                                            (await this.getSdk().fetchCurrentUser()).flagBootstrap["server.multipage.enabled"]) {
-                                            this.error(`Application files at ${resource.location} are in single page format, but the multi-page feature is enabled for your account. Please run \`superblocks migrate\` to convert your application to multi-page format and commit the changes before pushing.`);
+                                        if (fileStructureType === version_control_1.FileStructureType.SINGLE_PAGE) {
+                                            this.error(`Application files at ${resource.location} are in single page format, but the multi-page feature is enabled for your account. To resolve this issue, you can make a commit to this branch from Superblocks to convert the file structure to multi-page format (See docs: https://docs.superblocks.com/applications/multi-page/converting-single-page-to-multi-page#handling-outstanding-branches-created-before-multi-page). Alternatively, you can run \`superblocks migrate\` to convert your file structure and commit the changes before pushing.`);
                                         }
                                         const localGitRepoState = await (0, version_control_1.getLocalGitRepoState)(ctx.localBranchName);
-                                        const applicationConfig = fileStructureType === version_control_1.FileStructureType.SINGLE_PAGE
-                                            ? {
-                                                ...(await (0, version_control_1.readApplicationFromDisk)(superblocksRootPath, resource.location)),
-                                                commitId: ctx.headCommitId,
-                                                commitMessage: ctx.headCommitMessage,
-                                                gitState: localGitRepoState,
-                                            }
-                                            : {
-                                                ...(await (0, version_control_1.readMultiPageApplicationFromDisk)(superblocksRootPath, resource.location)),
-                                                commitId: ctx.headCommitId,
-                                                commitMessage: ctx.headCommitMessage,
-                                                gitState: localGitRepoState,
-                                            };
+                                        const applicationConfig = {
+                                            ...(await (0, version_control_1.readMultiPageApplicationFromDisk)(superblocksRootPath, resource.location)),
+                                            commitId: ctx.headCommitId,
+                                            commitMessage: ctx.headCommitMessage,
+                                            gitState: localGitRepoState,
+                                            skipCommit,
+                                        };
                                         task.title += `: read from disk`;
                                         try {
                                             const branch = (_a = ctx.branchToPushTo.get(resourceId)) !== null && _a !== void 0 ? _a : ctx.localBranchName;
-                                            task.title += `: going to push commit ${applicationConfig.commitId} to branch ${branch}`;
+                                            if (skipCommit) {
+                                                task.title += `: going to push update live edits on branch ${branch}`;
+                                            }
+                                            else {
+                                                task.title += `: going to push commit ${applicationConfig.commitId} to branch ${branch}`;
+                                            }
                                             await this.getSdk().pushApplication({
                                                 applicationId: resourceId,
                                                 applicationConfig,
                                                 branch,
-                                                multiPage: fileStructureType === version_control_1.FileStructureType.MULTI_PAGE,
                                             });
                                         }
                                         catch (error) {
@@ -262,11 +301,17 @@ Would you like to also delete these resources from your filesystem?`,
                                             commitId: ctx.headCommitId,
                                             commitMessage: ctx.headCommitMessage,
                                             gitState: localGitRepoState,
+                                            skipCommit,
                                         };
                                         task.title += `: read from disk`;
                                         try {
                                             const branch = (_a = ctx.branchToPushTo.get(resourceId)) !== null && _a !== void 0 ? _a : ctx.localBranchName;
-                                            task.title += `: going to push commit ${apiConfig.commitId} to branch ${branch}`;
+                                            if (skipCommit) {
+                                                task.title += `: going to push update live edits on branch ${branch}`;
+                                            }
+                                            else {
+                                                task.title += `: going to push commit ${apiConfig.commitId} to branch ${branch}`;
+                                            }
                                             await this.getSdk().pushApi({
                                                 apiId: resourceId,
                                                 apiConfig,
@@ -323,6 +368,10 @@ Would you like to also delete these resources from your filesystem?`,
             }
             throw new Error(`No resource found with the given location: ${resourcePath}`);
         }
+        const resourceConfig = await (0, util_1.getSuperblocksResourceConfigIfExists)();
+        if (resourceConfig) {
+            return [resourceConfig.id];
+        }
         const choices = [];
         const initialSelections = [];
         let counter = 0;
@@ -359,12 +408,18 @@ Push.examples = [
     "<%= config.bin %> <%= command.id %>",
     "<%= config.bin %> <%= command.id %>  apps/my-app",
     "<%= config.bin %> <%= command.id %>  apps/my-app -b feature-branch",
+    "<%= config.bin %> <%= command.id %>  apps/my-app --skip-commit",
 ];
 Push.flags = {
     branch: core_1.Flags.string({
         char: "b",
         description: "Superblocks branch to push to, the current git branch will be used by default",
     }),
+    "skip-commit": core_1.Flags.boolean({
+        char: "s",
+        default: false,
+        description: "If true, push command will only update live edit state along with signature without creating a commit.",
+    }),
 };
 Push.args = {
     resource_path: core_1.Args.string({

package/dist/common/version-control.d.ts

@@ -1,4 +1,5 @@
-import { ApiWrapper, ApplicationWrapper, MultiPageApplicationWrapper, ViewMode } from "@superblocksteam/sdk";
+import { ApiWrapper, ApplicationWrapper, MultiPageApplicationWrapper } from "@superblocksteam/sdk";
+import { ViewMode } from "@superblocksteam/sdk/dist/types";
 import { LocalGitRepoState, SuperblocksMonorepoConfig } from "@superblocksteam/util";
 import { VersionedResourceConfig } from "@superblocksteam/util";
 export declare const LATEST_EDITS_MODE = "latest-edits";

package/dist/common/version-control.js

@@ -604,22 +604,6 @@ function writeApi(api, originalApiName, appDirName) {
     };
     return handleApi();
 }
-function validateSinglePageApplication(applicationConfig, superblocksRootPath, location) {
-    // validate app level APIs
-    for (const apiName of Object.values(applicationConfig.apis)) {
-        const apiPath = node_path_1.default.resolve(superblocksRootPath, location, "apis", `${slugifyName(apiName)}.yaml`);
-        const validateApiError = validateYamlFile(apiPath);
-        if (validateApiError) {
-            return validateApiError;
-        }
-    }
-    // validate page
-    const pagePath = node_path_1.default.resolve(superblocksRootPath, location, "page.yaml");
-    const validatePageError = validateYamlFile(pagePath);
-    if (validatePageError) {
-        return validatePageError;
-    }
-}
 async function validateMultiPageApplication(applicationConfig, superblocksRootPath, location) {
     var _a;
     // validate app level APIs
@@ -656,7 +640,6 @@ async function validateLocalResource(superblocksRootPath, resource) {
             if (!(await fs.pathExists(applicationConfigPath))) {
                 return `File ${relativeToCurrentDir(applicationConfigPath)} not found. Superblocks CLI commands cannot function without it.`;
             }
-            let fileStructureType = undefined;
             let applicationConfig = undefined;
             try {
                 // make sure it's a well-formed application config
@@ -664,8 +647,6 @@ async function validateLocalResource(superblocksRootPath, resource) {
                 if (!applicationConfig) {
                     throw new Error();
                 }
-                fileStructureType =
-                    getFileStructureTypeFromResourceConfig(applicationConfig);
             }
             catch {
                 return `File ${relativeToCurrentDir(applicationConfigPath)} is not a valid JSON file. Please be sure it's valid JSON and rerun the command.`;
@@ -678,21 +659,9 @@ async function validateLocalResource(superblocksRootPath, resource) {
             catch {
                 return `File ${relativeToCurrentDir(applicationYamlPath)} is not a valid YAML file. Please be sure it's valid YAML and rerun the command.`;
             }
-            switch (fileStructureType) {
-                case FileStructureType.SINGLE_PAGE: {
-                    validateSinglePageApplication(applicationConfig, superblocksRootPath, resource.location);
-                    break;
-                }
-                case FileStructureType.MULTI_PAGE: {
-                    const validationError = validateMultiPageApplication(applicationConfig, superblocksRootPath, resource.location);
-                    if (validationError) {
-                        return validationError;
-                    }
-                    break;
-                }
-                default: {
-                    return `Invalid file structure type ${fileStructureType}`;
-                }
+            const validationError = validateMultiPageApplication(applicationConfig, superblocksRootPath, resource.location);
+            if (validationError) {
+                return validationError;
             }
             break;
         }

package/oclif.manifest.json

@@ -1,6 +1,54 @@
 {
-  "version": "1.8.0",
+  "version": "1.9.0",
   "commands": {
+    "commits": {
+      "id": "commits",
+      "description": "List Superblocks commits for a resource",
+      "strict": true,
+      "pluginName": "@superblocksteam/cli",
+      "pluginAlias": "@superblocksteam/cli",
+      "pluginType": "core",
+      "aliases": [],
+      "examples": [
+        "<%= config.bin %> <%= command.id %>",
+        "<%= config.bin %> <%= command.id %>  apps/my-app",
+        "<%= config.bin %> <%= command.id %>  apps/my-app -b feature-branch",
+        "<%= config.bin %> <%= command.id %>  --limit 20",
+        "<%= config.bin %> <%= command.id %>  --offset 10"
+      ],
+      "flags": {
+        "branch": {
+          "name": "branch",
+          "type": "option",
+          "char": "b",
+          "description": "Superblocks branch to show commits for, the current git branch will be used by default",
+          "multiple": false
+        },
+        "limit": {
+          "name": "limit",
+          "type": "option",
+          "char": "l",
+          "description": "Number of commits to be displayed, default is 10",
+          "multiple": false,
+          "default": 10
+        },
+        "offset": {
+          "name": "offset",
+          "type": "option",
+          "char": "o",
+          "description": "Number of commits to be skipped before displaying by creation time, default is 0",
+          "multiple": false,
+          "default": 0
+        }
+      },
+      "args": {
+        "resource_path": {
+          "name": "resource_path",
+          "description": "Superblocks resource location to show commits for (i.e. apps/my-app)",
+          "required": false
+        }
+      }
+    },
     "init": {
       "id": "init",
       "description": "Interactively configure the current directory as a Superblocks project or initialize new services in an already configured Superblocks project directory",
@@ -25,6 +73,13 @@
             "most-recent-commit",
             "deployed"
           ]
+        },
+        "skip-signing-verification": {
+          "name": "skip-signing-verification",
+          "type": "boolean",
+          "char": "s",
+          "description": "If true, signature verification for signing enabled organizations will be skipped.",
+          "allowNo": false
         }
       },
       "args": {
@@ -79,7 +134,8 @@
       "examples": [
         "<%= config.bin %> <%= command.id %>",
         "<%= config.bin %> <%= command.id %>  apps/my-app",
-        "<%= config.bin %> <%= command.id %>  apps/my-app -b feature-branch"
+        "<%= config.bin %> <%= command.id %>  apps/my-app -b feature-branch",
+        "<%= config.bin %> <%= command.id %>  apps/my-app -c commit-id"
       ],
       "flags": {
         "mode": {
@@ -101,6 +157,20 @@
           "char": "b",
           "description": "Superblocks branch to pull from, the current git branch will be used by default",
           "multiple": false
+        },
+        "commit-id": {
+          "name": "commit-id",
+          "type": "option",
+          "char": "c",
+          "description": "Superblocks commit id to pull, the live edit will be used by default",
+          "multiple": false
+        },
+        "skip-signing-verification": {
+          "name": "skip-signing-verification",
+          "type": "boolean",
+          "char": "s",
+          "description": "If true, signature verification for signing enabled organizations will be skipped.",
+          "allowNo": false
         }
       },
       "args": {
@@ -122,7 +192,8 @@
       "examples": [
         "<%= config.bin %> <%= command.id %>",
         "<%= config.bin %> <%= command.id %>  apps/my-app",
-        "<%= config.bin %> <%= command.id %>  apps/my-app -b feature-branch"
+        "<%= config.bin %> <%= command.id %>  apps/my-app -b feature-branch",
+        "<%= config.bin %> <%= command.id %>  apps/my-app --skip-commit"
       ],
       "flags": {
         "branch": {
@@ -131,6 +202,13 @@
           "char": "b",
           "description": "Superblocks branch to push to, the current git branch will be used by default",
           "multiple": false
+        },
+        "skip-commit": {
+          "name": "skip-commit",
+          "type": "boolean",
+          "char": "s",
+          "description": "If true, push command will only update live edit state along with signature without creating a commit.",
+          "allowNo": false
         }
       },
       "args": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/cli",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "Official Superblocks CLI",
   "bin": {
     "superblocks": "bin/run"
@@ -18,11 +18,11 @@
     "@oclif/core": "^2.11.7",
     "@oclif/plugin-help": "^5.2.16",
     "@oclif/plugin-plugins": "^3.1.10",
-    "@superblocksteam/css-plugin": "1.8.0",
-    "@superblocksteam/react-shim": "1.8.0",
-    "@superblocksteam/sdk": "1.8.0",
-    "@superblocksteam/util": "1.8.0",
-    "@superblocksteam/vite-custom-component-reload-plugin": "1.8.0",
+    "@superblocksteam/css-plugin": "1.9.0",
+    "@superblocksteam/react-shim": "1.9.0",
+    "@superblocksteam/sdk": "1.9.0",
+    "@superblocksteam/util": "1.9.0",
+    "@superblocksteam/vite-custom-component-reload-plugin": "1.9.0",
     "@vitejs/plugin-react": "^4.1.0",
     "colorette": "^2.0.19",
     "enquirer": "^2.3.6",