@apso/cli 0.26.2 → 0.28.0

package/dist/commands/deploy.d.ts

@@ -9,6 +9,7 @@ export default class Deploy extends BaseCommand {
         "skip-push": import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         repo: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         branch: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        "local-git": import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
     /**
@@ -18,6 +19,11 @@ export default class Deploy extends BaseCommand {
      * git and push straight to GitHub.
      */
     private syncCodeToGithub;
-    /** Let the user pick one of their GitHub repos to deploy from. */
-    private promptRepoSelection;
+    /**
+     * Decide which GitHub repo to deploy to. No local git or `gh` needed to make
+     * one — we create it through the user's Apso GitHub connection. Headless (or
+     * when the account has no repos) auto-creates a repo named after the service;
+     * interactive offers "create new" first, then existing repos.
+     */
+    private resolveRepo;
 }

package/dist/commands/deploy.js

@@ -11,6 +11,7 @@ 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");
+const server_push_1 = require("../lib/deploy/server-push");
 class Deploy extends base_command_1.default {
     async run() {
         const { flags } = await this.parse(Deploy);
@@ -68,7 +69,7 @@ class Deploy extends base_command_1.default {
         // Sync local code to the connected GitHub repo (the deploy builds from it).
         // Skip for redeploys of already-synced code.
         if (!flags["skip-push"]) {
-            await this.syncCodeToGithub(service, flags.repo, flags.branch);
+            await this.syncCodeToGithub(service, flags.repo, flags.branch, flags["local-git"]);
         }
         // Determine source
         if (service.githubRepo || flags.repo) {
@@ -132,12 +133,16 @@ class Deploy extends base_command_1.default {
      * can clone it at deploy time. No code passes through Apso — we read the local
      * git and push straight to GitHub.
      */
-    async syncCodeToGithub(service, repoFlag, branch) {
+    async syncCodeToGithub(service, repoFlag, branch, useLocalGit) {
         const cwd = process.cwd();
-        if (!git.gitAvailable()) {
-            this.error("git is required to deploy. Install git and try again.");
+        // --local-git needs git + a local repo. The default server-side push reads
+        // the files directly and pushes through the platform, so neither is needed.
+        if (useLocalGit) {
+            if (!git.gitAvailable()) {
+                this.error("git is required for --local-git. Install git, or drop --local-git.");
+            }
+            git.initRepo(cwd);
         }
-        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.
         let conn = await services_1.githubApi.getConnection();
@@ -166,9 +171,12 @@ class Deploy extends base_command_1.default {
                 this.error("GitHub still isn't connected. Complete 'apso github connect' and re-run deploy.");
             }
         }
-        let repoFullName = git.localRepoFullName(cwd) || service.githubRepo || repoFlag;
+        // Only read the local git remote when git is present (a bare machine using
+        // the server-side push may not have git at all).
+        const localRepo = git.gitAvailable() ? git.localRepoFullName(cwd) : "";
+        let repoFullName = localRepo || service.githubRepo || repoFlag;
         if (!repoFullName) {
-            repoFullName = await this.promptRepoSelection(conn.connectionId);
+            repoFullName = await this.resolveRepo(conn.connectionId, service);
         }
         // Connect the repo to the service (records ServiceRepository) unless the
         // service is already linked to this exact repo.
@@ -176,35 +184,84 @@ class Deploy extends base_command_1.default {
             this.log(`Connecting repository ${repoFullName}...`);
             await services_1.githubApi.connectRepo(service.id, conn.connectionId, repoFullName);
         }
-        // Point the local repo at it and push with the user's git credentials.
-        git.setOrigin(cwd, git.httpsUrlFor(repoFullName));
-        const committed = git.commitAll(cwd, "Deploy via Apso CLI");
-        this.log(committed
-            ? `Committed local changes; pushing to ${repoFullName}#${branch}...`
-            : `Pushing to ${repoFullName}#${branch}...`);
-        try {
-            git.pushHead(cwd, branch);
+        if (useLocalGit) {
+            // Push with the user's local git credentials.
+            git.setOrigin(cwd, git.httpsUrlFor(repoFullName));
+            const committed = git.commitAll(cwd, "Deploy via Apso CLI");
+            this.log(committed
+                ? `Committed local changes; pushing to ${repoFullName}#${branch}...`
+                : `Pushing to ${repoFullName}#${branch}...`);
+            try {
+                git.pushHead(cwd, branch);
+            }
+            catch (error) {
+                const msg = error instanceof Error ? error.message : String(error);
+                this.error(`git push to ${repoFullName} failed. Ensure you have push access and your git credentials are set up.\n${msg}`);
+            }
         }
-        catch (error) {
-            const msg = error instanceof Error ? error.message : String(error);
-            this.error(`git push to ${repoFullName} failed. Ensure you have push access and your git credentials are set up.\n${msg}`);
+        else {
+            // Default: upload the project and push through the Apso GitHub connection.
+            // No local git or gh required.
+            this.log(`Uploading code and pushing to ${repoFullName}#${branch} via your Apso GitHub connection...`);
+            try {
+                await (0, server_push_1.serverSidePush)({
+                    cwd,
+                    serviceId: service.id,
+                    connectionId: conn.connectionId,
+                    branch,
+                    message: "Deploy via Apso CLI",
+                });
+                this.log(`Pushed to ${repoFullName}#${branch}.`);
+            }
+            catch (error) {
+                const msg = error instanceof Error ? error.message : String(error);
+                this.error(`Push failed: ${msg}\nRetry, or use --local-git to push with your local git instead.`);
+            }
         }
     }
-    /** Let the user pick one of their GitHub repos to deploy from. */
-    async promptRepoSelection(connectionId) {
-        const repos = await services_1.githubApi.listRepos("", { connectionId, pageSize: 100 });
-        if (!repos.data.length) {
-            this.error("No GitHub repositories available. Create one on GitHub (or pass --repo owner/name).");
+    /**
+     * Decide which GitHub repo to deploy to. No local git or `gh` needed to make
+     * one — we create it through the user's Apso GitHub connection. Headless (or
+     * when the account has no repos) auto-creates a repo named after the service;
+     * interactive offers "create new" first, then existing repos.
+     */
+    async resolveRepo(connectionId, service) {
+        const repoName = (service.name || service.slug).trim();
+        const repos = await services_1.githubApi
+            .listRepos("", { connectionId, pageSize: 100 })
+            .catch(() => ({ data: [] }));
+        // Headless, or nothing to pick from: create a repo for this service.
+        if (!(0, interactive_1.isInteractive)() || repos.data.length === 0) {
+            this.log(`Creating GitHub repository "${repoName}"...`);
+            const created = await services_1.githubApi.createRepo(connectionId, repoName, {
+                autoInit: false,
+            });
+            this.log(`Created ${created.fullName}`);
+            return created.fullName;
         }
+        // Interactive with existing repos: "create new" first, then the list.
         const inquirer = await Promise.resolve().then(() => tslib_1.__importStar(require("inquirer")));
+        const CREATE = "create";
         const { repo } = await inquirer.default.prompt([
             {
                 type: "list",
                 name: "repo",
-                message: "Select a GitHub repository to deploy from:",
-                choices: repos.data.map((r) => ({ name: r.fullName, value: r.fullName })),
+                message: "Deploy to which GitHub repository?",
+                choices: [
+                    { name: `+ Create new repo "${repoName}"`, value: CREATE },
+                    new inquirer.default.Separator(),
+                    ...repos.data.map((r) => ({ name: r.fullName, value: r.fullName })),
+                ],
             },
         ]);
+        if (repo === CREATE) {
+            this.log(`Creating GitHub repository "${repoName}"...`);
+            const created = await services_1.githubApi.createRepo(connectionId, repoName, {
+                autoInit: false,
+            });
+            this.log(`Created ${created.fullName}`);
+            return created.fullName;
+        }
         return repo;
     }
 }
@@ -240,5 +297,9 @@ Deploy.flags = {
         description: "Branch to push to",
         default: "main",
     }),
+    "local-git": core_1.Flags.boolean({
+        description: "Push using your local git instead of the platform (needs local GitHub auth)",
+        default: false,
+    }),
 };
 exports.default = Deploy;

package/dist/commands/mcp/serve.d.ts

@@ -6,6 +6,8 @@ export default class McpServe extends BaseCommand {
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
     };
     run(): Promise<void>;
+    /** Wrap every registered tool handler with usage telemetry. */
+    private instrumentTools;
     private registerTools;
     private registerResources;
 }

package/dist/commands/mcp/serve.js

@@ -10,6 +10,7 @@ const mcp_js_1 = require("@modelcontextprotocol/sdk/server/mcp.js");
 const stdio_js_1 = require("@modelcontextprotocol/sdk/server/stdio.js");
 const zod_1 = require("zod");
 const base_command_1 = tslib_1.__importDefault(require("../../lib/base-command"));
+const telemetry_1 = require("../../lib/telemetry/telemetry");
 const apsorc_parser_1 = require("../../lib/apsorc-parser");
 const lib_1 = require("../../lib");
 const runner_1 = require("../../lib/doctor/runner");
@@ -23,11 +24,50 @@ class McpServe extends base_command_1.default {
             name: "apso",
             version: "0.10.2",
         });
+        // Emit a PostHog event per MCP tool call so agent usage of the server shows
+        // up in the same analytics as the CLI. Wrapping server.tool once covers all
+        // tools without touching each handler.
+        this.instrumentTools(server);
         this.registerTools(server);
         this.registerResources(server);
         const transport = new stdio_js_1.StdioServerTransport();
         await server.connect(transport);
     }
+    /** Wrap every registered tool handler with usage telemetry. */
+    instrumentTools(server) {
+        const original = server.tool.bind(server);
+        server.tool = (...args) => {
+            const name = String(args[0]);
+            const lastIndex = args.length - 1;
+            const handler = args[lastIndex];
+            if (typeof handler === "function") {
+                const orig = handler;
+                args[lastIndex] = async (...hArgs) => {
+                    const start = Date.now();
+                    try {
+                        const result = await orig(...hArgs);
+                        (0, telemetry_1.track)("mcp_tool_called", {
+                            tool: name,
+                            success: true,
+                            duration_ms: Date.now() - start,
+                        });
+                        return result;
+                    }
+                    catch (error) {
+                        (0, telemetry_1.track)("mcp_tool_called", {
+                            tool: name,
+                            success: false,
+                            duration_ms: Date.now() - start,
+                            error: error instanceof Error ? error.message : String(error),
+                        });
+                        (0, telemetry_1.captureException)(error, { mcp_tool: name });
+                        throw error;
+                    }
+                };
+            }
+            return original(...args);
+        };
+    }
     registerTools(server) {
         // ── design_schema ──────────────────────────────────────────────
         server.tool("design_schema", "Design a database schema from application requirements. Takes a description of entities, relationships, and business rules. Returns a validated .apsorc schema definition ready for code generation.", {

package/dist/lib/api/services.d.ts

@@ -110,6 +110,15 @@ export declare const githubApi: {
     getConnectUrl(_workspaceSlug: string): Promise<{
         url: string;
     }>;
+    /**
+     * Create a new GitHub repo for a service via the user's connection (no local
+     * git or gh required). autoInit=false leaves it empty so the deploy's first
+     * push becomes the initial commit.
+     */
+    createRepo(connectionId: string, serviceName: string, options?: {
+        private?: boolean;
+        autoInit?: boolean;
+    }): Promise<GitHubRepo>;
     /** Link an existing GitHub repo to a service. */
     connectRepo(serviceId: string, connectionId: string, repoFullName: string): Promise<Raw>;
     /** Push the service's saved (S3) code to its connected GitHub repo. */
@@ -118,4 +127,16 @@ export declare const githubApi: {
         message?: string;
     }): Promise<Raw>;
 };
+/**
+ * Service code API — used for the server-side deploy (upload the project zip to
+ * S3; the backend then pushes it to the repo, so no local git is required).
+ */
+export declare const codeApi: {
+    /** Presigned S3 PUT URL to upload the service's code zip. */
+    getUploadUrl(serviceId: string): Promise<{
+        url: string;
+        bucket?: string;
+        key?: string;
+    }>;
+};
 export {};

package/dist/lib/api/services.js

@@ -12,7 +12,7 @@
  * below.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.githubApi = exports.buildApi = exports.schemaApi = exports.servicesApi = exports.workspacesApi = exports.authApi = void 0;
+exports.codeApi = exports.githubApi = exports.buildApi = exports.schemaApi = exports.servicesApi = exports.workspacesApi = exports.authApi = void 0;
 const client_1 = require("./client");
 function adaptWorkspace(raw) {
     var _a, _b, _c, _d;
@@ -323,6 +323,30 @@ exports.githubApi = {
     async getConnectUrl(_workspaceSlug) {
         return client_1.api.get("/api/github/authorize");
     },
+    /**
+     * Create a new GitHub repo for a service via the user's connection (no local
+     * git or gh required). autoInit=false leaves it empty so the deploy's first
+     * push becomes the initial commit.
+     */
+    async createRepo(connectionId, serviceName, options) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        const raw = await client_1.api.post("/api/github/repos", {
+            connectionId,
+            serviceName,
+            isPrivate: (_a = options === null || options === void 0 ? void 0 : options.private) !== null && _a !== void 0 ? _a : true,
+            autoInit: (_b = options === null || options === void 0 ? void 0 : options.autoInit) !== null && _b !== void 0 ? _b : false,
+        });
+        const r = (_d = (_c = raw === null || raw === void 0 ? void 0 : raw.repository) !== null && _c !== void 0 ? _c : raw === null || raw === void 0 ? void 0 : raw.data) !== null && _d !== void 0 ? _d : raw;
+        return {
+            id: r.id,
+            fullName: (_f = (_e = r.full_name) !== null && _e !== void 0 ? _e : r.fullName) !== null && _f !== void 0 ? _f : r.name,
+            name: r.name,
+            owner: (_h = (_g = r.owner) === null || _g === void 0 ? void 0 : _g.login) !== null && _h !== void 0 ? _h : r.owner,
+            private: Boolean(r.private),
+            defaultBranch: (_k = (_j = r.default_branch) !== null && _j !== void 0 ? _j : r.defaultBranch) !== null && _k !== void 0 ? _k : "main",
+            url: (_l = r.html_url) !== null && _l !== void 0 ? _l : r.url,
+        };
+    },
     /** Link an existing GitHub repo to a service. */
     async connectRepo(serviceId, connectionId, repoFullName) {
         return client_1.api.post("/api/github/connect-repo", {
@@ -342,3 +366,13 @@ exports.githubApi = {
         });
     },
 };
+/**
+ * Service code API — used for the server-side deploy (upload the project zip to
+ * S3; the backend then pushes it to the repo, so no local git is required).
+ */
+exports.codeApi = {
+    /** Presigned S3 PUT URL to upload the service's code zip. */
+    async getUploadUrl(serviceId) {
+        return client_1.api.get(`/api/services/${serviceId}/code/upload-url`);
+    },
+};

package/dist/lib/deploy/server-push.d.ts

@@ -0,0 +1,15 @@
+/// <reference types="node" />
+/** Zip the project source into a buffer, skipping build/vcs/dependency dirs. */
+export declare function zipProject(cwd: string): Buffer;
+/**
+ * Server-side push: upload the project zip to S3 and have the platform push it
+ * to the connected repo through the user's GitHub connection. No local git or
+ * `gh` required — works on a bare machine that has only `apso login`.
+ */
+export declare function serverSidePush(opts: {
+    cwd: string;
+    serviceId: string;
+    connectionId: string;
+    branch: string;
+    message: string;
+}): Promise<void>;

package/dist/lib/deploy/server-push.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.serverSidePush = exports.zipProject = void 0;
+const tslib_1 = require("tslib");
+const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
+const path = tslib_1.__importStar(require("path"));
+const services_1 = require("../api/services");
+// Never ship these into the code zip — the backend reconstitutes the runnable
+// base template and only needs the source + schema + user edits.
+const EXCLUDE_DIRS = new Set([
+    "node_modules",
+    ".git",
+    "dist",
+    ".next",
+    ".apso",
+    "coverage",
+]);
+/** Zip the project source into a buffer, skipping build/vcs/dependency dirs. */
+function zipProject(cwd) {
+    const zip = new adm_zip_1.default();
+    zip.addLocalFolder(cwd, "", (filename) => {
+        const parts = filename.split(path.sep);
+        return !parts.some((p) => EXCLUDE_DIRS.has(p));
+    });
+    return zip.toBuffer();
+}
+exports.zipProject = zipProject;
+/**
+ * Server-side push: upload the project zip to S3 and have the platform push it
+ * to the connected repo through the user's GitHub connection. No local git or
+ * `gh` required — works on a bare machine that has only `apso login`.
+ */
+async function serverSidePush(opts) {
+    const buffer = zipProject(opts.cwd);
+    const { url } = await services_1.codeApi.getUploadUrl(opts.serviceId);
+    const res = await fetch(url, {
+        method: "PUT",
+        headers: { "Content-Type": "application/zip" },
+        body: buffer,
+    });
+    if (!res.ok) {
+        throw new Error(`Code upload failed (${res.status}). ${await res.text().catch(() => "")}`);
+    }
+    await services_1.githubApi.push(opts.serviceId, opts.connectionId, {
+        branch: opts.branch,
+        message: opts.message,
+    });
+}
+exports.serverSidePush = serverSidePush;

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@apso/cli",
-  "version": "0.26.2",
+  "version": "0.28.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@apso/cli",
-      "version": "0.26.2",
+      "version": "0.28.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@biomejs/biome": "^1.9.4",
@@ -17,6 +17,7 @@
         "@oclif/plugin-plugins": "^3",
         "@oclif/plugin-warn-if-update-available": "^2.1.1",
         "@sentry/node": "^10.68.0",
+        "adm-zip": "^0.6.0",
         "debug": "^4.3.4",
         "eta": "^2.0.0",
         "inquirer": "^8.2.7",
@@ -35,6 +36,7 @@
       "devDependencies": {
         "@jest/globals": "^29.5.0",
         "@oclif/test": "^2.4.7",
+        "@types/adm-zip": "^0.5.8",
         "@types/chai": "^4",
         "@types/inquirer": "^8.2.12",
         "@types/mocha": "^10",
@@ -2659,6 +2661,16 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/@types/adm-zip": {
+      "version": "0.5.8",
+      "resolved": "https://registry.npmjs.org/@types/adm-zip/-/adm-zip-0.5.8.tgz",
+      "integrity": "sha512-RVVH7QvZYbN+ihqZ4kX/dMiowf6o+Jk1fNwiSdx0NahBJLU787zkULhGhJM8mf/obmLGmgdMM0bXsQTmyfbR7Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/babel__core": {
       "version": "7.20.1",
       "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.1.tgz",
@@ -3556,6 +3568,15 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/adm-zip": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.6.0.tgz",
+      "integrity": "sha512-XleryMhbuksdKtofnWZ9Sk+4CUTbms4Mb/EU32SZwToAyZ5RgVos/ki8n+yr0LWHOGKuakbXTuuYNHLQjhddgg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0"
+      }
+    },
     "node_modules/agent-base": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.26.2",
+  "version": "0.28.0",
   "commands": {
     "config": {
       "id": "config",
@@ -88,6 +88,12 @@
           "description": "Branch to push to",
           "multiple": false,
           "default": "main"
+        },
+        "local-git": {
+          "name": "local-git",
+          "type": "boolean",
+          "description": "Push using your local git instead of the platform (needs local GitHub auth)",
+          "allowNo": false
         }
       },
       "args": {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apso/cli",
-  "version": "0.26.2",
+  "version": "0.28.0",
   "mcpName": "io.github.apsoai/apso",
   "description": "Apso CLI",
   "author": "Apso by Mavric - @mavric",
@@ -32,6 +32,7 @@
     "@oclif/plugin-plugins": "^3",
     "@oclif/plugin-warn-if-update-available": "^2.1.1",
     "@sentry/node": "^10.68.0",
+    "adm-zip": "^0.6.0",
     "debug": "^4.3.4",
     "eta": "^2.0.0",
     "inquirer": "^8.2.7",
@@ -47,6 +48,7 @@
   "devDependencies": {
     "@jest/globals": "^29.5.0",
     "@oclif/test": "^2.4.7",
+    "@types/adm-zip": "^0.5.8",
     "@types/chai": "^4",
     "@types/inquirer": "^8.2.12",
     "@types/mocha": "^10",