ninepm 0.56.0 → 0.57.0

package/README.md

@@ -76,6 +76,7 @@ Attach an optional short description to the deploy (shown next to the version in
 
 ```sh
 9pm deploy ./dist --name my-app --slug my-app --description "Fix login redirect"
+9pm deploy ./dist --name my-app --slug my-app --owner acme   # into an organisation you are an admin of
 ```
 
 The CLI prints the public app URL after upload and finalization.

package/dist/index.d.ts

@@ -7,6 +7,7 @@ export interface DeployOptions {
     token: string;
     name?: string;
     slug?: string;
+    owner?: string;
     description?: string;
     environment?: string;
     withDatabase?: boolean;
@@ -50,6 +51,7 @@ export interface SiteAccessOptions extends ApiOptions {
 }
 export interface DeleteSiteOptions extends SiteAccessOptions {
     confirmSlug: string;
+    owner?: string;
     keepRecord?: boolean;
 }
 export interface AccessState {
@@ -114,7 +116,7 @@ export interface CreatedServiceToken {
     clientSecret: string;
 }
 export type FetchLike = (input: string | URL | Request, init?: RequestInit) => Promise<Response>;
-export declare const CLI_VERSION = "0.56.0";
+export declare const CLI_VERSION = "0.57.0";
 type CredentialBackend = "macos-keychain" | "windows-dpapi" | "linux-secret-service" | "file-plaintext" | "none";
 export interface StoredCredentialEntry {
     token: string;
@@ -321,7 +323,9 @@ export declare function checkSkillFreshness(options?: {
 export interface ListSitesResult {
     projects: Project[];
 }
-export declare function listSites(options: ApiOptions): Promise<ListSitesResult>;
+export declare function listSites(options: ApiOptions & {
+    owner?: string;
+}): Promise<ListSitesResult>;
 export declare function deleteSite(options: DeleteSiteOptions): Promise<DeletedSiteResult>;
 export interface DeviceAuthFeedbackOptions {
     progressStream?: NodeJS.WriteStream;
@@ -430,6 +434,7 @@ type CliCommand = {
     apiUrl: string;
     token: string;
     json: boolean;
+    owner?: string;
 } | {
     kind: "logs";
     site: string;

package/dist/index.js

@@ -14,7 +14,7 @@ import { MAX_DEPLOY_DESCRIPTION_LENGTH, normalizeDeployDescription } from "./dep
 import { MAX_STATIC_ASSET_FILE_BYTES, MAX_WORKER_ENTRY_COMPRESSED_BYTES, MAX_WORKER_SCRIPT_COMPRESSED_BYTES, WORKER_ENTRY_COMPRESSED_WARN_BYTES, assetFileTooLargeMessage, formatMebibytes, formatMegabytes, oversizedAssets, workerBundleNearLimitMessage, workerBundleTooLargeMessage, workerEntryNearLimitMessage, workerEntryTooLargeMessage, } from "./deploy-limits.js";
 import { buildFileManifest, readManifestFile } from "./manifest.js";
 import { API_KEY_HELP, API_URL_HELP, CLI_CLIENT_ID, DEFAULT_API_URL, reportCliError } from "./cli-config.js";
-export const CLI_VERSION = "0.56.0";
+export const CLI_VERSION = "0.57.0";
 const PUBLIC_DASHBOARD_URL = "https://9pm.ai/dashboard";
 const TOKEN_SERVICE = "9pm";
 const TOKEN_ACCOUNT = "default";
@@ -269,6 +269,7 @@ export async function deployDirectory(initialOptions) {
                     ...(initialOptions.fetchFn ? { fetchFn: initialOptions.fetchFn } : {}),
                     site: slugHolder.slug,
                     confirmSlug: slugHolder.slug,
+                    ...(initialOptions.owner ? { owner: initialOptions.owner } : {}),
                     ...(slugHolder.retain ? { keepRecord: true } : {}),
                 });
             }
@@ -339,8 +340,8 @@ async function runDeploy(initialOptions, slugHolder) {
         }
         const image = buildContainerImage(options.directory);
         try {
-            const projectInput = { name: options.name ?? path.basename(path.resolve(options.directory)) };
-            const { project, created: projectCreated } = await createProject(fetchFn, apiUrl, options.token, options.slug ? { ...projectInput, slug: options.slug } : projectInput);
+            const projectInput = { name: options.name ?? path.basename(path.resolve(options.directory)), ...(options.slug ? { slug: options.slug } : {}), ...(options.owner ? { owner: options.owner } : {}) };
+            const { project, created: projectCreated } = await createProject(fetchFn, apiUrl, options.token, projectInput);
             slugHolder.slug = project.slug;
             slugHolder.created = projectCreated;
             slugHolder.neverActive = project.activeDeploymentId === null;
@@ -504,8 +505,8 @@ async function runDeploy(initialOptions, slugHolder) {
             console.warn(`Warning: ${workerBundleNearLimitMessage(modulePaths.length, rawBytes, compressedBytes)}`);
         }
     }
-    const projectInput = { name: options.name ?? path.basename(path.resolve(options.directory)) };
-    const { project, created: projectCreated } = await createProject(fetchFn, apiUrl, options.token, options.slug ? { ...projectInput, slug: options.slug } : projectInput);
+    const projectInput = { name: options.name ?? path.basename(path.resolve(options.directory)), ...(options.slug ? { slug: options.slug } : {}), ...(options.owner ? { owner: options.owner } : {}) };
+    const { project, created: projectCreated } = await createProject(fetchFn, apiUrl, options.token, projectInput);
     slugHolder.slug = project.slug;
     slugHolder.created = projectCreated;
     const database = options.withDatabase
@@ -1199,11 +1200,13 @@ function readUpdateCheckCache(cachePath) {
     }
 }
 export async function listSites(options) {
-    const payload = await apiRequest(options, "/v1/sites", { method: "GET" });
+    const route = options.owner ? `/v1/sites?owner=${encodeURIComponent(options.owner)}` : "/v1/sites";
+    const payload = await apiRequest(options, route, { method: "GET" });
     return { projects: payload.projects };
 }
 export async function deleteSite(options) {
-    const payload = await apiRequest(options, `/v1/sites/${encodeURIComponent(options.site)}`, {
+    const route = `/v1/sites/${encodeURIComponent(options.site)}${options.owner ? `?owner=${encodeURIComponent(options.owner)}` : ""}`;
+    const payload = await apiRequest(options, route, {
         method: "DELETE",
         body: JSON.stringify({ confirmSlug: options.confirmSlug, ...(options.keepRecord ? { keepRecord: true } : {}) }),
     });
@@ -2154,6 +2157,7 @@ const VALID_DEPLOY_FLAGS = new Set([
     "email",
     "name",
     "slug",
+    "owner",
     "description",
     "environment",
     "database-name",
@@ -2231,7 +2235,8 @@ export function parseArgs(argv) {
     }
     if (command === "apps" || command === "list" || command === "ls" || command === "sites" || command === "projects") {
         const flags = parseFlags(argv);
-        return { kind: "apps", ...readBaseApiOptions(flags), json: flags.has("json") };
+        const owner = readStringFlag(flags, "owner");
+        return { kind: "apps", ...readBaseApiOptions(flags), json: flags.has("json"), ...(owner ? { owner } : {}) };
     }
     if (command === "latest" || command === "upgrade" || command === "update") {
         const flags = parseFlags(argv);
@@ -2292,6 +2297,7 @@ export function parseArgs(argv) {
     };
     const name = readStringFlag(flags, "name");
     const slug = readStringFlag(flags, "slug");
+    const owner = readStringFlag(flags, "owner");
     const description = readStringFlag(flags, "description");
     const environment = readStringFlag(flags, "environment");
     const databaseName = readStringFlag(flags, "database-name");
@@ -2307,6 +2313,9 @@ export function parseArgs(argv) {
     if (slug) {
         options.slug = slug;
     }
+    if (owner) {
+        options.owner = owner;
+    }
     let normalizedDescription;
     try {
         normalizedDescription = normalizeDeployDescription(description);
@@ -3944,7 +3953,7 @@ async function main() {
             if (queued) {
                 console.log(`Status: ${result.deployment.status}. Run 9pm apps to check when it becomes active.`);
             }
-            console.log(`Manage: ${PUBLIC_DASHBOARD_URL}`);
+            console.log(`Manage: ${PUBLIC_DASHBOARD_URL}${command.options.owner ? `?owner=${encodeURIComponent(command.options.owner)}` : ""}`);
             // Gated the same way as the reachability probe above: a programmatic
             // caller injecting fetchFn opted out of the CLI's own network side trips.
             if (!command.options.fetchFn) {
@@ -4144,7 +4153,7 @@ async function main() {
             return;
         }
         if (command.kind === "apps") {
-            const result = await listSites({ apiUrl: command.apiUrl, token: command.token });
+            const result = await listSites({ apiUrl: command.apiUrl, token: command.token, ...(command.owner ? { owner: command.owner } : {}) });
             if (command.json) {
                 console.log(JSON.stringify(result, null, 2));
                 return;
@@ -4395,7 +4404,7 @@ async function runFilesCommand(command) {
 function printUsage() {
     console.log(`Usage:
   9pm --version
-  9pm deploy [directory] --name <site-name> [--slug <slug>] [--description "<note>"] [--with-db] [--with-auth] [--with-email]
+  9pm deploy [directory] --name <site-name> [--slug <slug>] [--owner <organisation>] [--description "<note>"] [--with-db] [--with-auth] [--with-email]
   9pm deploy [directory] --runtime worker --entry src/index.js [--with-db]
   9pm deploy [directory] --runtime container --port 8080 [--health-path /health] [--region auto] [--with-db] [--always-on] [--volume <gb> | --no-volume] [--cpus <n>] [--memory <size>]
   9pm deploy [directory]                   framework projects (Next.js, Vite) are detected and built automatically; --no-build skips
@@ -4407,7 +4416,7 @@ function printUsage() {
   9pm logout [--api-url <url>] [--local]   revokes the credential server-side, then removes it from this machine (--local skips the revoke)
   9pm doctor [--json]
   9pm whoami [--json]
-  9pm apps [--json]
+  9pm apps [--owner <organisation>] [--json]
   9pm latest [--json]
   9pm support -m "<what happened>" [--subject <subject>] [--site <app>]
   9pm files list [--project <site>]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ninepm",
-  "version": "0.56.0",
+  "version": "0.57.0",
   "description": "CLI for deploying built apps to 9pm.ai.",
   "homepage": "https://9pm.ai",
   "keywords": [