@swmansion/argent 0.18.1-next.11 → 0.18.1-next.12

package/dist/cli-cmds.mjs

@@ -6808,6 +6808,7 @@ var FAILURE_CODES = {
   CLI_RUN_FLAG_PARSE_FAILED: "CLI_RUN_FLAG_PARSE_FAILED",
   CLI_RUN_ARGS_NOT_OBJECT: "CLI_RUN_ARGS_NOT_OBJECT",
   CLI_RUN_ARGS_JSON_INVALID: "CLI_RUN_ARGS_JSON_INVALID",
+  CLI_RUN_INPUT_VALIDATION_FAILED: "CLI_RUN_INPUT_VALIDATION_FAILED",
   CLI_RUN_TOOL_CALL_FAILED: "CLI_RUN_TOOL_CALL_FAILED",
   CLI_RUN_SAVE_IMAGE_FAILED: "CLI_RUN_SAVE_IMAGE_FAILED",
   TOOL_CAPABILITY_UNSUPPORTED_OPERATION: "TOOL_CAPABILITY_UNSUPPORTED_OPERATION",
@@ -8458,6 +8459,12 @@ var FlagParseException = class extends Error {
 function isScalarType(type) {
   return type === "string" || type === "number" || type === "integer" || type === "boolean";
 }
+function isJsonField(prop) {
+  return prop?.type === "object" || prop?.type === "array" && !isScalarType(prop.items?.type);
+}
+function flagNameFor(name, prop) {
+  return isJsonField(prop) ? `--${name}-json` : `--${name}`;
+}
 function coerceScalar(raw, type, field) {
   if (type === "number") {
     if (raw.trim() === "")
@@ -8622,11 +8629,10 @@ function formatSchemaUsage(schema) {
   return lines.join("\n");
 }
 function renderFlagName(name, prop) {
-  if (prop.type === "object" || prop.type === "array" && !isScalarType(prop.items?.type)) {
-    return `--${name}-json <json>`;
-  }
-  if (prop.type === "boolean") return `--${name}`;
-  return `--${name} <value>`;
+  const flag = flagNameFor(name, prop);
+  if (isJsonField(prop)) return `${flag} <json>`;
+  if (prop.type === "boolean") return flag;
+  return `${flag} <value>`;
 }
 function renderType(prop) {
   if (prop.enum && Array.isArray(prop.enum)) {
@@ -8640,6 +8646,93 @@ function renderType(prop) {
   return prop.type ?? "any";
 }
 
+// ../argent-cli/src/run-validation.ts
+function findMissingRequired(payload, schema) {
+  const required = new Set(schema?.required ?? []);
+  if (required.size === 0) return [];
+  const declared = Object.keys(schema?.properties ?? {});
+  const names = [...declared.filter((n2) => required.has(n2))];
+  for (const name of required) {
+    if (!names.includes(name)) names.push(name);
+  }
+  return names.filter((name) => !Object.hasOwn(payload, name));
+}
+function describeServerValidationFailure(err, payload, schema) {
+  const message = err instanceof Error ? err.message : typeof err === "string" ? err : null;
+  if (message === null) return null;
+  let parsed;
+  try {
+    parsed = JSON.parse(message);
+  } catch {
+    return null;
+  }
+  if (!Array.isArray(parsed) || parsed.length === 0) return null;
+  if (!parsed.every(isValidationIssue)) return null;
+  const properties = schema?.properties ?? {};
+  const addressesThisTool = (issue) => issue.path.length === 0 || typeof issue.path[0] === "string" && Object.hasOwn(properties, issue.path[0]);
+  if (!parsed.every(addressesThisTool)) return null;
+  const required = new Set(schema?.required ?? []);
+  const missing = [];
+  const invalid = [];
+  for (const issue of parsed) {
+    const head = issue.path[0];
+    if (issue.path.length === 1 && typeof head === "string" && required.has(head) && !Object.hasOwn(payload, head)) {
+      missing.push(head);
+    } else {
+      invalid.push({ path: issue.path, message: issue.message });
+    }
+  }
+  return { missing: sortBySchemaOrder(missing, schema), invalid, rawIssues: parsed };
+}
+function formatValidationError(report, schema) {
+  const properties = schema?.properties ?? {};
+  const lines = [];
+  if (report.missing.length > 0) {
+    const flags2 = sortBySchemaOrder(report.missing, schema).map(
+      (name) => flagNameFor(name, properties[name])
+    );
+    const noun = flags2.length === 1 ? "flag" : "flags";
+    lines.push(`missing required ${noun} ${flags2.join(", ")}`);
+  }
+  for (const field of report.invalid) {
+    lines.push(describeInvalidField(field, properties));
+  }
+  return lines.join("\n       ");
+}
+function missingFlagNames(report, schema) {
+  const properties = schema?.properties ?? {};
+  return sortBySchemaOrder(report.missing, schema).map(
+    (name) => flagNameFor(name, properties[name])
+  );
+}
+function describeInvalidField(field, properties) {
+  if (field.path.length === 0) return field.message;
+  const [head, ...rest] = field.path;
+  if (typeof head !== "string") return field.message;
+  const flag = flagNameFor(head, properties[head]);
+  const nested = rest.length > 0 ? ` ${head}${renderPathTail(rest)}` : "";
+  return `${flag}${nested} ${field.message}`;
+}
+function renderPathTail(rest) {
+  return rest.map((part) => typeof part === "number" ? `[${part}]` : `.${part}`).join("");
+}
+function sortBySchemaOrder(names, schema) {
+  const order = Object.keys(schema?.properties ?? {});
+  return [...names].sort((a2, b) => {
+    const ia = order.indexOf(a2);
+    const ib = order.indexOf(b);
+    if (ia === -1 && ib === -1) return a2.localeCompare(b);
+    if (ia === -1) return 1;
+    if (ib === -1) return -1;
+    return ia - ib;
+  });
+}
+function isValidationIssue(value) {
+  if (value === null || typeof value !== "object") return false;
+  const issue = value;
+  return typeof issue.code === "string" && Array.isArray(issue.path) && typeof issue.message === "string";
+}
+
 // ../argent-cli/src/run.ts
 function splitOptions(argv) {
   let json = false;
@@ -8751,7 +8844,25 @@ Examples:
 `);
     return;
   }
-  const { json, outPath, argvForFlags } = splitOptions(rest);
+  let cliOptions;
+  try {
+    cliOptions = splitOptions(rest);
+  } catch (err) {
+    if (err instanceof FlagParseException) {
+      console.error(`Error: ${err.message}
+`);
+      console.error(`Run \`argent run ${toolName} --help\` to see this tool's flags.`);
+      await trackRunFailure(toolName, startedAt, {
+        error_code: FAILURE_CODES.CLI_RUN_FLAG_PARSE_FAILED,
+        failure_stage: "cli_run_split_options",
+        failure_area: "cli",
+        error_kind: "validation"
+      });
+      process.exit(2);
+    }
+    throw err;
+  }
+  const { json, outPath, argvForFlags } = cliOptions;
   const meta = await fetchTool(toolName);
   if (!meta) {
     console.error(`Tool "${toolName}" not found. Run \`argent tools\` to list available tools.`);
@@ -8763,9 +8874,37 @@ Examples:
     });
     process.exit(1);
   }
+  const schema = meta.inputSchema;
+  const failValidation = async (report, stage) => {
+    const summary = formatValidationError(report, schema);
+    if (json) {
+      console.error(
+        JSON.stringify(
+          {
+            error: summary,
+            missing: missingFlagNames(report, schema),
+            issues: report.rawIssues ?? []
+          },
+          null,
+          2
+        )
+      );
+    } else {
+      console.error(`Error: ${summary}
+`);
+      printToolHelp(meta);
+    }
+    await trackRunFailure(toolName, startedAt, {
+      error_code: FAILURE_CODES.CLI_RUN_INPUT_VALIDATION_FAILED,
+      failure_stage: stage,
+      failure_area: "cli",
+      error_kind: "validation"
+    });
+    process.exit(2);
+  };
   let parsed;
   try {
-    parsed = parseFlags(argvForFlags, meta.inputSchema);
+    parsed = parseFlags(argvForFlags, schema);
   } catch (err) {
     if (err instanceof FlagParseException) {
       console.error(`Error: ${err.message}
@@ -8818,6 +8957,10 @@ Examples:
   for (const [k, v] of Object.entries(parsed.args)) {
     payload[k] = v;
   }
+  const missing = findMissingRequired(payload, schema);
+  if (missing.length > 0) {
+    await failValidation({ missing, invalid: [], rawIssues: null }, "cli_run_required_flags");
+  }
   let result;
   let note;
   let images = [];
@@ -8833,6 +8976,10 @@ Examples:
     images = materialized.images;
     note = resp.note;
   } catch (err) {
+    const report = describeServerValidationFailure(err, payload, schema);
+    if (report) {
+      await failValidation(report, "cli_run_server_validation");
+    }
     console.error(err instanceof Error ? err.message : String(err));
     await trackRunFailure(toolName, startedAt, {
       error_code: FAILURE_CODES.CLI_RUN_TOOL_CALL_FAILED,

package/dist/installer.mjs

@@ -16034,6 +16034,7 @@ var FAILURE_CODES = {
   CLI_RUN_FLAG_PARSE_FAILED: "CLI_RUN_FLAG_PARSE_FAILED",
   CLI_RUN_ARGS_NOT_OBJECT: "CLI_RUN_ARGS_NOT_OBJECT",
   CLI_RUN_ARGS_JSON_INVALID: "CLI_RUN_ARGS_JSON_INVALID",
+  CLI_RUN_INPUT_VALIDATION_FAILED: "CLI_RUN_INPUT_VALIDATION_FAILED",
   CLI_RUN_TOOL_CALL_FAILED: "CLI_RUN_TOOL_CALL_FAILED",
   CLI_RUN_SAVE_IMAGE_FAILED: "CLI_RUN_SAVE_IMAGE_FAILED",
   TOOL_CAPABILITY_UNSUPPORTED_OPERATION: "TOOL_CAPABILITY_UNSUPPORTED_OPERATION",

package/dist/mcp-server.mjs

@@ -18064,6 +18064,7 @@ var FAILURE_CODES = {
   CLI_RUN_FLAG_PARSE_FAILED: "CLI_RUN_FLAG_PARSE_FAILED",
   CLI_RUN_ARGS_NOT_OBJECT: "CLI_RUN_ARGS_NOT_OBJECT",
   CLI_RUN_ARGS_JSON_INVALID: "CLI_RUN_ARGS_JSON_INVALID",
+  CLI_RUN_INPUT_VALIDATION_FAILED: "CLI_RUN_INPUT_VALIDATION_FAILED",
   CLI_RUN_TOOL_CALL_FAILED: "CLI_RUN_TOOL_CALL_FAILED",
   CLI_RUN_SAVE_IMAGE_FAILED: "CLI_RUN_SAVE_IMAGE_FAILED",
   TOOL_CAPABILITY_UNSUPPORTED_OPERATION: "TOOL_CAPABILITY_UNSUPPORTED_OPERATION",

package/dist/tool-server.cjs

@@ -210,6 +210,7 @@ var init_failure_codes = __esm({
       CLI_RUN_FLAG_PARSE_FAILED: "CLI_RUN_FLAG_PARSE_FAILED",
       CLI_RUN_ARGS_NOT_OBJECT: "CLI_RUN_ARGS_NOT_OBJECT",
       CLI_RUN_ARGS_JSON_INVALID: "CLI_RUN_ARGS_JSON_INVALID",
+      CLI_RUN_INPUT_VALIDATION_FAILED: "CLI_RUN_INPUT_VALIDATION_FAILED",
       CLI_RUN_TOOL_CALL_FAILED: "CLI_RUN_TOOL_CALL_FAILED",
       CLI_RUN_SAVE_IMAGE_FAILED: "CLI_RUN_SAVE_IMAGE_FAILED",
       TOOL_CAPABILITY_UNSUPPORTED_OPERATION: "TOOL_CAPABILITY_UNSUPPORTED_OPERATION",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swmansion/argent",
-  "version": "0.18.1-next.11",
+  "version": "0.18.1-next.12",
   "mcpName": "io.github.software-mansion/argent",
   "description": "MCP server for iOS Simulator and Android Emulator control",
   "license": "Apache-2.0",