@apso/cli 0.24.0 → 0.25.0

package/dist/commands/deploy.js

@@ -140,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/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@apso/cli",
-  "version": "0.24.0",
+  "version": "0.25.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@apso/cli",
-      "version": "0.24.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.24.0",
+  "version": "0.25.0",
   "commands": {
     "config": {
       "id": "config",

package/package.json

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