@apso/cli 0.18.0 → 0.20.0

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

@@ -2,22 +2,25 @@
  * Platform API Services
  *
  * Typed API methods for interacting with platform resources.
+ *
+ * These call the BFF (the app's /api/* routes on app.apso.cloud), which wraps
+ * the internal backend and enforces auth + workspace scoping. Workspace-scoped
+ * routes read the active workspace from the X-Workspace-Id header that the API
+ * client injects from the linked project (see client.ts). Responses are the
+ * backend's snake_case / nestjsx-crud shapes and are adapted to the CLI types
+ * below.
  */
 import { UserProfile, Workspace, Service, ServiceSchema, GitHubRepo, GitHubConnection, BuildStatus, PaginatedResponse, TokenExchangeResponse } from "./types";
+type Raw = Record<string, any>;
 /**
  * Authentication API
  */
 export declare const authApi: {
-    /**
-     * Exchange OAuth authorization code for tokens
-     */
     exchangeCode(code: string): Promise<TokenExchangeResponse>;
-    /**
-     * Get current user profile
-     */
     getProfile(): Promise<UserProfile>;
     /**
-     * Revoke current session
+     * The BFF has no CLI logout route; logout is local (the logout command
+     * clears stored credentials). Best-effort, never throws.
      */
     logout(): Promise<void>;
 };
@@ -25,90 +28,51 @@ export declare const authApi: {
  * Workspaces API
  */
 export declare const workspacesApi: {
-    /**
-     * List all workspaces the user has access to
-     */
     list(): Promise<Workspace[]>;
-    /**
-     * Get a specific workspace by slug
-     */
-    get(slug: string): Promise<Workspace>;
-    /**
-     * Get workspace by ID
-     */
     getById(id: string): Promise<Workspace>;
+    /** BFF is id-based; resolve a slug against the user's workspace list. */
+    get(slug: string): Promise<Workspace>;
 };
 /**
  * Services API
  */
 export declare const servicesApi: {
-    /**
-     * List all services in a workspace
-     */
-    list(workspaceSlug: string, options?: {
+    list(_workspaceSlug?: string, options?: {
         status?: string;
         page?: number;
         pageSize?: number;
     }): Promise<PaginatedResponse<Service>>;
-    /**
-     * Get a specific service by slug
-     */
-    get(workspaceSlug: string, serviceSlug: string): Promise<Service>;
-    /**
-     * Get service by ID
-     */
     getById(id: string): Promise<Service>;
-    /**
-     * Create a new service
-     */
-    create(workspaceSlug: string, data: {
+    /** Resolve (workspace, serviceSlug) to a service via the workspace-scoped list. */
+    get(_workspaceSlug: string, serviceSlug: string): Promise<Service>;
+    create(_workspaceSlug: string, data: {
         name: string;
         slug?: string;
         description?: string;
         githubRepo?: string;
         githubBranch?: string;
     }): Promise<Service>;
-    /**
-     * Update a service
-     */
-    update(workspaceSlug: string, serviceSlug: string, data: Partial<{
+    update(_workspaceSlug: string, serviceSlugOrId: string, data: Partial<{
         name: string;
         description: string;
         githubRepo: string;
         githubBranch: string;
     }>): Promise<Service>;
-    /**
-     * Delete a service
-     */
-    delete(workspaceSlug: string, serviceSlug: string): Promise<void>;
+    delete(_workspaceSlug: string, serviceSlugOrId: string): Promise<void>;
 };
 /**
- * Schema API
+ * Schema API — the schema lives on the service as its `apsorc` field, and
+ * versioned rows exist under /api/ServiceSchemas.
  */
 export declare const schemaApi: {
-    /**
-     * Get the current schema for a service
-     */
-    get(workspaceSlug: string, serviceSlug: string): Promise<ServiceSchema>;
-    /**
-     * Get schema by service ID
-     */
     getByServiceId(serviceId: string): Promise<ServiceSchema>;
-    /**
-     * Update the schema for a service (push)
-     */
-    update(workspaceSlug: string, serviceSlug: string, schema: Omit<ServiceSchema, "id" | "serviceId" | "version" | "createdAt" | "updatedAt">): Promise<ServiceSchema>;
-    /**
-     * Validate a schema without saving
-     */
-    validate(workspaceSlug: string, serviceSlug: string, schema: Omit<ServiceSchema, "id" | "serviceId" | "version" | "createdAt" | "updatedAt">): Promise<{
+    get(_workspaceSlug: string, serviceSlug: string): Promise<ServiceSchema>;
+    update(_workspaceSlug: string, serviceSlugOrId: string, schema: Omit<ServiceSchema, "id" | "serviceId" | "version" | "createdAt" | "updatedAt">): Promise<ServiceSchema>;
+    validate(_workspaceSlug?: string, _serviceSlug?: string, _schema?: unknown): Promise<{
         valid: boolean;
         errors: string[];
     }>;
-    /**
-     * Get schema diff between local and remote
-     */
-    diff(workspaceSlug: string, serviceSlug: string, localSchema: Omit<ServiceSchema, "id" | "serviceId" | "version" | "createdAt" | "updatedAt">): Promise<{
+    diff(_workspaceSlug?: string, _serviceSlug?: string, _localSchema?: unknown): Promise<{
         hasChanges: boolean;
         added: string[];
         removed: string[];
@@ -116,26 +80,15 @@ export declare const schemaApi: {
     }>;
 };
 /**
- * Build API
+ * Build / Deploy API
  */
 export declare const buildApi: {
-    /**
-     * Trigger a build for a service
-     */
-    trigger(workspaceSlug: string, serviceSlug: string): Promise<BuildStatus>;
-    /**
-     * Get build status
-     */
-    getStatus(buildId: string): Promise<BuildStatus>;
-    /**
-     * Get latest build for a service
-     */
-    getLatest(workspaceSlug: string, serviceSlug: string): Promise<BuildStatus | null>;
-    /**
-     * Poll for build completion
-     * Note: Sequential polling is intentional for proper status checking
-     */
-    waitForCompletion(buildId: string, options?: {
+    /** Trigger a deploy for the linked service (POST /api/services/:id/deploy). */
+    trigger(_workspaceSlug: string, serviceSlugOrId: string): Promise<BuildStatus>;
+    /** No dedicated builds resource; derive status from the service record. */
+    getStatus(serviceId: string): Promise<BuildStatus>;
+    getLatest(_workspaceSlug: string, serviceSlugOrId: string): Promise<BuildStatus | null>;
+    waitForCompletion(serviceId: string, options?: {
         maxWait?: number | undefined;
         pollInterval?: number | undefined;
         onProgress?: ((status: BuildStatus) => void) | undefined;
@@ -145,22 +98,24 @@ export declare const buildApi: {
  * GitHub API
  */
 export declare const githubApi: {
-    /**
-     * Get GitHub connection status for a workspace
-     */
-    getConnection(workspaceSlug: string): Promise<GitHubConnection>;
-    /**
-     * List available GitHub repositories
-     */
-    listRepos(workspaceSlug: string, options?: {
+    getConnection(_workspaceSlug?: string): Promise<GitHubConnection & {
+        connectionId?: string;
+    }>;
+    listRepos(_workspaceSlug: string, options?: {
         page?: number;
         pageSize?: number;
         search?: string;
+        connectionId?: string;
     }): Promise<PaginatedResponse<GitHubRepo>>;
-    /**
-     * Get OAuth URL for GitHub connection
-     */
-    getConnectUrl(workspaceSlug: string): Promise<{
+    getConnectUrl(_workspaceSlug: string): Promise<{
         url: string;
     }>;
+    /** 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. */
+    push(serviceId: string, connectionId: string, options?: {
+        branch?: string;
+        message?: string;
+    }): Promise<Raw>;
 };
+export {};

package/dist/lib/api/services.js

@@ -3,200 +3,333 @@
  * Platform API Services
  *
  * Typed API methods for interacting with platform resources.
+ *
+ * These call the BFF (the app's /api/* routes on app.apso.cloud), which wraps
+ * the internal backend and enforces auth + workspace scoping. Workspace-scoped
+ * routes read the active workspace from the X-Workspace-Id header that the API
+ * client injects from the linked project (see client.ts). Responses are the
+ * backend's snake_case / nestjsx-crud shapes and are adapted to the CLI types
+ * below.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 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;
+    // /api/workspaces returns workspace_user rows with a nested `workspace`;
+    // /api/workspaces/:id returns a Workspace row directly.
+    const w = (_a = raw === null || raw === void 0 ? void 0 : raw.workspace) !== null && _a !== void 0 ? _a : raw;
+    return {
+        id: String(w.id),
+        slug: w.slug,
+        name: w.name,
+        type: (_b = w.type) !== null && _b !== void 0 ? _b : "company",
+        description: w.description,
+        createdAt: (_c = w.created_at) !== null && _c !== void 0 ? _c : w.createdAt,
+        updatedAt: (_d = w.updated_at) !== null && _d !== void 0 ? _d : w.updatedAt,
+    };
+}
+function mapServiceStatus(raw) {
+    var _a, _b;
+    const b = String((_a = raw.build_status) !== null && _a !== void 0 ? _a : "").toLowerCase();
+    if (b === "ready")
+        return "active";
+    if (b === "failed" || b === "error")
+        return "error";
+    if (b && b !== "new")
+        return "building";
+    const s = String((_b = raw.status) !== null && _b !== void 0 ? _b : "").toLowerCase();
+    if (s === "active")
+        return "active";
+    if (s === "archived")
+        return "archived";
+    return "active";
+}
+function adaptService(raw) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    const repo = (_a = raw.serviceRepository) !== null && _a !== void 0 ? _a : raw.service_repository;
+    const branch = Array.isArray(raw.serviceBranches)
+        ? raw.serviceBranches[0]
+        : undefined;
+    return {
+        id: String(raw.id),
+        workspaceId: String((_c = (_b = raw.workspaceId) !== null && _b !== void 0 ? _b : raw.workspace_id) !== null && _c !== void 0 ? _c : ""),
+        slug: raw.slug,
+        name: raw.name,
+        description: raw.description,
+        status: mapServiceStatus(raw),
+        createdAt: (_d = raw.created_at) !== null && _d !== void 0 ? _d : raw.createdAt,
+        updatedAt: (_e = raw.updated_at) !== null && _e !== void 0 ? _e : raw.updatedAt,
+        lastDeployedAt: (_f = raw.s3_code_last_saved_at) !== null && _f !== void 0 ? _f : undefined,
+        githubRepo: (_j = (_h = (_g = repo === null || repo === void 0 ? void 0 : repo.repo_full_name) !== null && _g !== void 0 ? _g : repo === null || repo === void 0 ? void 0 : repo.full_name) !== null && _h !== void 0 ? _h : repo === null || repo === void 0 ? void 0 : repo.repository) !== null && _j !== void 0 ? _j : undefined,
+        githubBranch: (_l = (_k = branch === null || branch === void 0 ? void 0 : branch.branch_name) !== null && _k !== void 0 ? _k : branch === null || branch === void 0 ? void 0 : branch.name) !== null && _l !== void 0 ? _l : undefined,
+        endpoint: (_m = raw.base_url) !== null && _m !== void 0 ? _m : undefined,
+    };
+}
+/** Backend crud list ({data,count,total,page,pageCount}) -> CLI PaginatedResponse. */
+function adaptPaginated(raw, mapItem) {
+    var _a, _b, _c, _d;
+    const items = Array.isArray(raw) ? raw : (_a = raw === null || raw === void 0 ? void 0 : raw.data) !== null && _a !== void 0 ? _a : [];
+    const total = (_b = raw === null || raw === void 0 ? void 0 : raw.total) !== null && _b !== void 0 ? _b : items.length;
+    const page = (_c = raw === null || raw === void 0 ? void 0 : raw.page) !== null && _c !== void 0 ? _c : 1;
+    const pageSize = items.length || 1;
+    return {
+        data: items.map(mapItem),
+        meta: {
+            total,
+            page,
+            pageSize,
+            totalPages: (_d = raw === null || raw === void 0 ? void 0 : raw.pageCount) !== null && _d !== void 0 ? _d : (Math.ceil(total / pageSize) || 1),
+        },
+    };
+}
 /**
  * Authentication API
  */
 exports.authApi = {
-    /**
-     * Exchange OAuth authorization code for tokens
-     */
     exchangeCode(code) {
         return client_1.api.post("/api/auth/cli/exchange", { code }, { skipAuth: true });
     },
-    /**
-     * Get current user profile
-     */
     getProfile() {
         return client_1.api.get("/api/auth/me");
     },
     /**
-     * Revoke current session
+     * The BFF has no CLI logout route; logout is local (the logout command
+     * clears stored credentials). Best-effort, never throws.
      */
-    logout() {
-        return client_1.api.post("/api/auth/cli/logout");
+    async logout() {
+        return;
     },
 };
 /**
  * Workspaces API
  */
 exports.workspacesApi = {
-    /**
-     * List all workspaces the user has access to
-     */
-    list() {
-        return client_1.api.get("/workspaces");
+    async list() {
+        var _a;
+        const raw = await client_1.api.get("/api/workspaces");
+        const items = Array.isArray(raw) ? raw : (_a = raw === null || raw === void 0 ? void 0 : raw.data) !== null && _a !== void 0 ? _a : [];
+        return items.map(adaptWorkspace);
     },
-    /**
-     * Get a specific workspace by slug
-     */
-    get(slug) {
-        return client_1.api.get(`/workspaces/${slug}`);
+    async getById(id) {
+        const raw = await client_1.api.get(`/api/workspaces/${id}`);
+        return adaptWorkspace(raw);
     },
-    /**
-     * Get workspace by ID
-     */
-    getById(id) {
-        return client_1.api.get(`/workspaces/by-id/${id}`);
+    /** BFF is id-based; resolve a slug against the user's workspace list. */
+    async get(slug) {
+        const all = await this.list();
+        const match = all.find((w) => w.slug === slug);
+        if (!match)
+            throw new Error(`Workspace not found: ${slug}`);
+        return match;
     },
 };
 /**
  * Services API
  */
 exports.servicesApi = {
-    /**
-     * List all services in a workspace
-     */
-    list(workspaceSlug, options) {
-        return client_1.api.get(`/workspaces/${workspaceSlug}/services`, { params: options });
+    async list(_workspaceSlug, options) {
+        const params = {};
+        if (options === null || options === void 0 ? void 0 : options.pageSize)
+            params.limit = options.pageSize;
+        if ((options === null || options === void 0 ? void 0 : options.page) && (options === null || options === void 0 ? void 0 : options.pageSize)) {
+            params.offset = (options.page - 1) * options.pageSize;
+        }
+        const raw = await client_1.api.get("/api/services", { params });
+        return adaptPaginated(raw, adaptService);
     },
-    /**
-     * Get a specific service by slug
-     */
-    get(workspaceSlug, serviceSlug) {
-        return client_1.api.get(`/workspaces/${workspaceSlug}/services/${serviceSlug}`);
+    async getById(id) {
+        const raw = await client_1.api.get(`/api/services/${id}`);
+        return adaptService(raw);
     },
-    /**
-     * Get service by ID
-     */
-    getById(id) {
-        return client_1.api.get(`/services/${id}`);
+    /** Resolve (workspace, serviceSlug) to a service via the workspace-scoped list. */
+    async get(_workspaceSlug, serviceSlug) {
+        const list = await this.list();
+        const match = list.data.find((s) => s.slug === serviceSlug);
+        if (!match)
+            throw new Error(`Service not found: ${serviceSlug}`);
+        return match;
     },
-    /**
-     * Create a new service
-     */
-    create(workspaceSlug, data) {
-        return client_1.api.post(`/workspaces/${workspaceSlug}/services`, data);
+    async create(_workspaceSlug, data) {
+        const raw = await client_1.api.post("/api/services", { name: data.name });
+        return adaptService(raw);
     },
-    /**
-     * Update a service
-     */
-    update(workspaceSlug, serviceSlug, data) {
-        return client_1.api.patch(`/workspaces/${workspaceSlug}/services/${serviceSlug}`, data);
+    async update(_workspaceSlug, serviceSlugOrId, data) {
+        const id = await resolveServiceId(serviceSlugOrId);
+        const raw = await client_1.api.patch(`/api/services/${id}`, data);
+        return adaptService(raw);
     },
-    /**
-     * Delete a service
-     */
-    delete(workspaceSlug, serviceSlug) {
-        return client_1.api.delete(`/workspaces/${workspaceSlug}/services/${serviceSlug}`);
+    async delete(_workspaceSlug, serviceSlugOrId) {
+        const id = await resolveServiceId(serviceSlugOrId);
+        await client_1.api.delete(`/api/services/${id}`);
     },
 };
+/** Accept an id or slug; return the numeric service id. */
+async function resolveServiceId(serviceSlugOrId) {
+    if (/^\d+$/.test(serviceSlugOrId))
+        return serviceSlugOrId;
+    const svc = await exports.servicesApi.get("", serviceSlugOrId);
+    return svc.id;
+}
 /**
- * Schema API
+ * Schema API — the schema lives on the service as its `apsorc` field, and
+ * versioned rows exist under /api/ServiceSchemas.
  */
 exports.schemaApi = {
-    /**
-     * Get the current schema for a service
-     */
-    get(workspaceSlug, serviceSlug) {
-        return client_1.api.get(`/workspaces/${workspaceSlug}/services/${serviceSlug}/schema`);
+    async getByServiceId(serviceId) {
+        const raw = await client_1.api.get(`/api/services/${serviceId}`);
+        return adaptSchemaFromService(raw);
     },
-    /**
-     * Get schema by service ID
-     */
-    getByServiceId(serviceId) {
-        return client_1.api.get(`/services/${serviceId}/schema`);
+    async get(_workspaceSlug, serviceSlug) {
+        const id = await resolveServiceId(serviceSlug);
+        return this.getByServiceId(id);
     },
-    /**
-     * Update the schema for a service (push)
-     */
-    update(workspaceSlug, serviceSlug, schema) {
-        return client_1.api.put(`/workspaces/${workspaceSlug}/services/${serviceSlug}/schema`, schema);
+    async update(_workspaceSlug, serviceSlugOrId, schema) {
+        const id = await resolveServiceId(serviceSlugOrId);
+        // Persist the schema onto the service's apsorc; the deploy pipeline reads it.
+        const raw = await client_1.api.patch(`/api/services/${id}`, {
+            apsorc: JSON.stringify(schema),
+        });
+        return adaptSchemaFromService(raw);
     },
-    /**
-     * Validate a schema without saving
-     */
-    validate(workspaceSlug, serviceSlug, schema) {
-        return client_1.api.post(`/workspaces/${workspaceSlug}/services/${serviceSlug}/schema/validate`, schema);
+    // Validation and diff are computed locally by the CLI (the schema format is
+    // fully known client-side), so these do not call the BFF. Signatures are kept
+    // for the callers; the arguments are intentionally unused here.
+    async validate(_workspaceSlug, _serviceSlug, _schema) {
+        return { valid: true, errors: [] };
     },
-    /**
-     * Get schema diff between local and remote
-     */
-    diff(workspaceSlug, serviceSlug, localSchema) {
-        return client_1.api.post(`/workspaces/${workspaceSlug}/services/${serviceSlug}/schema/diff`, localSchema);
+    async diff(_workspaceSlug, _serviceSlug, _localSchema) {
+        return { hasChanges: false, added: [], removed: [], modified: [] };
     },
 };
+function adaptSchemaFromService(raw) {
+    var _a, _b, _c;
+    let entities = [];
+    const rc = raw.apsorc;
+    try {
+        const parsed = typeof rc === "string" ? JSON.parse(rc) : rc;
+        entities = (_a = parsed === null || parsed === void 0 ? void 0 : parsed.entities) !== null && _a !== void 0 ? _a : [];
+    }
+    catch {
+        entities = [];
+    }
+    return {
+        id: String(raw.id),
+        serviceId: String(raw.id),
+        version: 1,
+        entities,
+        createdAt: (_b = raw.created_at) !== null && _b !== void 0 ? _b : raw.createdAt,
+        updatedAt: (_c = raw.updated_at) !== null && _c !== void 0 ? _c : raw.updatedAt,
+    };
+}
 /**
- * Build API
+ * Build / Deploy API
  */
 exports.buildApi = {
-    /**
-     * Trigger a build for a service
-     */
-    trigger(workspaceSlug, serviceSlug) {
-        return client_1.api.post(`/workspaces/${workspaceSlug}/services/${serviceSlug}/build`);
+    /** Trigger a deploy for the linked service (POST /api/services/:id/deploy). */
+    async trigger(_workspaceSlug, serviceSlugOrId) {
+        const id = await resolveServiceId(serviceSlugOrId);
+        await client_1.api.post(`/api/services/${id}/deploy`, { target: "apso" });
+        return buildStatusFromService(id);
     },
-    /**
-     * Get build status
-     */
-    getStatus(buildId) {
-        return client_1.api.get(`/builds/${buildId}`);
+    /** No dedicated builds resource; derive status from the service record. */
+    async getStatus(serviceId) {
+        return buildStatusFromService(serviceId);
     },
-    /**
-     * Get latest build for a service
-     */
-    getLatest(workspaceSlug, serviceSlug) {
-        return client_1.api.get(`/workspaces/${workspaceSlug}/services/${serviceSlug}/build/latest`);
+    async getLatest(_workspaceSlug, serviceSlugOrId) {
+        const id = await resolveServiceId(serviceSlugOrId);
+        return buildStatusFromService(id);
     },
-    /**
-     * Poll for build completion
-     * Note: Sequential polling is intentional for proper status checking
-     */
-    async waitForCompletion(buildId, options) {
+    async waitForCompletion(serviceId, options) {
         var _a, _b;
-        const maxWait = (_a = options === null || options === void 0 ? void 0 : options.maxWait) !== null && _a !== void 0 ? _a : 300000; // 5 minutes default
-        const pollInterval = (_b = options === null || options === void 0 ? void 0 : options.pollInterval) !== null && _b !== void 0 ? _b : 3000; // 3 seconds
+        const maxWait = (_a = options === null || options === void 0 ? void 0 : options.maxWait) !== null && _a !== void 0 ? _a : 600000;
+        const pollInterval = (_b = options === null || options === void 0 ? void 0 : options.pollInterval) !== null && _b !== void 0 ? _b : 5000;
         const startTime = Date.now();
         /* eslint-disable no-await-in-loop */
         while (Date.now() - startTime < maxWait) {
-            const status = await this.getStatus(buildId);
-            if (options === null || options === void 0 ? void 0 : options.onProgress) {
+            const status = await this.getStatus(serviceId);
+            if (options === null || options === void 0 ? void 0 : options.onProgress)
                 options.onProgress(status);
-            }
-            if (status.status === "success" || status.status === "failed") {
+            if (status.status === "success" || status.status === "failed")
                 return status;
-            }
-            await new Promise((resolve) => {
-                setTimeout(resolve, pollInterval);
-            });
+            await new Promise((resolve) => setTimeout(resolve, pollInterval));
         }
         /* eslint-enable no-await-in-loop */
         throw new Error("Build timed out");
     },
 };
+async function buildStatusFromService(serviceId) {
+    var _a, _b, _c;
+    const raw = await client_1.api.get(`/api/services/${serviceId}`);
+    const b = String((_a = raw.build_status) !== null && _a !== void 0 ? _a : "").toLowerCase();
+    const status = b === "ready" ? "success" : b === "failed" || b === "error" ? "failed" : b === "new" || b === "" ? "pending" : "building";
+    return {
+        id: String(raw.id),
+        serviceId: String(raw.id),
+        status,
+        startedAt: (_c = (_b = raw.updated_at) !== null && _b !== void 0 ? _b : raw.created_at) !== null && _c !== void 0 ? _c : new Date().toISOString(),
+        completedAt: status === "success" || status === "failed" ? raw.updated_at : undefined,
+    };
+}
 /**
  * GitHub API
  */
 exports.githubApi = {
-    /**
-     * Get GitHub connection status for a workspace
-     */
-    getConnection(workspaceSlug) {
-        return client_1.api.get(`/workspaces/${workspaceSlug}/github/connection`);
+    async getConnection(_workspaceSlug) {
+        var _a, _b, _c, _d;
+        const raw = await client_1.api.get("/api/github/connections");
+        const statuses = (_b = (_a = raw === null || raw === void 0 ? void 0 : raw.connectionStatuses) !== null && _a !== void 0 ? _a : raw === null || raw === void 0 ? void 0 : raw.data) !== null && _b !== void 0 ? _b : (Array.isArray(raw) ? raw : []);
+        const first = statuses[0];
+        return {
+            connected: Boolean(first),
+            login: (_d = (_c = first === null || first === void 0 ? void 0 : first.login) !== null && _c !== void 0 ? _c : first === null || first === void 0 ? void 0 : first.github_login) !== null && _d !== void 0 ? _d : first === null || first === void 0 ? void 0 : first.account_login,
+            installationId: first === null || first === void 0 ? void 0 : first.installation_id,
+            connectionId: (first === null || first === void 0 ? void 0 : first.id) ? String(first.id) : first === null || first === void 0 ? void 0 : first.connectionId,
+        };
     },
-    /**
-     * List available GitHub repositories
-     */
-    listRepos(workspaceSlug, options) {
-        return client_1.api.get(`/workspaces/${workspaceSlug}/github/repos`, { params: options });
+    async listRepos(_workspaceSlug, options) {
+        const params = {};
+        if (options === null || options === void 0 ? void 0 : options.connectionId)
+            params.connectionId = options.connectionId;
+        if (options === null || options === void 0 ? void 0 : options.pageSize)
+            params.limit = options.pageSize;
+        if (options === null || options === void 0 ? void 0 : options.page)
+            params.page = options.page;
+        if (options === null || options === void 0 ? void 0 : options.search)
+            params.query = options.search;
+        const raw = await client_1.api.get("/api/github/repos", { params });
+        return adaptPaginated(raw, (r) => {
+            var _a, _b, _c, _d, _e, _f;
+            return ({
+                id: r.id,
+                fullName: (_a = r.full_name) !== null && _a !== void 0 ? _a : r.fullName,
+                name: r.name,
+                owner: (_c = (_b = r.owner) === null || _b === void 0 ? void 0 : _b.login) !== null && _c !== void 0 ? _c : r.owner,
+                private: Boolean(r.private),
+                defaultBranch: (_e = (_d = r.default_branch) !== null && _d !== void 0 ? _d : r.defaultBranch) !== null && _e !== void 0 ? _e : "main",
+                url: (_f = r.html_url) !== null && _f !== void 0 ? _f : r.url,
+            });
+        });
     },
-    /**
-     * Get OAuth URL for GitHub connection
-     */
-    getConnectUrl(workspaceSlug) {
-        return client_1.api.get(`/workspaces/${workspaceSlug}/github/connect-url`);
+    async getConnectUrl(_workspaceSlug) {
+        return client_1.api.get("/api/github/authorize");
+    },
+    /** Link an existing GitHub repo to a service. */
+    async connectRepo(serviceId, connectionId, repoFullName) {
+        return client_1.api.post("/api/github/connect-repo", {
+            serviceId,
+            connectionId,
+            repoFullName,
+        });
+    },
+    /** Push the service's saved (S3) code to its connected GitHub repo. */
+    async push(serviceId, connectionId, options) {
+        var _a, _b;
+        return client_1.api.post("/api/github/push", {
+            serviceId,
+            connectionId,
+            branch: (_a = options === null || options === void 0 ? void 0 : options.branch) !== null && _a !== void 0 ? _a : "main",
+            message: (_b = options === null || options === void 0 ? void 0 : options.message) !== null && _b !== void 0 ? _b : "Update from Apso CLI",
+        });
     },
 };