@apso/cli 0.23.0 → 0.25.0

package/dist/commands/deploy.js

@@ -10,6 +10,7 @@ const git = tslib_1.__importStar(require("../lib/git"));
 const apsorc_parser_1 = require("../lib/apsorc-parser");
 const sandbox_1 = require("../lib/migrate/sandbox");
 const spinner_1 = require("../lib/utils/spinner");
+const interactive_1 = require("../lib/utils/interactive");
 class Deploy extends base_command_1.default {
     async run() {
         const { flags } = await this.parse(Deploy);
@@ -78,6 +79,9 @@ class Deploy extends base_command_1.default {
         }
         // Confirmation
         if (!flags.yes && migrationCount > 0) {
+            if (!(0, interactive_1.isInteractive)()) {
+                this.error((0, interactive_1.missingFlag)(`About to deploy ${migrationCount} migration statement(s). Pass --yes to proceed.`));
+            }
             const inquirer = await Promise.resolve().then(() => tslib_1.__importStar(require("inquirer")));
             const { confirm } = await inquirer.default.prompt([
                 {
@@ -136,9 +140,31 @@ class Deploy extends base_command_1.default {
         git.initRepo(cwd);
         // Pick the repo: prefer what the local project is already wired to, then the
         // service's connected repo, then --repo, then ask.
-        const conn = await services_1.githubApi.getConnection();
+        let conn = await services_1.githubApi.getConnection();
         if (!conn.connected || !conn.connectionId) {
-            this.error("GitHub is not connected. Run 'apso github connect' first, then re-run deploy.");
+            // Connecting GitHub is a browser OAuth flow a machine can't complete.
+            // Headless: fail with instructions. Interactive: offer to launch it now
+            // (opens the browser), wait for the human, then continue the deploy.
+            if (!(0, interactive_1.isInteractive)()) {
+                this.error("GitHub is not connected. Run 'apso github connect' first, then re-run deploy.");
+            }
+            const inquirer = await Promise.resolve().then(() => tslib_1.__importStar(require("inquirer")));
+            const { connectNow } = await inquirer.default.prompt([
+                {
+                    type: "confirm",
+                    name: "connectNow",
+                    message: "GitHub is not connected (required to push code). Connect now? This opens your browser.",
+                    default: true,
+                },
+            ]);
+            if (!connectNow) {
+                this.error("GitHub connection is required to deploy. Run 'apso github connect' when ready, then re-run deploy.");
+            }
+            await this.config.runCommand("github:connect", []);
+            conn = await services_1.githubApi.getConnection();
+            if (!conn.connected || !conn.connectionId) {
+                this.error("GitHub still isn't connected. Complete 'apso github connect' and re-run deploy.");
+            }
         }
         let repoFullName = git.localRepoFullName(cwd) || service.githubRepo || repoFlag;
         if (!repoFullName) {

package/dist/commands/init.js

@@ -10,6 +10,8 @@ const base_command_1 = tslib_1.__importDefault(require("../lib/base-command"));
 const config_1 = require("../lib/config");
 const services_1 = require("../lib/api/services");
 const upgrade_1 = require("../lib/upgrade");
+const interactive_1 = require("../lib/utils/interactive");
+const config_2 = require("../lib/config");
 const template_1 = require("../lib/utils/template");
 class Init extends base_command_1.default {
     async run() {
@@ -28,18 +30,28 @@ class Init extends base_command_1.default {
         await (isAuthenticated ? this.runAuthenticated(flags) : this.runOffline(flags));
     }
     async runAuthenticated(flags) {
-        // Ask: create new or clone existing
-        const { action } = await inquirer_1.default.prompt([
-            {
-                type: "list",
-                name: "action",
-                message: "What would you like to do?",
-                choices: [
-                    { name: "Create a new project", value: "create" },
-                    { name: "Clone an existing project", value: "clone" },
-                ],
-            },
-        ]);
+        // Headless: init is the guided human path; require the essentials up-front so
+        // no prompt is reached. Agents should prefer 'apso generate' + 'apso link --create'.
+        if (!(0, interactive_1.isInteractive)() && (!flags.name || !flags.language)) {
+            this.error((0, interactive_1.missingFlag)("apso init needs --name and --language non-interactively (or use 'apso generate' + 'apso link --create')."));
+        }
+        // Ask: create new or clone existing. Headless: default to "create" (the
+        // scaffold path); requires --name/--language, which createNew enforces.
+        let action = "create";
+        if ((0, interactive_1.isInteractive)()) {
+            const answer = await inquirer_1.default.prompt([
+                {
+                    type: "list",
+                    name: "action",
+                    message: "What would you like to do?",
+                    choices: [
+                        { name: "Create a new project", value: "create" },
+                        { name: "Clone an existing project", value: "clone" },
+                    ],
+                },
+            ]);
+            action = answer.action;
+        }
         await (action === "clone" ? this.cloneExisting() : this.createNew(flags));
     }
     async cloneExisting() {
@@ -158,26 +170,41 @@ class Init extends base_command_1.default {
         if (!resolvedPath.startsWith(path.resolve(process.cwd()))) {
             this.error("Invalid project name: path traversal detected");
         }
-        // Select workspace
+        // Select workspace: active workspace (apso use), else prompt (interactive),
+        // else error headless.
         const workspaces = await services_1.workspacesApi.list();
         if (workspaces.length === 0) {
             this.error("No workspaces found. Create a workspace at https://app.apso.cloud first.");
         }
-        const { workspace } = await inquirer_1.default.prompt([
-            {
-                type: "list",
-                name: "workspace",
-                message: "Select a workspace:",
-                choices: workspaces.map((ws) => ({
-                    name: `${ws.name} (${ws.slug})`,
-                    value: ws,
-                })),
-            },
-        ]);
+        const activeSlug = config_2.globalConfig.read().activeWorkspaceSlug;
+        let workspace = activeSlug
+            ? workspaces.find((w) => w.slug === activeSlug)
+            : undefined;
+        if (!workspace) {
+            if (!(0, interactive_1.isInteractive)()) {
+                this.error((0, interactive_1.missingFlag)("Set a workspace first with 'apso use <slug>'."));
+            }
+            const answer = await inquirer_1.default.prompt([
+                {
+                    type: "list",
+                    name: "workspace",
+                    message: "Select a workspace:",
+                    choices: workspaces.map((ws) => ({
+                        name: `${ws.name} (${ws.slug})`,
+                        value: ws,
+                    })),
+                },
+            ]);
+            workspace = answer.workspace;
+        }
+        if (!workspace) {
+            throw new Error("No workspace selected.");
+        }
+        const ws = workspace;
         // Create service on platform
-        this.log(`Creating service "${projectName}" in workspace "${workspace.name}"...`);
+        this.log(`Creating service "${projectName}" in workspace "${ws.name}"...`);
         const serviceName = projectName;
-        const service = await (0, upgrade_1.withUpgradeRetry)(() => services_1.servicesApi.create(workspace.id, {
+        const service = await (0, upgrade_1.withUpgradeRetry)(() => services_1.servicesApi.create(ws.id, {
             name: serviceName,
         }));
         // Clone template
@@ -196,6 +223,12 @@ class Init extends base_command_1.default {
         this.log(`\nProject created at ${projectPath}`);
         this.log(`Language: ${language}`);
         this.log(`Linked to workspace "${workspace.name}" / service "${service.name}"`);
+        this.log("");
+        this.log("Next steps:");
+        this.log(`  cd ${projectName}`);
+        this.log("  # edit .apsorc to shape your schema, then:");
+        this.log("  apso generate            # scaffold code from the schema");
+        this.log("  apso deploy              # ship it (prompts to connect GitHub if needed)");
     }
     async runOffline(flags) {
         // Prompt for name if not provided

package/dist/commands/link.d.ts

@@ -5,6 +5,7 @@ export default class Link extends BaseCommand {
     static flags: {
         workspace: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         service: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        create: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         force: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;

package/dist/commands/link.js

@@ -9,6 +9,7 @@ const base_command_1 = tslib_1.__importDefault(require("../lib/base-command"));
 const config_1 = require("../lib/config");
 const services_1 = require("../lib/api/services");
 const upgrade_1 = require("../lib/upgrade");
+const interactive_1 = require("../lib/utils/interactive");
 class Link extends base_command_1.default {
     async run() {
         const { flags } = await this.parse(Link);
@@ -24,6 +25,9 @@ class Link extends base_command_1.default {
         // Check if already linked
         if (config_1.projectLink.exists() && !flags.force) {
             const existing = config_1.projectLink.read();
+            if (!(0, interactive_1.isInteractive)()) {
+                this.error((0, interactive_1.missingFlag)(`Already linked to ${existing === null || existing === void 0 ? void 0 : existing.workspaceSlug}/${existing === null || existing === void 0 ? void 0 : existing.serviceSlug}. Pass --force to overwrite.`));
+            }
             const { confirm } = await inquirer_1.default.prompt([
                 {
                     type: "confirm",
@@ -37,16 +41,24 @@ class Link extends base_command_1.default {
                 return;
             }
         }
-        // Determine workspace
+        // Determine workspace: --workspace flag, then the active workspace, then a
+        // prompt (interactive only).
         let workspace;
+        const active = config_1.globalConfig.read();
         if (flags.workspace) {
             workspace = await services_1.workspacesApi.get(flags.workspace);
         }
+        else if (active.activeWorkspaceSlug) {
+            workspace = await services_1.workspacesApi.get(active.activeWorkspaceSlug);
+        }
         else {
             const workspaces = await services_1.workspacesApi.list();
             if (workspaces.length === 0) {
                 this.error("No workspaces found. Create a workspace at https://app.apso.cloud first.");
             }
+            if (!(0, interactive_1.isInteractive)()) {
+                this.error((0, interactive_1.missingFlag)("Pass --workspace <slug> or set one with 'apso use'."));
+            }
             const response = await inquirer_1.default.prompt([
                 {
                     type: "list",
@@ -60,11 +72,19 @@ class Link extends base_command_1.default {
             ]);
             workspace = response.workspace;
         }
-        // Determine service
+        // Determine service: --service links an existing one, --create makes a new
+        // one, otherwise prompt (interactive only).
         let service;
         if (flags.service) {
             service = await services_1.servicesApi.get(workspace.id, flags.service);
         }
+        else if (flags.create) {
+            this.log(`Creating service "${flags.create}"...`);
+            service = await (0, upgrade_1.withUpgradeRetry)(() => services_1.servicesApi.create(workspace.id, { name: flags.create }));
+        }
+        else if (!(0, interactive_1.isInteractive)()) {
+            this.error((0, interactive_1.missingFlag)("Pass --service <slug> to link an existing service, or --create <name> to make a new one."));
+        }
         else {
             const servicesResponse = await services_1.servicesApi.list(workspace.id);
             const services = servicesResponse.data;
@@ -87,7 +107,6 @@ class Link extends base_command_1.default {
                 service = selectedService;
             }
             else {
-                // Create new service
                 const { serviceName } = await inquirer_1.default.prompt([
                     {
                         type: "input",
@@ -120,16 +139,21 @@ Link.description = "Link this project to a platform service";
 Link.examples = [
     `$ apso link`,
     `$ apso link --workspace my-team --service my-api`,
+    `$ apso link --workspace my-team --create my-new-api`,
     `$ apso link --force`,
 ];
 Link.flags = {
     workspace: core_1.Flags.string({
         char: "w",
-        description: "Workspace slug",
+        description: "Workspace slug (defaults to the active workspace)",
     }),
     service: core_1.Flags.string({
         char: "s",
-        description: "Service slug",
+        description: "Existing service slug to link",
+    }),
+    create: core_1.Flags.string({
+        char: "c",
+        description: "Create a new service with this name and link it",
     }),
     force: core_1.Flags.boolean({
         char: "f",

package/dist/lib/upgrade.js

@@ -14,6 +14,7 @@ const child_process_1 = require("child_process");
 const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
 const client_1 = require("./api/client");
 const config_1 = require("./config");
+const interactive_1 = require("./utils/interactive");
 /**
  * Open a URL in the default browser (best-effort).
  */
@@ -75,6 +76,12 @@ async function withUpgradeRetry(action) {
     }
     catch (error) {
         if (error instanceof client_1.ApiClientError && error.isLimitError()) {
+            // Headless (agent/CI): never open a browser or prompt — surface the limit
+            // as a clear error with the upgrade URL so the caller can act on it.
+            if (!(0, interactive_1.isInteractive)()) {
+                const upgradeUrl = `${config_1.globalConfig.read().webUrl}${error.upgradeUrl || "/billing/upgrade"}`;
+                throw new Error(`${error.message || "Plan limit reached."} Upgrade at ${upgradeUrl}`);
+            }
             const retry = await promptUpgrade(error);
             if (retry) {
                 return action();

package/dist/lib/utils/interactive.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Interactive vs headless detection.
+ *
+ * Humans get prompts; agents and CI must run headless — every value comes from
+ * a flag and the CLI never blocks on a prompt. Headless is forced by
+ * APSO_NONINTERACTIVE=1, by CI=true, or auto-detected when stdin/stdout is not
+ * a TTY (e.g. an agent capturing output). Commands should check `isInteractive()`
+ * and, when false, require the equivalent flag instead of prompting.
+ */
+export declare function isInteractive(): boolean;
+/**
+ * Message for a missing required value in headless mode. Name the flag that
+ * would have supplied it so an agent can retry deterministically.
+ */
+export declare function missingFlag(details: string): string;

package/dist/lib/utils/interactive.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.missingFlag = exports.isInteractive = void 0;
+/**
+ * Interactive vs headless detection.
+ *
+ * Humans get prompts; agents and CI must run headless — every value comes from
+ * a flag and the CLI never blocks on a prompt. Headless is forced by
+ * APSO_NONINTERACTIVE=1, by CI=true, or auto-detected when stdin/stdout is not
+ * a TTY (e.g. an agent capturing output). Commands should check `isInteractive()`
+ * and, when false, require the equivalent flag instead of prompting.
+ */
+function isInteractive() {
+    if (process.env.APSO_NONINTERACTIVE === "1" ||
+        process.env.APSO_NONINTERACTIVE === "true") {
+        return false;
+    }
+    if (process.env.CI === "true" || process.env.CI === "1") {
+        return false;
+    }
+    return Boolean(process.stdin.isTTY && process.stdout.isTTY);
+}
+exports.isInteractive = isInteractive;
+/**
+ * Message for a missing required value in headless mode. Name the flag that
+ * would have supplied it so an agent can retry deterministically.
+ */
+function missingFlag(details) {
+    return `Running non-interactively (no TTY / CI / APSO_NONINTERACTIVE). ${details}`;
+}
+exports.missingFlag = missingFlag;

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@apso/cli",
-  "version": "0.23.0",
+  "version": "0.25.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@apso/cli",
-      "version": "0.23.0",
+      "version": "0.25.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@biomejs/biome": "^1.9.4",

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.23.0",
+  "version": "0.25.0",
   "commands": {
     "config": {
       "id": "config",
@@ -259,6 +259,7 @@
       "examples": [
         "$ apso link",
         "$ apso link --workspace my-team --service my-api",
+        "$ apso link --workspace my-team --create my-new-api",
         "$ apso link --force"
       ],
       "flags": {
@@ -266,14 +267,21 @@
           "name": "workspace",
           "type": "option",
           "char": "w",
-          "description": "Workspace slug",
+          "description": "Workspace slug (defaults to the active workspace)",
           "multiple": false
         },
         "service": {
           "name": "service",
           "type": "option",
           "char": "s",
-          "description": "Service slug",
+          "description": "Existing service slug to link",
+          "multiple": false
+        },
+        "create": {
+          "name": "create",
+          "type": "option",
+          "char": "c",
+          "description": "Create a new service with this name and link it",
           "multiple": false
         },
         "force": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apso/cli",
-  "version": "0.23.0",
+  "version": "0.25.0",
   "mcpName": "io.github.apsoai/apso",
   "description": "Apso CLI",
   "author": "Apso by Mavric - @mavric",