dataiku-sdk 3.1.0 → 3.3.0

package/dist/src/cli/commands/saved-model.js

@@ -1,5 +1,13 @@
+import { writeResponseToFile, } from "../../utils/response-file.js";
+import { json, jsonInput, parseBooleanOption, requiredJsonInput, } from "../coerce.js";
+import { executionMode, } from "../flags.js";
 import { readIfExists, skipResult, } from "../output.js";
-import { requireArgs, } from "../usage.js";
+import { requireArgs, UsageError, } from "../usage.js";
+/**
+ * Mutating actions accept --plan (buildMutationPlan in contract.ts owns the
+ * --plan path centrally); the handlers below keep --dry-run support with a
+ * zero-request planned payload, mirroring set-active/delete.
+ */
 export const savedModelCommands = {
     list: {
         handler: (c, _a, f) => c.savedModels.list(f["project-key"]),
@@ -7,6 +15,64 @@ export const savedModelCommands = {
         description: "List saved models in a project.",
         examples: ["dss saved-model list --project-key PROJECT",],
     },
+    "create-external": {
+        handler: async (c, a, f) => {
+            const usage = "dss saved-model create-external <name> --type MLFLOW_PYFUNC|PROXY_MODEL [--prediction-type TYPE] [--configuration JSON] [--data JSON] [--dry-run] [--project-key KEY]";
+            requireArgs(a, 1, usage);
+            const savedModelType = f["type"]?.trim();
+            if (savedModelType !== "MLFLOW_PYFUNC" && savedModelType !== "PROXY_MODEL") {
+                throw new UsageError("--type must be MLFLOW_PYFUNC or PROXY_MODEL.", "invalid_enum");
+            }
+            const predictionTypeRaw = f["prediction-type"];
+            const predictionType = predictionTypeRaw === undefined || predictionTypeRaw === ""
+                ? undefined
+                : predictionTypeRaw.trim();
+            if (predictionType !== undefined
+                && predictionType !== "BINARY_CLASSIFICATION"
+                && predictionType !== "MULTICLASS"
+                && predictionType !== "REGRESSION") {
+                throw new UsageError("--prediction-type must be BINARY_CLASSIFICATION, MULTICLASS, or REGRESSION.", "invalid_enum");
+            }
+            const configuration = f["configuration"] !== undefined
+                ? requiredJsonInput(f, "--configuration must be a JSON object (--data/--data-file/--stdin).")
+                : jsonInput(f);
+            if (savedModelType === "PROXY_MODEL" && configuration === undefined) {
+                throw new UsageError('--configuration JSON is required for PROXY_MODEL (e.g. {"protocol":"sagemaker","region":"eu-west-1"}).', "missing_required_flag");
+            }
+            const projectKey = f["project-key"];
+            if (executionMode(f).dryRun) {
+                return {
+                    dryRun: true,
+                    action: "create-external",
+                    resource: "saved-model",
+                    id: a[0],
+                    projectKey,
+                    payload: {
+                        savedModelType,
+                        name: a[0],
+                        ...(predictionType !== undefined ? { predictionType, } : {}),
+                        ...(configuration !== undefined
+                            ? { proxyModelConfiguration: configuration, }
+                            : {}),
+                    },
+                };
+            }
+            return c.savedModels.createExternal({
+                savedModelType,
+                name: a[0],
+                ...(predictionType !== undefined ? { predictionType, } : {}),
+                ...(configuration !== undefined
+                    ? { proxyModelConfiguration: configuration, }
+                    : {}),
+            }, projectKey);
+        },
+        usage: "dss saved-model create-external <name> --type MLFLOW_PYFUNC|PROXY_MODEL [--prediction-type TYPE] [--configuration JSON] [--data JSON] [--dry-run] [--project-key KEY]",
+        description: "Create a saved model for MLflow or external (proxy) models. --type selects savedModelType; --prediction-type is BINARY_CLASSIFICATION, MULTICLASS, or REGRESSION; --configuration (JSON via --data/--data-file/--stdin) is the PROXY_MODEL protocol configuration forwarded as proxyModelConfiguration.",
+        examples: [
+            "dss saved-model create-external 'MLflow Demo' --type MLFLOW_PYFUNC --prediction-type BINARY_CLASSIFICATION",
+            'dss saved-model create-external \'SageMaker Model\' --type PROXY_MODEL --prediction-type BINARY_CLASSIFICATION --data \'{"protocol":"sagemaker","region":"eu-west-1"}\'',
+        ],
+    },
     get: {
         handler: (c, a, f) => {
             requireArgs(a, 1, "dss saved-model get <modelId> [--project-key KEY]");
@@ -16,6 +82,33 @@ export const savedModelCommands = {
         description: "Get a saved model.",
         examples: ["dss saved-model get MODEL_ID --project-key PROJECT",],
     },
+    "update-settings": {
+        handler: async (c, a, f) => {
+            const usage = "dss saved-model update-settings <modelId> (--data JSON|--data-file PATH|--stdin) [--dry-run] [--project-key KEY]";
+            requireArgs(a, 1, usage);
+            const settings = requiredJsonInput(f, "Saved-model settings JSON is required via --data, --data-file, or --stdin (GET-then-PUT the full settings document).");
+            const projectKey = f["project-key"];
+            if (executionMode(f).dryRun) {
+                return {
+                    dryRun: true,
+                    action: "update-settings",
+                    resource: "saved-model",
+                    id: a[0],
+                    projectKey,
+                    payload: settings,
+                };
+            }
+            return c.savedModels.updateSettings(a[0], settings, projectKey).then(() => ({
+                updated: a[0],
+                resource: "saved-model",
+            }));
+        },
+        usage: "dss saved-model update-settings <modelId> (--data JSON|--data-file PATH|--stdin) [--dry-run] [--project-key KEY]",
+        description: "Save the settings of a saved model. The payload must be the complete settings document as returned by `saved-model get` (GET-then-PUT workflow, per the official client).",
+        examples: [
+            "dss saved-model get MODEL_ID --project-key P | jq . > settings.json && dss saved-model update-settings MODEL_ID --data-file settings.json --project-key P",
+        ],
+    },
     "list-versions": {
         handler: (c, a, f) => {
             requireArgs(a, 1, "dss saved-model list-versions <modelId> [--project-key KEY]");
@@ -36,11 +129,22 @@ export const savedModelCommands = {
             "dss saved-model version-details MODEL_ID VERSION_ID --project-key PROJECT",
         ],
     },
+    "version-snippet": {
+        handler: (c, a, f) => {
+            requireArgs(a, 2, "dss saved-model version-snippet <modelId> <versionId> [--project-key KEY]");
+            return c.savedModels.versionSnippet(a[0], a[1], f["project-key"]);
+        },
+        usage: "dss saved-model version-snippet <modelId> <versionId> [--project-key KEY]",
+        description: "Get the snippet (short summary) for one saved-model version.",
+        examples: [
+            "dss saved-model version-snippet MODEL_ID VERSION_ID --project-key PROJECT",
+        ],
+    },
     "set-active": {
         handler: async (c, a, f) => {
             requireArgs(a, 2, "dss saved-model set-active <modelId> <versionId> [--dry-run] [--project-key KEY]");
             const projectKey = f["project-key"];
-            if (f["dry-run"] === true) {
+            if (executionMode(f).dryRun) {
                 return {
                     dryRun: true,
                     action: "set-active",
@@ -60,15 +164,46 @@ export const savedModelCommands = {
             "dss saved-model set-active MODEL_ID VERSION_ID --dry-run --project-key PROJECT",
         ],
     },
+    "delete-versions": {
+        handler: async (c, a, f) => {
+            const usage = "dss saved-model delete-versions <modelId> <versionsCSV> [--remove-intermediate true|false] [--dry-run] [--project-key KEY]";
+            requireArgs(a, 2, usage);
+            const versions = a[1].split(",").map((v) => v.trim()).filter((v) => v.length > 0);
+            if (versions.length === 0) {
+                throw new UsageError("<versionsCSV> must contain at least one version id.", "validation_failed");
+            }
+            const removeIntermediate = parseBooleanOption(f["remove-intermediate"], "--remove-intermediate")
+                ?? true;
+            const projectKey = f["project-key"];
+            if (executionMode(f).dryRun) {
+                return {
+                    dryRun: true,
+                    action: "delete-versions",
+                    resource: "saved-model",
+                    id: a[0],
+                    projectKey,
+                    payload: { versions, removeIntermediate, },
+                };
+            }
+            await c.savedModels.deleteVersions(versions, { removeIntermediate, }, a[0], projectKey);
+            return { deletedVersions: versions, resource: "saved-model", id: a[0], };
+        },
+        usage: "dss saved-model delete-versions <modelId> <versionsCSV> [--remove-intermediate true|false] [--dry-run] [--project-key KEY]",
+        description: "Delete one or more versions of a saved model (comma-separated version ids). Destructive. Implemented as POST .../actions/delete-versions per the official Python client (the REST reference's GET entry is a doc bug); the transport never retries this request.",
+        examples: [
+            "dss saved-model delete-versions MODEL_ID VERSION_A,VERSION_B --project-key PROJECT",
+            "dss saved-model delete-versions MODEL_ID VERSION_A --remove-intermediate false --dry-run --project-key PROJECT",
+        ],
+    },
     delete: {
         handler: async (c, a, f) => {
             requireArgs(a, 1, "dss saved-model delete <modelId> [--if-exists] [--dry-run] [--project-key KEY]");
             const projectKey = f["project-key"];
-            if (f["dry-run"] === true || f["if-exists"] === true) {
+            if (executionMode(f).dryRun || f["if-exists"] === true) {
                 const current = await readIfExists(() => c.savedModels.get(a[0], projectKey));
                 if (!current)
                     return skipResult("saved-model", a[0], "missing");
-                if (f["dry-run"] === true) {
+                if (executionMode(f).dryRun) {
                     return { dryRun: true, action: "delete", resource: "saved-model", id: a[0], current, };
                 }
             }
@@ -82,4 +217,257 @@ export const savedModelCommands = {
             "dss saved-model delete MODEL_ID --dry-run --project-key PROJECT",
         ],
     },
+    "import-mlflow-version": {
+        handler: async (c, a, f) => {
+            const usage = "dss saved-model import-mlflow-version <modelId> <versionId> --archive PATH [--code-env NAME] [--container-exec-config NAME] [--set-active true|false] [--binary-classification-threshold N] [--dry-run] [--project-key KEY]";
+            requireArgs(a, 2, usage);
+            const archive = f["archive"];
+            if (!archive)
+                throw new UsageError("--archive PATH is required.", "missing_required_flag");
+            const projectKey = f["project-key"];
+            const options = mlflowImportOptions(f);
+            if (executionMode(f).dryRun) {
+                return {
+                    dryRun: true,
+                    action: "import-mlflow-version",
+                    resource: "saved-model",
+                    id: a[0],
+                    versionId: a[1],
+                    projectKey,
+                    payload: { ...options, source: { kind: "local-archive", archive, }, },
+                };
+            }
+            return c.savedModels.importMlflowVersion(archive, a[1], options, a[0], projectKey);
+        },
+        usage: "dss saved-model import-mlflow-version <modelId> <versionId> --archive PATH [--code-env NAME] [--container-exec-config NAME] [--set-active true|false] [--binary-classification-threshold N] [--dry-run] [--project-key KEY]",
+        description: "Import a new MLflow version from a local zip archive of the MLflow model folder (multipart upload). The saved model must be of type MLFLOW_PYFUNC.",
+        examples: [
+            "dss saved-model import-mlflow-version MODEL_ID v1 --archive ./mlflow-model.zip --project-key PROJECT",
+            "dss saved-model import-mlflow-version MODEL_ID v1 --archive ./model.zip --code-env INHERIT --set-active false --project-key PROJECT",
+        ],
+    },
+    "import-mlflow-version-from-folder": {
+        handler: async (c, a, f) => {
+            const usage = "dss saved-model import-mlflow-version-from-folder <modelId> <versionId> --folder PROJECT.FOLDER_ID --path PATH [--code-env NAME] [--container-exec-config NAME] [--set-active true|false] [--binary-classification-threshold N] [--dry-run] [--project-key KEY]";
+            requireArgs(a, 2, usage);
+            const folder = f["folder"];
+            if (!folder) {
+                throw new UsageError("--folder PROJECT.FOLDER_ID is required.", "missing_required_flag");
+            }
+            const path = f["path"];
+            if (!path)
+                throw new UsageError("--path PATH is required.", "missing_required_flag");
+            const projectKey = f["project-key"];
+            const options = mlflowImportOptions(f);
+            if (executionMode(f).dryRun) {
+                return {
+                    dryRun: true,
+                    action: "import-mlflow-version-from-folder",
+                    resource: "saved-model",
+                    id: a[0],
+                    versionId: a[1],
+                    projectKey,
+                    payload: { ...options, source: { kind: "managed-folder", folderRef: folder, path, }, },
+                };
+            }
+            return c.savedModels.importMlflowVersionFromFolder(folder, path, a[1], options, a[0], projectKey);
+        },
+        usage: "dss saved-model import-mlflow-version-from-folder <modelId> <versionId> --folder PROJECT.FOLDER_ID --path PATH [--code-env NAME] [--container-exec-config NAME] [--set-active true|false] [--binary-classification-threshold N] [--dry-run] [--project-key KEY]",
+        description: "Import a new MLflow version from an MLflow model folder stored in a managed folder (folderRef PROJECT_KEY.FOLDER_ID). Sends the backend-mandated multipart request with a zero-byte file part, matching the official Python client.",
+        examples: [
+            "dss saved-model import-mlflow-version-from-folder MODEL_ID v1 --folder PROJ.z7pSyYzE --path /artifacts/model --project-key PROJ",
+        ],
+    },
+    "external-metadata-get": {
+        handler: (c, a, f) => {
+            requireArgs(a, 2, "dss saved-model external-metadata-get <modelId> <versionId> [--project-key KEY]");
+            return c.savedModels.externalMetadataGet(a[0], a[1], f["project-key"]);
+        },
+        usage: "dss saved-model external-metadata-get <modelId> <versionId> [--project-key KEY]",
+        description: "Get the external-ml metadata of a saved-model version (MLflow or proxy).",
+        examples: [
+            "dss saved-model external-metadata-get MODEL_ID VERSION_ID --project-key PROJECT",
+        ],
+    },
+    "external-metadata-put": {
+        handler: async (c, a, f) => {
+            const usage = "dss saved-model external-metadata-put <modelId> <versionId> (--data JSON|--data-file PATH|--stdin) [--container-exec-config NAME] [--dry-run] [--project-key KEY]";
+            requireArgs(a, 2, usage);
+            const metadata = requiredJsonInput(f, "Metadata JSON is required via --data, --data-file, or --stdin (GET-then-PUT the full external-ml metadata document).");
+            const projectKey = f["project-key"];
+            const containerExecConfigName = f["container-exec-config"];
+            if (executionMode(f).dryRun) {
+                return {
+                    dryRun: true,
+                    action: "external-metadata-put",
+                    resource: "saved-model",
+                    id: a[0],
+                    versionId: a[1],
+                    projectKey,
+                    payload: {
+                        metadata,
+                        ...(containerExecConfigName !== undefined ? { containerExecConfigName, } : {}),
+                    },
+                };
+            }
+            return c.savedModels.externalMetadataPut(a[0], a[1], metadata, containerExecConfigName === undefined ? undefined : { containerExecConfigName, }, projectKey).then(() => ({ updated: a[0], versionId: a[1], resource: "saved-model", }));
+        },
+        usage: "dss saved-model external-metadata-put <modelId> <versionId> (--data JSON|--data-file PATH|--stdin) [--container-exec-config NAME] [--dry-run] [--project-key KEY]",
+        description: "Save the external-ml metadata of a saved-model version. The payload must be the full metadata document as returned by external-metadata-get (GET-then-PUT). DSS requires the containerExecConfigName query parameter; it defaults to NONE for an external API caller (LOCAL-CONFIG resolution) when --container-exec-config is omitted.",
+        examples: [
+            "dss saved-model external-metadata-put MODEL_ID VERSION_ID --data-file metadata.json --project-key PROJECT",
+        ],
+    },
+    "evaluate-version": {
+        handler: async (c, a, f) => {
+            const usage = "dss saved-model evaluate-version <modelId> <versionId> --dataset REF [--container-exec-config NAME] [--sampling JSON] [--use-optimal-threshold true|false] [--skip-expensive-reports true|false] [--dry-run] [--project-key KEY]";
+            requireArgs(a, 2, usage);
+            const dataset = f["dataset"];
+            if (!dataset)
+                throw new UsageError("--dataset REF is required.", "missing_required_flag");
+            const projectKey = f["project-key"];
+            // --sampling carries its own JSON value: parse the flag itself (the
+            // old requiredJsonInput read --data/--stdin, so a valid JSON flag
+            // was rejected as missing).
+            const sampling = json(f["sampling"], "--sampling");
+            // Official external-caller semantics (DSS 15): the evaluation
+            // container exec resolves as LOCAL-CONFIG -> NONE, so the body
+            // always carries an explicit containerExecConfigName defaulting to
+            // NONE; --container-exec-config still passes an explicit value
+            // (including INHERIT) through unchanged.
+            const containerExecConfigName = f["container-exec-config"] ?? "NONE";
+            const body = {
+                datasetRef: dataset,
+                containerExecConfigName,
+                ...(sampling !== undefined ? { samplingParam: sampling, } : {}),
+            };
+            const options = {
+                ...(f["use-optimal-threshold"] !== undefined
+                    ? {
+                        useOptimalThreshold: parseBooleanOption(f["use-optimal-threshold"], "--use-optimal-threshold"),
+                    }
+                    : {}),
+                ...(f["skip-expensive-reports"] !== undefined
+                    ? {
+                        skipExpensiveReports: parseBooleanOption(f["skip-expensive-reports"], "--skip-expensive-reports"),
+                    }
+                    : {}),
+            };
+            if (executionMode(f).dryRun) {
+                return {
+                    dryRun: true,
+                    action: "evaluate-version",
+                    resource: "saved-model",
+                    id: a[0],
+                    versionId: a[1],
+                    projectKey,
+                    payload: { ...body, ...options, },
+                };
+            }
+            await c.savedModels.evaluateVersion(body, options, a[0], a[1], projectKey);
+            return { evaluated: a[0], versionId: a[1], resource: "saved-model", };
+        },
+        usage: "dss saved-model evaluate-version <modelId> <versionId> --dataset REF [--container-exec-config NAME] [--sampling JSON] [--use-optimal-threshold true|false] [--skip-expensive-reports true|false] [--dry-run] [--project-key KEY]",
+        description: 'Evaluate an external/MLflow model version on a dataset. external-metadata-put must have been called first. --sampling is an optional JSON sampling parameter (e.g. {"samplingMethod":"HEAD_SEQUENTIAL","maxRecords":100}).',
+        examples: [
+            "dss saved-model evaluate-version MODEL_ID VERSION_ID --dataset PROJECT.my-dataset --project-key PROJECT",
+            "dss saved-model evaluate-version MODEL_ID VERSION_ID --dataset ds --skip-expensive-reports true --project-key PROJECT",
+        ],
+    },
+    "download-scoring-jar": {
+        handler: async (c, a, f) => {
+            const usage = "dss saved-model download-scoring-jar <modelId> <versionId> --output PATH [--full-class-name NAME] [--include-libs true|false] [--project-key KEY]";
+            requireArgs(a, 2, usage);
+            const out = f["output"];
+            if (!out)
+                throw new UsageError("--output PATH is required.", "missing_required_flag");
+            const fullClassName = f["full-class-name"];
+            const jarOptions = {
+                ...(fullClassName !== undefined ? { fullClassName, } : {}),
+                ...(f["include-libs"] !== undefined
+                    ? { includeLibs: parseBooleanOption(f["include-libs"], "--include-libs"), }
+                    : {}),
+            };
+            const res = await c.savedModels.downloadScoringJar(jarOptions, a[0], a[1], f["project-key"]);
+            if (!res.body) {
+                throw new Error("savedModels.downloadScoringJar response did not include a body");
+            }
+            const bytes = await writeResponseToFile(out, res);
+            return { path: out, bytes, };
+        },
+        usage: "dss saved-model download-scoring-jar <modelId> <versionId> --output PATH [--full-class-name NAME] [--include-libs true|false] [--project-key KEY]",
+        description: "Download the optimized scoring JAR of a version (license-gated server side). --full-class-name forwards the documented fullClassName query parameter; --include-libs toggles including scoring libraries.",
+        examples: [
+            "dss saved-model download-scoring-jar MODEL_ID VERSION_ID --output ./scoring.jar --project-key PROJECT",
+            "dss saved-model download-scoring-jar MODEL_ID VERSION_ID --output ./scoring.jar --full-class-name model.Model --include-libs false --project-key PROJECT",
+        ],
+    },
+    "download-scoring-pmml": {
+        handler: async (c, a, f) => {
+            requireArgs(a, 2, "dss saved-model download-scoring-pmml <modelId> <versionId> --output PATH [--project-key KEY]");
+            const out = f["output"];
+            if (!out)
+                throw new UsageError("--output PATH is required.", "missing_required_flag");
+            const res = await c.savedModels.downloadScoringPmml(a[0], a[1], f["project-key"]);
+            if (!res.body) {
+                throw new Error("savedModels.downloadScoringPmml response did not include a body");
+            }
+            const bytes = await writeResponseToFile(out, res);
+            return { path: out, bytes, };
+        },
+        usage: "dss saved-model download-scoring-pmml <modelId> <versionId> --output PATH [--project-key KEY]",
+        description: "Download the PMML scoring file of a version (license-gated server side).",
+        examples: [
+            "dss saved-model download-scoring-pmml MODEL_ID VERSION_ID --output ./model.pmml --project-key PROJECT",
+        ],
+    },
+    "set-user-meta": {
+        handler: async (c, a, f) => {
+            const usage = "dss saved-model set-user-meta <modelId> <versionId> (--data JSON|--data-file PATH|--stdin) [--dry-run] [--project-key KEY]";
+            requireArgs(a, 2, usage);
+            const userMeta = requiredJsonInput(f, "User-meta JSON is required via --data, --data-file, or --stdin.");
+            const projectKey = f["project-key"];
+            if (executionMode(f).dryRun) {
+                return {
+                    dryRun: true,
+                    action: "set-user-meta",
+                    resource: "saved-model",
+                    id: a[0],
+                    versionId: a[1],
+                    projectKey,
+                    payload: userMeta,
+                };
+            }
+            return c.savedModels.setUserMeta(a[0], a[1], userMeta, projectKey).then(() => ({
+                updated: a[0],
+                versionId: a[1],
+                resource: "saved-model",
+            }));
+        },
+        usage: "dss saved-model set-user-meta <modelId> <versionId> (--data JSON|--data-file PATH|--stdin) [--dry-run] [--project-key KEY]",
+        description: 'Update the user metadata of a model version. Send only the "userMeta" field of a previously-retrieved version-details object.',
+        examples: [
+            'dss saved-model set-user-meta MODEL_ID VERSION_ID --data \'{"name":"Churn model","description":"v2"}\' --project-key PROJECT',
+        ],
+    },
 };
+function mlflowImportOptions(f) {
+    const codeEnvName = f["code-env"];
+    const containerExecConfigName = f["container-exec-config"];
+    const setActive = f["set-active"] !== undefined
+        ? parseBooleanOption(f["set-active"], "--set-active")
+        : undefined;
+    const thresholdRaw = f["binary-classification-threshold"];
+    const binaryClassificationThreshold = thresholdRaw === undefined
+        ? undefined
+        : Number(thresholdRaw);
+    if (binaryClassificationThreshold !== undefined && !Number.isFinite(binaryClassificationThreshold)) {
+        throw new UsageError("--binary-classification-threshold must be a number.", "invalid_flag_value");
+    }
+    return {
+        ...(codeEnvName !== undefined ? { codeEnvName, } : {}),
+        ...(containerExecConfigName !== undefined ? { containerExecConfigName, } : {}),
+        ...(setActive !== undefined ? { setActive, } : {}),
+        ...(binaryClassificationThreshold !== undefined ? { binaryClassificationThreshold, } : {}),
+    };
+}

package/dist/src/cli/commands/scenario.js

@@ -1,5 +1,6 @@
 import { scenarioUpdatePreview, } from "../../resources/scenarios.js";
-import { jsonInput, num, } from "../coerce.js";
+import { jsonInput, num, parseBooleanOption, } from "../coerce.js";
+import { executionMode, } from "../flags.js";
 import { encodedProjectEndpoint, readIfExists, skipResult, } from "../output.js";
 import { requireArgs, UsageError, } from "../usage.js";
 export const scenarioCommands = {
@@ -26,7 +27,7 @@ export const scenarioCommands = {
                 pollIntervalMs: num(f["poll-interval"], "--poll-interval"),
                 timeoutMs: num(f["timeout"], "--timeout"),
             };
-            if (f["dry-run"] === true) {
+            if (executionMode(f).dryRun) {
                 return {
                     dryRun: true,
                     action: "run",
@@ -54,7 +55,7 @@ export const scenarioCommands = {
                 pollIntervalMs: num(f["poll-interval"], "--poll-interval"),
                 timeoutMs: num(f["timeout"], "--timeout"),
             };
-            if (f["dry-run"] === true) {
+            if (executionMode(f).dryRun) {
                 return {
                     dryRun: true,
                     action: "run-and-wait",
@@ -87,11 +88,11 @@ export const scenarioCommands = {
         handler: async (c, a, f) => {
             requireArgs(a, 1, "dss scenario delete <id>");
             const pk = f["project-key"];
-            if (f["dry-run"] === true || f["if-exists"] === true) {
+            if (executionMode(f).dryRun || f["if-exists"] === true) {
                 const current = await readIfExists(() => c.scenarios.get(a[0], { projectKey: pk, }));
                 if (!current)
                     return skipResult("scenario", a[0], "missing");
-                if (f["dry-run"] === true) {
+                if (executionMode(f).dryRun) {
                     return { dryRun: true, action: "delete", resource: "scenario", id: a[0], current, };
                 }
             }
@@ -112,13 +113,13 @@ export const scenarioCommands = {
                 scenarioType: f["type"],
                 projectKey: pk,
             };
-            if (f["if-not-exists"] === true || f["dry-run"] === true) {
+            if (f["if-not-exists"] === true || executionMode(f).dryRun) {
                 const list = await c.scenarios.list(pk);
                 const existing = list.find((s) => s.id === a[0]);
-                if (existing && f["if-not-exists"] === true && f["dry-run"] !== true) {
+                if (existing && f["if-not-exists"] === true && !executionMode(f).dryRun) {
                     return skipResult("scenario", a[0], "exists", { current: existing, });
                 }
-                if (f["dry-run"] === true) {
+                if (executionMode(f).dryRun) {
                     return {
                         dryRun: true,
                         action: "create",
@@ -150,7 +151,7 @@ export const scenarioCommands = {
                 throw new UsageError("--data, --data-file, or --stdin is required. Usage: dss scenario update <id> [--data '{...}' | --data-file PATH | --stdin]");
             }
             const pk = f["project-key"];
-            if (f["dry-run"] === true) {
+            if (executionMode(f).dryRun) {
                 const current = await c.scenarios.get(a[0], { projectKey: pk, });
                 const preview = scenarioUpdatePreview(current, data);
                 return {
@@ -187,4 +188,141 @@ export const scenarioCommands = {
             "dss scenario update my_scenario --data-file settings.json --dry-run",
         ],
     },
+    abort: {
+        handler: async (c, a, f) => {
+            requireArgs(a, 1, "dss scenario abort <id>");
+            const pk = f["project-key"];
+            if (executionMode(f).dryRun) {
+                return {
+                    dryRun: true,
+                    action: "abort",
+                    resource: "scenario",
+                    id: a[0],
+                    endpoint: encodedProjectEndpoint(c, pk, `/scenarios/${encodeURIComponent(a[0])}/abort`),
+                    method: "POST",
+                };
+            }
+            await c.scenarios.abort(a[0], pk);
+            return { aborted: a[0], resource: "scenario", };
+        },
+        usage: "dss scenario abort <id> [--dry-run] [--project-key KEY]",
+        description: "Abort a running scenario. Returns when DSS accepts the abort; the scenario may take time to stop.",
+        examples: ["dss scenario abort my_scenario",],
+    },
+    "last-runs": {
+        handler: (c, a, f) => {
+            requireArgs(a, 1, "dss scenario last-runs <id>");
+            return c.scenarios.getLastRuns(a[0], {
+                limit: num(f["limit"], "--limit"),
+                projectKey: f["project-key"],
+            });
+        },
+        usage: "dss scenario last-runs <id> [--limit N] [--project-key KEY]",
+        description: "List the most recent runs of a scenario (run id, start/end, outcome).",
+        examples: ["dss scenario last-runs my_scenario --limit 10",],
+    },
+    "get-run": {
+        handler: (c, a, f) => {
+            requireArgs(a, 2, "dss scenario get-run <id> <runId>");
+            return c.scenarios.getRunDetails(a[0], a[1], {
+                projectKey: f["project-key"],
+            });
+        },
+        usage: "dss scenario get-run <id> <runId> [--project-key KEY]",
+        description: "Get the details of a specific scenario run, including per-step outcomes.",
+        examples: ["dss scenario get-run my_scenario 2024-09-01-01-02-03-123",],
+    },
+    log: {
+        handler: async (c, a, f) => {
+            requireArgs(a, 2, "dss scenario log <id> <runId>");
+            const result = await c.scenarios.getRunLog(a[0], a[1], {
+                stepId: f["step-id"],
+                maxLogBytes: num(f["max-log-bytes"], "--max-log-bytes"),
+                projectKey: f["project-key"],
+            });
+            const outputFile = f["output"]
+                ?? f["output-file"];
+            if (outputFile) {
+                const { mkdir, writeFile, } = await import("node:fs/promises");
+                const { dirname, resolve, } = await import("node:path");
+                const outputPath = resolve(outputFile);
+                await mkdir(dirname(outputPath), { recursive: true, });
+                await writeFile(outputPath, result.text, "utf-8");
+                return { path: outputPath, truncated: result.truncated, };
+            }
+            return result.text;
+        },
+        usage: "dss scenario log <id> <runId> [--step-id STEP_ID] [--max-log-bytes N] [--output PATH] [--project-key KEY]",
+        description: "Get the log of a scenario run (or one step via --step-id). Byte-bounded at --max-log-bytes (default 1 MiB); --output PATH writes it to a file (stdout returns the path).",
+        examples: [
+            "dss scenario log my_scenario 2024-09-01-01-02-03-123",
+            "dss scenario log my_scenario RUN_ID --step-id prepare_1 --max-log-bytes 100000",
+        ],
+    },
+    "payload-get": {
+        handler: (c, a, f) => {
+            requireArgs(a, 1, "dss scenario payload-get <id>");
+            return c.scenarios.getPayload(a[0], { projectKey: f["project-key"], });
+        },
+        usage: "dss scenario payload-get <id> [--project-key KEY]",
+        description: "Get the payload of a custom scenario (e.g. its Python script).",
+        examples: ["dss scenario payload-get my_custom_scenario",],
+    },
+    "payload-set": {
+        handler: async (c, a, f) => {
+            requireArgs(a, 1, "dss scenario payload-set <id> (--data '{...}' | --data-file PATH | --stdin)");
+            const payload = jsonInput(f);
+            if (payload === undefined) {
+                throw new UsageError("--data, --data-file, or --stdin is required. Usage: dss scenario payload-set <id> (--data '{...}' | --data-file PATH | --stdin)");
+            }
+            const pk = f["project-key"];
+            if (executionMode(f).dryRun) {
+                return {
+                    dryRun: true,
+                    action: "payload-set",
+                    resource: "scenario",
+                    id: a[0],
+                    payload,
+                    endpoint: encodedProjectEndpoint(c, pk, `/scenarios/${encodeURIComponent(a[0])}/payload`),
+                    method: "PUT",
+                };
+            }
+            await c.scenarios.setPayload(a[0], payload, { projectKey: pk, });
+            return { updated: a[0], resource: "scenario", part: "payload", };
+        },
+        usage: "dss scenario payload-set <id> (--data '{...}' | --data-file PATH | --stdin) [--dry-run] [--project-key KEY]",
+        description: "Update the payload of a custom scenario (e.g. replace its Python script).",
+        examples: [
+            'dss scenario payload-set my_custom_scenario --data \'{"script":"print(1)"}\' --dry-run',
+            "dss scenario payload-set my_custom_scenario --data-file payload.json",
+        ],
+    },
+    "active-set": {
+        handler: async (c, a, f) => {
+            requireArgs(a, 2, "dss scenario active-set <id> <true|false>");
+            const active = parseBooleanOption(a[1], "active");
+            if (active === undefined) {
+                throw new UsageError("active must be 'true' or 'false'. Usage: dss scenario active-set <id> <true|false>");
+            }
+            const pk = f["project-key"];
+            if (executionMode(f).dryRun) {
+                return {
+                    dryRun: true,
+                    action: "active-set",
+                    resource: "scenario",
+                    id: a[0],
+                    active,
+                    endpoint: encodedProjectEndpoint(c, pk, `/scenarios/${encodeURIComponent(a[0])}/light`),
+                    method: "PUT",
+                };
+            }
+            return c.scenarios.setActive(a[0], active, { projectKey: pk, });
+        },
+        usage: "dss scenario active-set <id> <true|false> [--dry-run] [--project-key KEY]",
+        description: "Activate or deactivate a scenario (light update; deactivated scenarios ignore triggers).",
+        examples: [
+            "dss scenario active-set my_scenario false",
+            "dss scenario active-set my_scenario true --dry-run",
+        ],
+    },
 };