oneclient 0.1.1 → 0.1.3

package/dist/config.d.ts

@@ -1,4 +1,7 @@
 export declare const DEFAULT_CONTROL_API_URL = "https://control.one-client.com";
 export declare const DEFAULT_CONSOLE_ORIGIN = "https://console.one-client.com";
 export declare function developerAuthOrigin(apiUrl: string): string;
+export declare function inferOrganizationId(explicitId: string | undefined, organizations: Array<{
+    id: string;
+}>): string;
 //# sourceMappingURL=config.d.ts.map

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,uBAAuB,mCAAmC,CAAC;AACxE,eAAO,MAAM,sBAAsB,mCAAmC,CAAC;AAEvE,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAG1D"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,uBAAuB,mCAAmC,CAAC;AACxE,eAAO,MAAM,sBAAsB,mCAAmC,CAAC;AAEvE,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAG1D;AAED,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,aAAa,EAAE,KAAK,CAAC;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC,GACnC,MAAM,CAMR"}

package/dist/config.js

@@ -4,3 +4,12 @@ export function developerAuthOrigin(apiUrl) {
     const origin = new URL(apiUrl).origin;
     return origin === DEFAULT_CONTROL_API_URL ? DEFAULT_CONSOLE_ORIGIN : origin;
 }
+export function inferOrganizationId(explicitId, organizations) {
+    if (explicitId)
+        return explicitId;
+    if (organizations.length === 1)
+        return organizations[0].id;
+    if (organizations.length === 0)
+        throw new Error("Create an organization with `oneclient organization:create` first");
+    throw new Error("This account has multiple organizations; pass --organization <id>");
+}

package/dist/index.js

@@ -5,7 +5,7 @@ import { readFile, stat } from "node:fs/promises";
 import process from "node:process";
 import { createInterface } from "node:readline/promises";
 import { Command } from "commander";
-import { createClient } from "@oneclient/sdk";
+import { createClient, creditsToMicros, OneClientError, } from "@oneclient/sdk";
 import { deploymentWaitTimeout, waitForDeployment } from "./deployment-wait.js";
 import { createArtifact } from "./artifact-create.js";
 import { clearDeveloperCredentials, readDeveloperCredentials, writeDeveloperCredentials, } from "./credentials.js";
@@ -14,12 +14,12 @@ import { deployTokenFromEnvironment, parseServerKeyScopes, serverKeyFromEnvironm
 import { secretValueFromOptions } from "./secret-input.js";
 import { brand, formatOutput, statusLine } from "./presenter.js";
 import { slugify } from "./slug.js";
-import { DEFAULT_CONTROL_API_URL } from "./config.js";
+import { DEFAULT_CONTROL_API_URL, inferOrganizationId } from "./config.js";
 const program = new Command();
 program
     .name("oneclient")
     .description("Deploy and manage OneClient projects")
-    .version("0.1.1")
+    .version("0.1.3")
     .option("--api-url <url>", "Control or environment API URL", process.env.ONECLIENT_API_URL)
     .option("--organization <id>", "Organization ID", process.env.ONECLIENT_ORGANIZATION_ID)
     .option("--json", "Print stable JSON for scripts and agents", false)
@@ -115,7 +115,7 @@ program
 program
     .command("projects")
     .description("List projects")
-    .action(async () => print(await sessionClient().then((api) => api.projects.list()), "Projects"));
+    .action(async () => print(await organizationSessionClient().then((api) => api.projects.list()), "Projects"));
 program
     .command("project:create")
     .description("Create a project and its development and production environments")
@@ -155,7 +155,7 @@ program
 program
     .command("usage")
     .description("Show the prepaid wallet and retention reserve")
-    .action(async () => print(await sessionClient().then((api) => api.usage.summary()), "Usage & balance"));
+    .action(async () => print(await organizationSessionClient().then((api) => api.usage.summary()), "Usage & balance"));
 program
     .command("status")
     .description("Show account, organization, project, and spend status in one view")
@@ -199,7 +199,7 @@ program
     const limit = Number(options.limit);
     if (!Number.isInteger(limit) || limit < 1 || limit > 100)
         throw new Error("limit must be an integer from 1 through 100");
-    print(await sessionClient().then((api) => api.usage.activity(limit)), "Recent activity");
+    print(await organizationSessionClient().then((api) => api.usage.activity(limit)), "Recent activity");
 });
 program
     .command("deployments")
@@ -269,26 +269,26 @@ program
 program
     .command("billing:portal")
     .description("Create a secure Stripe billing-portal session")
-    .action(async () => print(await sessionClient().then((api) => api.billing.portal()), "Billing portal"));
+    .action(async () => print(await organizationSessionClient().then((api) => api.billing.portal()), "Billing portal"));
 program
     .command("billing:subscribe")
     .description("Create a subscription Checkout session")
-    .action(async () => print(await sessionClient().then((api) => api.billing.subscriptionCheckout()), "Subscription checkout"));
+    .action(async () => print(await organizationSessionClient().then((api) => api.billing.subscriptionCheckout()), "Subscription checkout"));
 program
     .command("billing:topup")
-    .description("Create a prepaid credit Checkout session")
-    .requiredOption("--usd <amount>", "USD amount; minimum $25")
+    .description("Create a prepaid OneClient credit-pack Checkout session")
+    .requiredOption("--credits <amount>", "OneClient credits; available packs start at 2,500")
     .action(async (options) => {
-    const dollars = Number(options.usd);
-    if (!Number.isFinite(dollars) || dollars < 25 || Math.round(dollars * 100) !== dollars * 100)
-        throw new Error("usd must be at least 25 with no more than two decimal places");
-    const amountMicros = String(Math.round(dollars * 1_000_000));
-    print(await sessionClient().then((api) => api.billing.topupCheckout(amountMicros)), "Credit checkout");
+    if (!/^[1-9][0-9]*$/.test(options.credits) || BigInt(options.credits) < 2500n) {
+        throw new Error("credits must be a whole number of at least 2,500");
+    }
+    const amountMicros = creditsToMicros(options.credits);
+    print(await organizationSessionClient().then((api) => api.billing.topupCheckout(amountMicros)), "Credit-pack checkout");
 });
 program
     .command("domain:list")
     .description("List application, API, and sending domains")
-    .action(async () => print(await sessionClient().then((api) => api.domains.list()), "Domains"));
+    .action(async () => print(await organizationSessionClient().then((api) => api.domains.list()), "Domains"));
 program
     .command("domain:add")
     .description("Attach a custom hostname")
@@ -553,6 +553,19 @@ program
     process.stdout.write(logs.endsWith("\n") ? logs : `${logs}\n`);
 });
 program.parseAsync().catch((error) => {
+    if (program.opts().json && error instanceof OneClientError) {
+        process.stderr.write(`${JSON.stringify({
+            error: {
+                code: error.code,
+                message: error.message,
+                requestId: error.requestId,
+                status: error.status,
+                ...(error.details ? { details: error.details } : {}),
+            },
+        })}\n`);
+        process.exitCode = 1;
+        return;
+    }
     const message = error instanceof Error ? error.message : String(error);
     process.stderr.write(`${statusLine("error", message, colorEnabled())}\n`);
     process.exitCode = 1;
@@ -572,6 +585,14 @@ async function sessionClient(organizationId) {
             : {}),
     });
 }
+async function organizationSessionClient() {
+    const explicitId = program.opts().organization;
+    if (explicitId)
+        return sessionClient(explicitId);
+    const base = await sessionClient();
+    const organizations = await base.organizations.list();
+    return sessionClient(inferOrganizationId(undefined, organizations));
+}
 async function deployClient() {
     const options = program.opts();
     const deployToken = deployTokenFromEnvironment();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oneclient",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "One package for the complete OneClient TypeScript SDK and developer CLI.",
   "license": "UNLICENSED",
   "homepage": "https://one-client.com",
@@ -38,8 +38,8 @@
   "dependencies": {
     "commander": "15.0.0",
     "tar": "7.5.22",
-    "@oneclient/contracts": "0.1.0",
-    "@oneclient/sdk": "0.1.0"
+    "@oneclient/sdk": "0.1.1",
+    "@oneclient/contracts": "0.1.0"
   },
   "devDependencies": {
     "@types/node": "26.4.0",