@revturbine/cli 0.5.2 → 0.7.0

package/dist/cli.js

@@ -3979,6 +3979,13 @@ var RevTurbineConfigSchema = z19.object({
   // The change set this export represents: the active change set by default,
   // or a specific change set when one is requested. Null for an unscoped export.
   change_set_id: z19.string().nullable().default(null).meta({ ...Unrestricted16, readOnly: true }),
+  // Origin target identity (plan 131 TASK-10, cli.md "Target-aware, portable"):
+  // stamped by the server on export so a downloaded Config File records where
+  // it came from; upload tooling targets these by default and flags a tenant
+  // mismatch against the session before sending. Optional — hand-authored and
+  // pre-existing configs carry no target.
+  tenant_id: z19.string().optional().meta({ ...Unrestricted16, readOnly: true }),
+  environment_id: z19.string().optional().meta({ ...Unrestricted16, readOnly: true }),
   plans: z19.array(RevTurbineConfigPlansItemSchema).meta(Unrestricted16),
   // Optional for back-compat: pre-plan-88 configs (and the live export until web
   // adopts the new @revt-eng/schema) omit it. Add-on definitions only; pricing
@@ -5562,7 +5569,7 @@ function evaluate(graph, opts = {}) {
 }
 
 // src/schema/version.ts
-var SCHEMA_VERSION = "0.1.107";
+var SCHEMA_VERSION = "0.1.108";
 
 // src/lib/credentials.ts
 import { chmodSync, existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from "fs";
@@ -6024,6 +6031,26 @@ function requireSelectors(opts, positionalFiles, {
   return found;
 }
 
+// src/lib/target.ts
+function resolveUploadTarget(params) {
+  const embedded = params.embedded ?? void 0;
+  const explicit = params.explicit ?? void 0;
+  if (explicit) {
+    return {
+      ok: true,
+      tenantId: explicit,
+      note: embedded && embedded !== explicit ? `retargeting deliberately: config was exported from ${embedded}, sending to ${explicit} (-t)` : void 0
+    };
+  }
+  if (!embedded || embedded === params.session) {
+    return { ok: true, tenantId: params.session };
+  }
+  return {
+    ok: false,
+    error: `this config was exported from tenant ${embedded}, but the session targets ${params.session}. Pass -t ${embedded} to send it back where it came from, or -t ${params.session} to retarget it deliberately.`
+  };
+}
+
 // src/lib/version-trail.ts
 function serverSchemaIsNewer(config, bundledVersion) {
   const server = config?.schema_version;
@@ -6086,6 +6113,17 @@ function connect(rawUrl, explicitTenantId) {
     }
   };
 }
+function uploadTenantFor(rawUrl, config, explicit) {
+  const cred = getCredential(normalizeBaseUrl(rawUrl));
+  const target = resolveUploadTarget({
+    embedded: config?.tenant_id,
+    explicit,
+    session: cred?.tenant_id ?? "dev-tenant-001"
+  });
+  if (!target.ok) fail(EXIT.VALIDATION, target.error);
+  if (target.note) diag(target.note);
+  return target.tenantId;
+}
 function authHint(url, status) {
   if (status === 401 || status === 403) {
     diag(`Authentication required for ${url}. Log in with:
@@ -6526,7 +6564,7 @@ program.command("show").description(`Render a summary view of a config version.
 program.command("upload").description("Stage a Config File as the open draft (POST /api/config/import).").argument("<config>", "Path to a Config File").option("-u, --url <url>", "RevTurbine instance URL", DEFAULT_URL).option("-t, --tenant-id <id>", "x-tenant-id (defaults to the stored token tenant)").action(async (configFile2, opts) => {
   const config = verifyConfig(configFile2);
   if (config === null) fail(EXIT.VALIDATION, `Fix the issues above in ${configFile2}, then re-run.`);
-  const conn = connect(opts.url, opts.tenantId);
+  const conn = connect(opts.url, uploadTenantFor(opts.url, config, opts.tenantId));
   diag(`Staging ${configFile2} as the open draft (${conn.url}/api/config/import) \u2026`);
   const { res, json } = await postJson(conn, "/api/config/import", config);
   if (!res.ok) {
@@ -6546,11 +6584,12 @@ program.command("upload").description("Stage a Config File as the open draft (PO
 });
 program.command("launch").description("Take a config live as a new Release: validate (launch gate), then submit \u2192 approve \u2192 deploy. Synchronous.").argument("[file]", "Config File to upload and launch directly").option("--draft", "Launch the already-open draft").option("-u, --url <url>", "RevTurbine instance URL", DEFAULT_URL).option("-t, --tenant-id <id>", "x-tenant-id (defaults to the stored token tenant)").option("--yes", "Accepted for parity with discard/restore; launch has no confirmation prompt").action(async (file, opts) => {
   const [sel] = requireSelectors(opts, file ? [file] : [], { count: 1, allowed: ["file", "draft"], command: "launch" });
-  const conn = connect(opts.url, opts.tenantId);
+  let conn;
   let playbookVersionId;
   if (sel.kind === "file") {
     const config = verifyConfig(sel.path);
     if (config === null) fail(EXIT.VALIDATION, `Fix the issues above in ${sel.path}, then re-run.`);
+    conn = connect(opts.url, uploadTenantFor(opts.url, config, opts.tenantId));
     diag(`Staging ${sel.path} as the open draft \u2026`);
     const { res, json } = await postJson(conn, "/api/config/import", config);
     if (!res.ok) {
@@ -6561,6 +6600,7 @@ program.command("launch").description("Take a config live as a new Release: vali
     if (!playbookVersionId) fail(EXIT.SERVER, "No playbook_version_id returned by the import \u2014 cannot launch.");
     diag(`\u2713 Staged (${playbookVersionId})`);
   } else {
+    conn = connect(opts.url, opts.tenantId);
     playbookVersionId = await requireOpenDraft(conn);
   }
   await launchDraft(conn, playbookVersionId);
@@ -6638,19 +6678,35 @@ program.command("preview").description("The open draft's staged changes (runtime
   if (!res.ok) httpFail(conn, "preview", res.status, json);
   emit(json, true);
 });
-program.command("evaluate").description("Run the live config's placement/entitlement decisions for a user context (from a JSON file). Draft/Release-targeted evaluation lands with plan 131 TASK-7.").option("-u, --url <url>", "RevTurbine instance URL", DEFAULT_URL).requiredOption("--user <file>", "JSON file: { user_id, customer_id?, plan_handle?, placement_ids?, entitlement_handles?, traits?, now_iso? }").option("-t, --tenant-id <id>", "x-tenant-id (defaults to the stored token tenant)").action(async (opts) => {
-  const conn = connect(opts.url, opts.tenantId);
-  if (!existsSync2(opts.user)) fail(EXIT.USAGE, `user file not found: ${opts.user}`);
-  let body;
-  try {
-    body = JSON.parse(readFileSync2(opts.user, "utf8"));
-  } catch (err) {
-    fail(EXIT.VALIDATION, `invalid JSON in ${opts.user}: ${err.message}`);
+program.command("evaluate").description("Run placement/entitlement decisions for a user context against a config version. Requires --live, --draft, or --release <id>.").option("--live", "Evaluate the live configuration").option("--draft", "Evaluate the tenant's open draft (clean-room: no suppression/cap history)").option("--release <id>", "Evaluate a past release (from its frozen snapshot)").option("--entitlement <handle>", "Check one entitlement (the checkEntitlement result)").option("--slot <id>", "Evaluate one placement/slot (the getPlacement decision)").option("--plan-handle <handle>", "Evaluate as if the user were on this plan (overrides the ctx file)").option("-u, --url <url>", "RevTurbine instance URL", DEFAULT_URL).requiredOption("--user <file>", "JSON file: { user_id, customer_id?, plan_handle?, traits?, now_iso? }").option("-t, --tenant-id <id>", "x-tenant-id (defaults to the stored token tenant)").action(
+  async (opts) => {
+    const [sel] = requireSelectors(opts, [], { count: 1, allowed: ["draft", "live", "release"], command: "evaluate" });
+    const conn = connect(opts.url, opts.tenantId);
+    if (!existsSync2(opts.user)) fail(EXIT.USAGE, `user file not found: ${opts.user}`);
+    let ctx;
+    try {
+      ctx = JSON.parse(readFileSync2(opts.user, "utf8"));
+    } catch (err) {
+      fail(EXIT.VALIDATION, `invalid JSON in ${opts.user}: ${err.message}`);
+    }
+    const body = { ...ctx };
+    if (opts.planHandle) body.plan_handle = opts.planHandle;
+    if (opts.entitlement && opts.slot) fail(EXIT.USAGE, "pass exactly one of --entitlement or --slot (or neither for the ctx file lists).");
+    if (opts.entitlement) {
+      body.entitlement_handles = [opts.entitlement];
+      body.placement_ids = [];
+    }
+    if (opts.slot) {
+      body.placement_ids = [opts.slot];
+      body.entitlement_handles = [];
+    }
+    if (sel.kind === "release") body.playbook_version_id = sel.id;
+    if (sel.kind === "draft") body.playbook_version_id = await requireOpenDraft(conn);
+    const { res, json } = await postJson(conn, "/api/sdk/evaluate", body);
+    if (!res.ok) httpFail(conn, "evaluate", res.status, json);
+    emit(json, true);
   }
-  const { res, json } = await postJson(conn, "/api/sdk/evaluate", body);
-  if (!res.ok) httpFail(conn, "evaluate", res.status, json);
-  emit(json, true);
-});
+);
 var COMMAND_EXAMPLES = {
   download: [
     "",
@@ -6682,7 +6738,8 @@ var COMMAND_EXAMPLES = {
   evaluate: [
     "",
     "Example:",
-    "  revturbine evaluate --url <url> --user ./ctx.json",
+    "  revturbine evaluate --live --user ./ctx.json --entitlement seats",
+    "  revturbine evaluate --draft --user ./ctx.json --slot upgrade_banner --plan-handle pro",
     '    ctx.json: { "user_id": "u1", "plan_handle": "pro", "entitlement_handles": ["seats"] }'
   ].join("\n")
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@revturbine/cli",
-  "version": "0.5.2",
+  "version": "0.7.0",
   "description": "revturbine — verify RevTurbine ExportedConfig files and ship them to a RevTurbine instance through the Change Set lifecycle.",
   "license": "MIT",
   "repository": {