@apso/cli 0.21.0 → 0.22.0

package/dist/commands/deploy.js

@@ -23,7 +23,7 @@ class Deploy extends base_command_1.default {
             this.error("Project not linked. Run 'apso link' first.");
         }
         // Fetch service
-        const service = await services_1.servicesApi.get(link.workspaceSlug, link.serviceSlug);
+        const service = await services_1.servicesApi.get(link.workspaceId, link.serviceSlug);
         // Run migration sandbox (unless skipped)
         let migrationCount = 0;
         if (!flags["skip-migrate"]) {

package/dist/commands/init.js

@@ -60,7 +60,7 @@ class Init extends base_command_1.default {
             },
         ]);
         // Select service
-        const servicesResponse = await services_1.servicesApi.list(workspace.slug);
+        const servicesResponse = await services_1.servicesApi.list(workspace.id);
         if (servicesResponse.data.length === 0) {
             this.error(`No services found in workspace "${workspace.name}". Create one first or choose "Create a new project".`);
         }
@@ -177,7 +177,7 @@ class Init extends base_command_1.default {
         // Create service on platform
         this.log(`Creating service "${projectName}" in workspace "${workspace.name}"...`);
         const serviceName = projectName;
-        const service = await (0, upgrade_1.withUpgradeRetry)(() => services_1.servicesApi.create(workspace.slug, {
+        const service = await (0, upgrade_1.withUpgradeRetry)(() => services_1.servicesApi.create(workspace.id, {
             name: serviceName,
         }));
         // Clone template

package/dist/commands/link.js

@@ -63,10 +63,10 @@ class Link extends base_command_1.default {
         // Determine service
         let service;
         if (flags.service) {
-            service = await services_1.servicesApi.get(workspace.slug, flags.service);
+            service = await services_1.servicesApi.get(workspace.id, flags.service);
         }
         else {
-            const servicesResponse = await services_1.servicesApi.list(workspace.slug);
+            const servicesResponse = await services_1.servicesApi.list(workspace.id);
             const services = servicesResponse.data;
             const choices = [
                 ...services.map((svc) => ({
@@ -97,7 +97,7 @@ class Link extends base_command_1.default {
                     },
                 ]);
                 this.log(`Creating service "${serviceName}"...`);
-                service = await (0, upgrade_1.withUpgradeRetry)(() => services_1.servicesApi.create(workspace.slug, {
+                service = await (0, upgrade_1.withUpgradeRetry)(() => services_1.servicesApi.create(workspace.id, {
                     name: serviceName,
                 }));
             }

package/dist/commands/login.js

@@ -298,9 +298,9 @@ class Login extends base_command_1.default {
             this.log(`Successfully logged in as ${tokenResponse.user.email}`);
             this.log("");
             this.log("Next steps:");
-            this.log("  apso whoami     - View your account info");
-            this.log("  apso services   - List your services");
-            this.log("  apso tui        - Launch interactive UI");
+            this.log("  apso use        - Select your workspace");
+            this.log("  apso whoami     - View your account + workspace");
+            this.log("  apso projects   - List services in a workspace");
         }
         catch (error) {
             if (error instanceof Error) {

package/dist/commands/projects.js

@@ -13,17 +13,28 @@ class Projects extends base_command_1.default {
         if (!config_1.credentials.isValid()) {
             this.error("Not logged in. Run 'apso login' first.");
         }
-        // Determine workspace
+        // Determine workspace. The BFF scopes services by the NUMERIC workspace id,
+        // so resolve slugs to an id before listing.
+        let workspaceId;
         let workspaceSlug;
         if (flags.workspace) {
-            workspaceSlug = flags.workspace;
+            const ws = await services_1.workspacesApi.get(flags.workspace);
+            workspaceId = String(ws.id);
+            workspaceSlug = ws.slug;
         }
         else {
-            // Try from existing link
+            // Prefer an existing link, then the active workspace set via `apso use`,
+            // and only prompt as a last resort.
             const link = config_1.projectLink.read();
+            const active = config_1.globalConfig.read();
             if (link) {
+                workspaceId = String(link.workspaceId);
                 workspaceSlug = link.workspaceSlug;
             }
+            else if (active.activeWorkspaceId) {
+                workspaceId = active.activeWorkspaceId;
+                workspaceSlug = active.activeWorkspaceSlug || active.activeWorkspaceId;
+            }
             else {
                 // Prompt
                 const workspaces = await services_1.workspacesApi.list();
@@ -41,11 +52,12 @@ class Projects extends base_command_1.default {
                         })),
                     },
                 ]);
+                workspaceId = String(response.workspace.id);
                 workspaceSlug = response.workspace.slug;
             }
         }
-        // Fetch services
-        const servicesResponse = await services_1.servicesApi.list(workspaceSlug);
+        // Fetch services (scoped by numeric workspace id)
+        const servicesResponse = await services_1.servicesApi.list(workspaceId);
         const services = servicesResponse.data;
         if (services.length === 0) {
             this.log(`No services found in workspace "${workspaceSlug}".`);

package/dist/commands/status.js

@@ -16,7 +16,7 @@ class Status extends base_command_1.default {
             this.error("Project not linked. Run 'apso link' first.");
         }
         // Fetch service
-        const service = await services_1.servicesApi.get(link.workspaceSlug, link.serviceSlug);
+        const service = await services_1.servicesApi.get(link.workspaceId, link.serviceSlug);
         this.log(`Service: ${service.name} (${service.slug})`);
         this.log(`Workspace: ${link.workspaceSlug}`);
         this.log(`Status: ${service.status}`);

package/dist/commands/use.d.ts

@@ -0,0 +1,14 @@
+import BaseCommand from "../lib/base-command";
+/**
+ * Select the active workspace for subsequent CLI commands. With no argument it
+ * shows an interactive picker; pass a slug/name to set it directly. The choice
+ * persists to ~/.apso/config.json and scopes every workspace-aware command.
+ */
+export default class Use extends BaseCommand {
+    static description: string;
+    static examples: string[];
+    static args: {
+        workspace: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
+    };
+    run(): Promise<void>;
+}

package/dist/commands/use.js

@@ -0,0 +1,86 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const core_1 = require("@oclif/core");
+const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
+const base_command_1 = tslib_1.__importDefault(require("../lib/base-command"));
+const config_1 = require("../lib/config");
+const services_1 = require("../lib/api/services");
+/**
+ * Select the active workspace for subsequent CLI commands. With no argument it
+ * shows an interactive picker; pass a slug/name to set it directly. The choice
+ * persists to ~/.apso/config.json and scopes every workspace-aware command.
+ */
+class Use extends base_command_1.default {
+    async run() {
+        const { args } = await this.parse(Use);
+        if (!config_1.credentials.isValid()) {
+            this.error("Not logged in. Run 'apso login' first.");
+        }
+        const workspaces = await services_1.workspacesApi.list();
+        if (workspaces.length === 0) {
+            this.error("No workspaces found. Create one at https://app.apso.cloud first.");
+        }
+        let ws;
+        if (args.workspace) {
+            ws = workspaces.find((w) => w.slug === args.workspace || w.name === args.workspace);
+            if (!ws) {
+                this.error(`Workspace not found: ${args.workspace}\nRun 'apso use' to pick from a list.`);
+            }
+        }
+        else if (workspaces.length === 1) {
+            ws = workspaces[0];
+        }
+        else {
+            const answer = await inquirer_1.default.prompt([
+                {
+                    type: "list",
+                    name: "workspace",
+                    message: "Select your workspace:",
+                    choices: workspaces.map((w) => ({
+                        name: `${w.name} (${w.slug})`,
+                        value: w,
+                    })),
+                },
+            ]);
+            ws = answer.workspace;
+        }
+        config_1.globalConfig.write({
+            activeWorkspaceId: String(ws.id),
+            activeWorkspaceSlug: ws.slug,
+            activeWorkspaceName: ws.name,
+        });
+        this.log("");
+        this.log(`  Now using workspace: ${ws.name} (${ws.slug})`);
+        // Show what's in the workspace so the next step is obvious.
+        try {
+            const services = (await services_1.servicesApi.list(ws.id)).data;
+            this.log("");
+            if (services.length > 0) {
+                this.log("  Services:");
+                for (const s of services) {
+                    this.log(`    - ${s.name} (${s.slug})`);
+                }
+                this.log("");
+                this.log("  Run 'apso link' inside a project to work with one.");
+            }
+            else {
+                this.log("  No services yet.");
+                this.log("  Run 'apso init' to scaffold one, then 'apso deploy' to ship it.");
+            }
+        }
+        catch {
+            // listing is a convenience; never fail `use` over it
+        }
+        this.log("");
+    }
+}
+Use.description = "Select the active workspace for CLI commands";
+Use.examples = ["$ apso use", "$ apso use my-workspace"];
+Use.args = {
+    workspace: core_1.Args.string({
+        description: "Workspace slug or name (skips the picker)",
+        required: false,
+    }),
+};
+exports.default = Use;

package/dist/commands/whoami.js

@@ -71,12 +71,14 @@ class Whoami extends base_command_1.default {
             this.log(`  Workspace: ${link.workspaceSlug}`);
             this.log(`  Service:   ${link.serviceSlug}`);
         }
-        else if (config.defaultWorkspace) {
-            this.log(`  Workspace: ${config.defaultWorkspace} (default)`);
-            this.log("  Service:   None (run 'apso use <service>' to set)");
+        else if (config.activeWorkspaceName || config.activeWorkspaceSlug) {
+            const name = config.activeWorkspaceName || config.activeWorkspaceSlug;
+            const slug = config.activeWorkspaceSlug;
+            this.log(`  Workspace: ${name}${slug ? ` (${slug})` : ""}`);
+            this.log("  Service:   None (run 'apso link' in a project to set)");
         }
         else {
-            this.log("  Workspace: None (run 'apso use <service>' to set)");
+            this.log("  Workspace: None (run 'apso use' to select one)");
             this.log("  Service:   None");
         }
         this.log("");

package/dist/lib/api/client.js

@@ -225,7 +225,9 @@ async function apiRequest(path, options = {}) {
         // Resolve the active workspace id from, in order: an explicit header the
         // caller passed, the APSO_WORKSPACE_ID env override, or the linked project.
         if (!requestHeaders["X-Workspace-Id"]) {
-            const activeWorkspaceId = process.env.APSO_WORKSPACE_ID || ((_a = config_1.projectLink.read()) === null || _a === void 0 ? void 0 : _a.workspaceId);
+            const activeWorkspaceId = process.env.APSO_WORKSPACE_ID ||
+                ((_a = config_1.projectLink.read()) === null || _a === void 0 ? void 0 : _a.workspaceId) ||
+                config_1.globalConfig.read().activeWorkspaceId;
             if (activeWorkspaceId) {
                 requestHeaders["X-Workspace-Id"] = String(activeWorkspaceId);
             }

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

@@ -37,15 +37,15 @@ export declare const workspacesApi: {
  * Services API
  */
 export declare const servicesApi: {
-    list(_workspaceSlug?: string, options?: {
+    list(workspaceId?: string | number, options?: {
         status?: string;
         page?: number;
         pageSize?: number;
     }): Promise<PaginatedResponse<Service>>;
     getById(id: string): Promise<Service>;
-    /** Resolve (workspace, serviceSlug) to a service via the workspace-scoped list. */
-    get(_workspaceSlug: string, serviceSlug: string): Promise<Service>;
-    create(_workspaceSlug: string, data: {
+    /** Resolve (workspaceId, serviceSlug) to a service via the workspace-scoped list. */
+    get(workspaceId: string, serviceSlug: string): Promise<Service>;
+    create(workspaceId: string, data: {
         name: string;
         slug?: string;
         description?: string;

package/dist/lib/api/services.js

@@ -128,30 +128,39 @@ exports.workspacesApi = {
  * Services API
  */
 exports.servicesApi = {
-    async list(_workspaceSlug, options) {
+    async list(workspaceId, 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 });
+        // The BFF scopes /api/services by the NUMERIC workspace id in the
+        // X-Workspace-Id header (not the slug). Pass it explicitly so the call
+        // works even before a project is linked.
+        const headers = workspaceId
+            ? { "X-Workspace-Id": String(workspaceId) }
+            : undefined;
+        const raw = await client_1.api.get("/api/services", { params, headers });
         return adaptPaginated(raw, adaptService);
     },
     async getById(id) {
         const raw = await client_1.api.get(`/api/services/${id}`);
         return adaptService(raw);
     },
-    /** Resolve (workspace, serviceSlug) to a service via the workspace-scoped list. */
-    async get(_workspaceSlug, serviceSlug) {
-        const list = await this.list();
+    /** Resolve (workspaceId, serviceSlug) to a service via the workspace-scoped list. */
+    async get(workspaceId, serviceSlug) {
+        const list = await this.list(workspaceId);
         const match = list.data.find((s) => s.slug === serviceSlug);
         if (!match)
             throw new Error(`Service not found: ${serviceSlug}`);
         return match;
     },
-    async create(_workspaceSlug, data) {
-        const raw = await client_1.api.post("/api/services", { name: data.name });
+    async create(workspaceId, data) {
+        const headers = workspaceId
+            ? { "X-Workspace-Id": String(workspaceId) }
+            : undefined;
+        const raw = await client_1.api.post("/api/services", { name: data.name }, { headers });
         return adaptService(raw);
     },
     async update(_workspaceSlug, serviceSlugOrId, data) {

package/dist/lib/config/manager.js

@@ -72,6 +72,15 @@ exports.globalConfig = {
         if (fileConfig) {
             Object.assign(config, fileConfig);
         }
+        // Auto-migrate legacy apso.ai hosts written by an older CLI. Without this a
+        // saved config keeps pointing login/API at the retired app.apso.ai/
+        // api.apso.ai instead of the current apso.cloud defaults.
+        if (config.apiUrl && /(?:app|api)\.apso\.ai\b/.test(config.apiUrl)) {
+            config.apiUrl = types_1.DEFAULT_GLOBAL_CONFIG.apiUrl;
+        }
+        if (config.webUrl && /(?:app|api)\.apso\.ai\b/.test(config.webUrl)) {
+            config.webUrl = types_1.DEFAULT_GLOBAL_CONFIG.webUrl;
+        }
         // Override with environment variables
         if (process.env.APSO_API_URL) {
             config.apiUrl = process.env.APSO_API_URL;

package/dist/lib/config/types.d.ts

@@ -96,6 +96,13 @@ export interface GlobalConfigFile {
      * Default workspace slug to use
      */
     defaultWorkspace?: string;
+    /**
+     * Active workspace, set via `apso use`. The numeric id scopes API calls
+     * (X-Workspace-Id); slug/name are for display.
+     */
+    activeWorkspaceId?: string;
+    activeWorkspaceSlug?: string;
+    activeWorkspaceName?: string;
     /**
      * Platform API base URL
      */

package/npm-shrinkwrap.json

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

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.21.0",
+  "version": "0.22.0",
   "commands": {
     "config": {
       "id": "config",
@@ -501,6 +501,28 @@
       },
       "args": {}
     },
+    "use": {
+      "id": "use",
+      "description": "Select the active workspace for CLI commands",
+      "strict": true,
+      "pluginName": "@apso/cli",
+      "pluginAlias": "@apso/cli",
+      "pluginType": "core",
+      "aliases": [],
+      "hiddenAliases": [],
+      "examples": [
+        "$ apso use",
+        "$ apso use my-workspace"
+      ],
+      "flags": {},
+      "args": {
+        "workspace": {
+          "name": "workspace",
+          "description": "Workspace slug or name (skips the picker)",
+          "required": false
+        }
+      }
+    },
     "whoami": {
       "id": "whoami",
       "description": "Display information about the current user and context",

package/package.json

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