@gravity-rail/cli 0.11.0 → 0.13.0

package/dist/lib.js

@@ -7823,6 +7823,11 @@ function priceSummary(product) {
   }
   return parts.join(", ") || "\u2014";
 }
+function checkoutPeriod(args) {
+  const value = typeof args.period === "string" ? args.period : "month";
+  if (value === "month" || value === "quarter" || value === "year") return value;
+  throw new Error("Billing period must be 'month', 'quarter', or 'year'");
+}
 var PRODUCT_COLUMNS2 = [
   { header: "ID", getValue: (p) => String(p.id ?? "") },
   { header: "NAME", getValue: (p) => p.name ?? "" },
@@ -7847,6 +7852,14 @@ var SUBSCRIPTION_COLUMNS = [
     getValue: (s) => String(s.customerOrganizationUuid ?? s.organizationUuid ?? "")
   }
 ];
+var CONTRACT_BEARING_STATUSES = /* @__PURE__ */ new Set([
+  "incomplete",
+  "trialing",
+  "active",
+  "past_due",
+  "unpaid",
+  "paused"
+]);
 function isTable(ctx) {
   return (ctx.outputFormat ?? "table") === "table";
 }
@@ -7884,7 +7897,7 @@ var billingDomain = {
         } else {
           hint(ctx, [
             "Next \u2014 buy an organization plan to get started:",
-            "  gr billing checkout --product <id> [--period month|year]"
+            "  gr billing checkout --product <id> [--org <id>|--new-org]"
           ]);
         }
       }
@@ -7896,15 +7909,40 @@ var billingDomain = {
       requiresWorkspace: false,
       args: [
         { name: "product", description: "Product ID of the org plan to buy", required: true },
-        { name: "period", description: "Billing period: 'month' or 'year'", default: "month" }
+        {
+          name: "period",
+          description: "Billing period: 'month', 'quarter', or 'year'",
+          default: "month"
+        },
+        {
+          name: "org",
+          description: "Existing organization ID to own the subscription"
+        },
+        {
+          name: "new-org",
+          description: "Create a new organization for this subscription",
+          isFlag: true
+        }
+      ],
+      examples: [
+        "gr billing checkout --product 12 --period month --org 7",
+        "gr billing checkout --product 12 --period month --new-org"
       ],
-      examples: ["gr billing checkout --product 12 --period month"],
       handler: async ({ ctx, args }) => {
         const productId = Number(requireString(args, "product"));
-        const period = args.period || "month";
+        const period = checkoutPeriod(args);
+        const organizationId = typeof args.org === "string" ? Number(args.org) : void 0;
+        const createNewOrg = args["new-org"] === true;
+        if (organizationId !== void 0 && (!Number.isInteger(organizationId) || organizationId <= 0)) {
+          throw new Error("Organization ID must be a positive integer");
+        }
+        if (organizationId !== void 0 && createNewOrg) {
+          throw new Error("Choose either --org or --new-org, not both");
+        }
         const result2 = await requireAuth(ctx).apiClient.createCheckoutSession(
           productId,
-          period
+          period,
+          organizationId !== void 0 || createNewOrg ? { checkoutContext: { organizationId, createNewOrg } } : void 0
         );
         if (isTable(ctx)) {
           process.stdout.write(
@@ -7931,10 +7969,10 @@ Then check it landed:
       handler: async ({ ctx }) => {
         const subs = await requireAuth(ctx).apiClient.getSubscriptions();
         outputData(subs, ctx, SUBSCRIPTION_COLUMNS);
-        const active = subs.find(
-          (s) => ["active", "trialing"].includes(String(s.status ?? s.subscriptionStatus ?? ""))
+        const contract = subs.find(
+          (s) => CONTRACT_BEARING_STATUSES.has(String(s.status ?? s.subscriptionStatus ?? ""))
         );
-        if (!active) {
+        if (!contract) {
           hint(ctx, [
             "No active subscription yet. To get started:",
             "  gr billing products --type org        # pick a plan",
@@ -7942,8 +7980,16 @@ Then check it landed:
           ]);
           return;
         }
+        const contractStatus = String(contract.status ?? contract.subscriptionStatus ?? "");
+        if (!["active", "trialing"].includes(contractStatus)) {
+          hint(ctx, [
+            `Your subscription is ${contractStatus}; it still represents a live billing contract.`,
+            "Resolve its payment or cancellation status in Gravity Rail billing before starting another checkout."
+          ]);
+          return;
+        }
         const orgUuid = String(
-          active.organizationUuid ?? active.customerOrganizationUuid ?? "<org-uuid>"
+          contract.organizationUuid ?? contract.customerOrganizationUuid ?? "<org-uuid>"
         );
         hint(ctx, [
           "You have an active subscription. Add a workspace:",
@@ -15835,6 +15881,7 @@ var MAX_HITL_ROUNDS = 25;
 async function runConciergeAguiLoop(client, initialMessages, onEvent, opts) {
   let streamText = "";
   let hasToolCalls = false;
+  let errorMessage;
   let resume;
   for (let round = 0; round < MAX_HITL_ROUNDS; round++) {
     let hitlPayload = null;
@@ -15851,8 +15898,11 @@ async function runConciergeAguiLoop(client, initialMessages, onEvent, opts) {
         const type = event.type?.toLowerCase() ?? "";
         if (type === "tool_call_start") hasToolCalls = true;
         const errorMsg = getErrorMessage(event);
-        if (errorMsg) process.stderr.write(`\x1B[31mError: ${errorMsg}\x1B[0m
+        if (errorMsg) {
+          errorMessage = errorMsg;
+          process.stderr.write(`\x1B[31mError: ${errorMsg}\x1B[0m
 `);
+        }
         const hitl = extractHumanInputRequest(event);
         if (hitl) hitlPayload = hitl;
       },
@@ -15881,13 +15931,15 @@ async function runConciergeAguiLoop(client, initialMessages, onEvent, opts) {
       return {
         streamText,
         hasToolCalls,
-        unsupportedHitl: normalizeUnsupportedHitl(hitlPayload)
+        unsupportedHitl: normalizeUnsupportedHitl(hitlPayload),
+        errorMessage
       };
     }
     resume = next;
     streamText = "";
+    errorMessage = void 0;
   }
-  return { streamText, hasToolCalls };
+  return { streamText, hasToolCalls, errorMessage };
 }
 function normalizeUnsupportedHitl(raw) {
   const payload = raw && typeof raw === "object" ? raw : {};
@@ -17463,6 +17515,7 @@ var AudioPlayer = class extends EventEmitter2 {
 
 // src/lib/chat-session.ts
 var HITL_INTERRUPT_EXIT_CODE = 3;
+var NO_FINAL_RESPONSE_EXIT_CODE = 4;
 async function runChatSession(session, args) {
   const debug = !!args.debug;
   const isVoice = !!args.voice;
@@ -17519,7 +17572,7 @@ async function singleTurnChatSession(session, message, debug, autoApprove = fals
 `);
     }
   };
-  const { streamText, hasToolCalls, unsupportedHitl } = await runConciergeAguiLoop(
+  const { streamText, hasToolCalls, unsupportedHitl, errorMessage } = await runConciergeAguiLoop(
     aguiClient,
     [{ role: "user", content: message }],
     onEvent,
@@ -17573,12 +17626,30 @@ async function singleTurnChatSession(session, message, debug, autoApprove = fals
       } catch {
       }
     }
-    process.stdout.write(`\x1B[32mAssistant:\x1B[0m ${finalText || "(no text response)"}
-`);
-  } else {
-    process.stdout.write(`\x1B[32mAssistant:\x1B[0m (no response)
+    if (finalText) {
+      process.stdout.write(`\x1B[32mAssistant:\x1B[0m ${finalText}
 `);
+      return;
+    }
+    throw noFinalResponseError(
+      errorMessage,
+      /* hadToolCalls */
+      true
+    );
   }
+  if (errorMessage) {
+    throw noFinalResponseError(
+      errorMessage,
+      /* hadToolCalls */
+      false
+    );
+  }
+  process.stdout.write(`\x1B[32mAssistant:\x1B[0m (no response)
+`);
+}
+function noFinalResponseError(errorMessage, hadToolCalls) {
+  const detail = errorMessage ? `inference error: ${errorMessage}` : hadToolCalls ? "the turn ran tool calls but returned no summary (side effects may have been applied)" : "no response from the assistant";
+  return new CLIError(`No assistant reply \u2014 ${detail}`, NO_FINAL_RESPONSE_EXIT_CODE);
 }
 async function interactiveChatSession(session, debug, autoApprove, allowWrite) {
   const aguiClient = new AGUIClient({