run402 1.69.4 → 1.69.6

package/lib/email.mjs

@@ -1,6 +1,7 @@
 import { resolveProjectId } from "./config.mjs";
 import { getSdk } from "./sdk.mjs";
 import { reportSdkError, fail, parseFlagJson } from "./sdk-errors.mjs";
+import { assertKnownFlags, flagValue, normalizeArgv, parseIntegerFlag, positionalArgs } from "./argparse.mjs";
 
 const HELP = `run402 email — Send emails from your project
 
@@ -152,17 +153,39 @@ Examples:
 `,
 };
 
-function parseFlag(args, flag) {
+function strictFlagValue(args, flag) {
+  const value = flagValue(args, flag);
+  if (typeof value === "string" && value.startsWith("--")) {
+    fail({
+      code: "BAD_FLAG",
+      message: `${flag} requires a value`,
+      details: { flag },
+    });
+  }
+  return value;
+}
+
+function validateArgs(args, knownFlags, flagsWithValues = knownFlags) {
+  assertKnownFlags(args, knownFlags, flagsWithValues);
+  const valueFlags = new Set(flagsWithValues);
   for (let i = 0; i < args.length; i++) {
-    if (args[i] === flag && args[i + 1]) return args[i + 1];
+    const flag = args[i];
+    if (!valueFlags.has(flag)) continue;
+    if (i + 1 >= args.length || (typeof args[i + 1] === "string" && args[i + 1].startsWith("--"))) {
+      fail({
+        code: "BAD_FLAG",
+        message: `${flag} requires a value`,
+        details: { flag },
+      });
+    }
+    i += 1;
   }
-  return null;
 }
 
 function parseVars(args) {
   const vars = {};
   for (let i = 0; i < args.length; i++) {
-    if (args[i] === "--vars" && args[i + 1]) {
+    if (args[i] === "--vars") {
       const raw = args[++i];
       const parsed = parseFlagJson("--vars", raw);
       if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
@@ -175,7 +198,7 @@ function parseVars(args) {
     }
   }
   for (let i = 0; i < args.length; i++) {
-    if (args[i] === "--var" && args[i + 1]) {
+    if (args[i] === "--var") {
       const raw = args[++i];
       const eq = raw.indexOf("=");
       if (eq > 0) vars[raw.slice(0, eq)] = raw.slice(eq + 1);
@@ -185,12 +208,9 @@ function parseVars(args) {
 }
 
 async function create(args) {
-  let slug = null;
-  let projectOpt = null;
-  for (let i = 0; i < args.length; i++) {
-    if (args[i] === "--project" && args[i + 1]) { projectOpt = args[++i]; }
-    else if (!args[i].startsWith("--") && !slug) { slug = args[i]; }
-  }
+  validateArgs(args, ["--project"]);
+  const slug = positionalArgs(args, ["--project"])[0] ?? null;
+  const projectOpt = strictFlagValue(args, "--project");
   const projectId = resolveProjectId(projectOpt);
   if (!slug) {
     fail({
@@ -209,13 +229,15 @@ async function create(args) {
 }
 
 async function send(args) {
-  const template = parseFlag(args, "--template");
-  const to = parseFlag(args, "--to");
-  const subject = parseFlag(args, "--subject");
-  const html = parseFlag(args, "--html");
-  const text = parseFlag(args, "--text");
-  const fromName = parseFlag(args, "--from-name");
-  const projectId = resolveProjectId(parseFlag(args, "--project"));
+  const valueFlags = ["--template", "--to", "--subject", "--html", "--text", "--from-name", "--project", "--vars", "--var"];
+  validateArgs(args, valueFlags);
+  const template = strictFlagValue(args, "--template");
+  const to = strictFlagValue(args, "--to");
+  const subject = strictFlagValue(args, "--subject");
+  const html = strictFlagValue(args, "--html");
+  const text = strictFlagValue(args, "--text");
+  const fromName = strictFlagValue(args, "--from-name");
+  const projectId = resolveProjectId(strictFlagValue(args, "--project"));
   const variables = parseVars(args);
 
   if (!to) {
@@ -239,12 +261,14 @@ async function send(args) {
 }
 
 async function list(args) {
-  const projectId = resolveProjectId(parseFlag(args, "--project"));
-  const limit = parseFlag(args, "--limit");
-  const after = parseFlag(args, "--after");
+  const valueFlags = ["--project", "--limit", "--after"];
+  validateArgs(args, valueFlags);
+  const projectId = resolveProjectId(strictFlagValue(args, "--project"));
+  const limit = strictFlagValue(args, "--limit");
+  const after = strictFlagValue(args, "--after");
   try {
     const data = await getSdk().email.list(projectId, {
-      limit: limit ? Number(limit) : undefined,
+      limit: limit ? parseIntegerFlag("--limit", limit) : undefined,
       after: after ?? undefined,
     });
     console.log(JSON.stringify(data, null, 2));
@@ -254,13 +278,9 @@ async function list(args) {
 }
 
 async function get(args) {
-  let messageId = null;
-  let projectOpt = null;
-  for (let i = 0; i < args.length; i++) {
-    if (args[i] === "--project" && args[i + 1]) { projectOpt = args[++i]; }
-    else if (!args[i].startsWith("--") && !messageId) { messageId = args[i]; }
-  }
-  const projectId = resolveProjectId(projectOpt);
+  validateArgs(args, ["--project"]);
+  const messageId = positionalArgs(args, ["--project"])[0] ?? null;
+  const projectId = resolveProjectId(strictFlagValue(args, "--project"));
   if (!messageId) {
     fail({
       code: "BAD_USAGE",
@@ -277,15 +297,11 @@ async function get(args) {
 }
 
 async function getRaw(args) {
-  let messageId = null;
-  let projectOpt = null;
-  let outputFile = null;
-  for (let i = 0; i < args.length; i++) {
-    if (args[i] === "--project" && args[i + 1]) { projectOpt = args[++i]; }
-    else if (args[i] === "--output" && args[i + 1]) { outputFile = args[++i]; }
-    else if (!args[i].startsWith("--") && !messageId) { messageId = args[i]; }
-  }
-  const projectId = resolveProjectId(projectOpt);
+  const valueFlags = ["--project", "--output"];
+  validateArgs(args, valueFlags);
+  const messageId = positionalArgs(args, valueFlags)[0] ?? null;
+  const outputFile = strictFlagValue(args, "--output");
+  const projectId = resolveProjectId(strictFlagValue(args, "--project"));
   if (!messageId) {
     fail({
       code: "BAD_USAGE",
@@ -311,19 +327,14 @@ async function getRaw(args) {
 }
 
 async function reply(args) {
-  let messageId = null;
-  let projectOpt = null;
-  for (let i = 0; i < args.length; i++) {
-    const a = args[i];
-    if (a === "--project" && args[i + 1]) { projectOpt = args[++i]; }
-    else if (a === "--html" || a === "--text" || a === "--subject" || a === "--from-name") { i++; }
-    else if (!a.startsWith("--") && !messageId) { messageId = a; }
-  }
-  const html = parseFlag(args, "--html");
-  const text = parseFlag(args, "--text");
-  const subjectOverride = parseFlag(args, "--subject");
-  const fromName = parseFlag(args, "--from-name");
-  const projectId = resolveProjectId(projectOpt);
+  const valueFlags = ["--project", "--html", "--text", "--subject", "--from-name"];
+  validateArgs(args, valueFlags);
+  const messageId = positionalArgs(args, valueFlags)[0] ?? null;
+  const html = strictFlagValue(args, "--html");
+  const text = strictFlagValue(args, "--text");
+  const subjectOverride = strictFlagValue(args, "--subject");
+  const fromName = strictFlagValue(args, "--from-name");
+  const projectId = resolveProjectId(strictFlagValue(args, "--project"));
 
   if (!messageId) {
     fail({
@@ -371,15 +382,9 @@ async function reply(args) {
 }
 
 async function deleteMailbox(args) {
-  let positional = null;
-  let projectOpt = null;
-  for (let i = 0; i < args.length; i++) {
-    const a = args[i];
-    if (a === "--project" && args[i + 1]) { projectOpt = args[++i]; }
-    else if (a === "--confirm") { /* flag */ }
-    else if (!a.startsWith("--") && !positional) { positional = a; }
-  }
-  const projectId = resolveProjectId(projectOpt);
+  validateArgs(args, ["--project", "--confirm"], ["--project"]);
+  const positional = positionalArgs(args, ["--project"])[0] ?? null;
+  const projectId = resolveProjectId(strictFlagValue(args, "--project"));
   const confirmed = args.includes("--confirm");
 
   if (!confirmed) {
@@ -398,7 +403,8 @@ async function deleteMailbox(args) {
 }
 
 async function status(args) {
-  const projectId = resolveProjectId(parseFlag(args, "--project"));
+  validateArgs(args, ["--project"]);
+  const projectId = resolveProjectId(strictFlagValue(args, "--project"));
   try {
     const mb = await getSdk().email.getMailbox(projectId);
     console.log(JSON.stringify({ status: "ok", mailbox_id: mb.mailbox_id, address: mb.address, slug: mb.slug }));
@@ -408,6 +414,7 @@ async function status(args) {
 }
 
 export async function run(sub, args) {
+  args = normalizeArgv(args);
   if (!sub || sub === '--help' || sub === '-h') { console.log(HELP); process.exit(0); }
   if (Array.isArray(args) && (args.includes("--help") || args.includes("-h")) && sub !== "webhooks") { console.log(SUB_HELP[sub] || HELP); process.exit(0); }
   switch (sub) {

package/lib/image.mjs

@@ -1,6 +1,7 @@
 import { writeFileSync } from "fs";
 import { getSdk } from "./sdk.mjs";
 import { reportSdkError, fail } from "./sdk-errors.mjs";
+import { assertAllowedValue, assertKnownFlags, flagValue, normalizeArgv, positionalArgs } from "./argparse.mjs";
 
 const HELP = `run402 image — Generate AI images via x402 micropayments
 
@@ -71,15 +72,22 @@ export async function run(sub, args) {
     process.exit(1);
   }
 
-  const opts = { prompt: null, aspect: "square", output: null };
-  let i = 0;
-  if (i < args.length && !args[i].startsWith("--")) opts.prompt = args[i++];
-  while (i < args.length) {
-    if (args[i] === "--help" || args[i] === "-h") { console.log(SUB_HELP[sub] || HELP); process.exit(0); }
-    else if (args[i] === "--aspect" && args[i + 1]) { opts.aspect = args[++i]; }
-    else if (args[i] === "--output" && args[i + 1]) { opts.output = args[++i]; }
-    i++;
+  const parsedArgs = normalizeArgv(args);
+  const valueFlags = ["--aspect", "--output"];
+  assertKnownFlags(parsedArgs, [...valueFlags, "--help", "-h"], valueFlags);
+  const positionals = positionalArgs(parsedArgs, valueFlags);
+  if (positionals.length > 1) {
+    fail({
+      code: "BAD_USAGE",
+      message: `Unexpected argument for image generate: ${positionals[1]}`,
+      hint: 'Quote multi-word prompts, e.g. run402 image generate "your prompt".',
+    });
   }
+  const opts = {
+    prompt: positionals[0] ?? null,
+    aspect: flagValue(parsedArgs, "--aspect") ?? "square",
+    output: flagValue(parsedArgs, "--output"),
+  };
 
   if (!opts.prompt) {
     fail({
@@ -88,6 +96,7 @@ export async function run(sub, args) {
       hint: 'run402 image generate "your prompt"',
     });
   }
+  assertAllowedValue(opts.aspect, ["square", "landscape", "portrait"], "--aspect");
 
   try {
     const data = await getSdk().ai.generateImage({ prompt: opts.prompt, aspect: opts.aspect });

package/lib/message.mjs

@@ -1,6 +1,7 @@
 import { allowanceAuthHeaders } from "./config.mjs";
 import { getSdk } from "./sdk.mjs";
 import { reportSdkError, fail } from "./sdk-errors.mjs";
+import { assertKnownFlags, normalizeArgv } from "./argparse.mjs";
 
 const HELP = `run402 message — Send messages to Run402 developers
 
@@ -88,5 +89,7 @@ export async function run(sub, args) {
     console.log(HELP);
     process.exit(1);
   }
-  await send(args.join(" "));
+  const parsedArgs = normalizeArgv(args);
+  assertKnownFlags(parsedArgs, ["--help", "-h"]);
+  await send(parsedArgs.join(" "));
 }

package/lib/secrets.mjs

@@ -1,7 +1,7 @@
 import { readFileSync } from "fs";
 import { getSdk } from "./sdk.mjs";
 import { reportSdkError, fail } from "./sdk-errors.mjs";
-import { validateRegularFile } from "./argparse.mjs";
+import { assertKnownFlags, flagValue, normalizeArgv, positionalArgs, validateRegularFile } from "./argparse.mjs";
 
 const HELP = `run402 secrets — Manage project secrets
 
@@ -78,15 +78,20 @@ Examples:
 };
 
 async function set(projectId, key, args = []) {
-  let file = null;
-  let value = null;
-  for (let i = 0; i < args.length; i++) {
-    if (args[i] === "--file" && args[i + 1]) { file = args[++i]; }
-    else if (!value && !args[i].startsWith("--")) { value = args[i]; }
+  const parsedArgs = normalizeArgv(args);
+  const valueFlags = ["--file"];
+  assertKnownFlags(parsedArgs, [...valueFlags, "--help", "-h"], valueFlags);
+  const values = positionalArgs(parsedArgs, valueFlags);
+  if (values.length > 1) {
+    fail({ code: "BAD_USAGE", message: `Unexpected argument for secrets set: ${values[1]}` });
+  }
+  const file = flagValue(parsedArgs, "--file");
+  if (file && values.length > 0) {
+    fail({ code: "BAD_USAGE", message: "Provide either an inline value or --file, not both." });
   }
   if (file) validateRegularFile(file, "--file");
-  const val = file ? readFileSync(file, "utf-8") : value;
-  if (!val) {
+  const val = file ? readFileSync(file, "utf-8") : values.length === 1 ? values[0] : undefined;
+  if (val === undefined) {
     fail({
       code: "BAD_USAGE",
       message: "Missing secret value.",
@@ -101,7 +106,13 @@ async function set(projectId, key, args = []) {
   }
 }
 
-async function list(projectId) {
+async function list(projectId, args = []) {
+  const parsedArgs = normalizeArgv(args);
+  assertKnownFlags(parsedArgs, ["--help", "-h"]);
+  const extra = positionalArgs(parsedArgs);
+  if (extra.length > 0) {
+    fail({ code: "BAD_USAGE", message: `Unexpected argument for secrets list: ${extra[0]}` });
+  }
   try {
     const data = await getSdk().secrets.list(projectId);
     const sanitized = {
@@ -117,7 +128,13 @@ async function list(projectId) {
   }
 }
 
-async function deleteSecret(projectId, key) {
+async function deleteSecret(projectId, key, args = []) {
+  const parsedArgs = normalizeArgv(args);
+  assertKnownFlags(parsedArgs, ["--help", "-h"]);
+  const extra = positionalArgs(parsedArgs);
+  if (extra.length > 0) {
+    fail({ code: "BAD_USAGE", message: `Unexpected argument for secrets delete: ${extra[0]}` });
+  }
   try {
     await getSdk().secrets.delete(projectId, key);
     console.log(JSON.stringify({ status: "ok", message: `Secret '${key}' deleted.` }));
@@ -134,8 +151,8 @@ export async function run(sub, args) {
   }
   switch (sub) {
     case "set":    await set(args[0], args[1], args.slice(2)); break;
-    case "list":   await list(args[0]); break;
-    case "delete": await deleteSecret(args[0], args[1]); break;
+    case "list":   await list(args[0], args.slice(1)); break;
+    case "delete": await deleteSecret(args[0], args[1], args.slice(2)); break;
     default:
       console.error(`Unknown subcommand: ${sub}\n`);
       console.log(HELP);

package/lib/sender-domain.mjs

@@ -1,6 +1,7 @@
 import { resolveProjectId } from "./config.mjs";
 import { getSdk } from "./sdk.mjs";
 import { reportSdkError, fail } from "./sdk-errors.mjs";
+import { assertKnownFlags, flagValue, normalizeArgv, positionalArgs } from "./argparse.mjs";
 
 const HELP = `run402 sender-domain — Manage custom email sender domain
 
@@ -100,18 +101,18 @@ Examples:
 };
 
 function parseFlag(args, flag) {
-  for (let i = 0; i < args.length; i++) {
-    if (args[i] === flag && args[i + 1]) return args[i + 1];
-  }
-  return null;
+  return flagValue(normalizeArgv(args), flag);
 }
 
 async function register(args) {
-  let domain = null;
-  let projectOpt = null;
-  for (let i = 0; i < args.length; i++) {
-    if (args[i] === "--project" && args[i + 1]) { projectOpt = args[++i]; }
-    else if (!args[i].startsWith("--") && !domain) { domain = args[i]; }
+  const parsedArgs = normalizeArgv(args);
+  const valueFlags = ["--project"];
+  assertKnownFlags(parsedArgs, [...valueFlags, "--help", "-h"], valueFlags);
+  const positionals = positionalArgs(parsedArgs, valueFlags);
+  let domain = positionals[0] ?? null;
+  let projectOpt = flagValue(parsedArgs, "--project");
+  if (positionals.length > 1) {
+    fail({ code: "BAD_USAGE", message: `Unexpected argument for sender-domain register: ${positionals[1]}` });
   }
   const projectId = resolveProjectId(projectOpt);
 
@@ -132,6 +133,13 @@ async function register(args) {
 }
 
 async function status(args) {
+  const parsedArgs = normalizeArgv(args);
+  const valueFlags = ["--project"];
+  assertKnownFlags(parsedArgs, [...valueFlags, "--help", "-h"], valueFlags);
+  const extra = positionalArgs(parsedArgs, valueFlags);
+  if (extra.length > 0) {
+    fail({ code: "BAD_USAGE", message: `Unexpected argument for sender-domain status: ${extra[0]}` });
+  }
   const projectId = resolveProjectId(parseFlag(args, "--project"));
   try {
     const data = await getSdk().senderDomain.status(projectId);
@@ -142,6 +150,13 @@ async function status(args) {
 }
 
 async function remove(args) {
+  const parsedArgs = normalizeArgv(args);
+  const valueFlags = ["--project"];
+  assertKnownFlags(parsedArgs, [...valueFlags, "--help", "-h"], valueFlags);
+  const extra = positionalArgs(parsedArgs, valueFlags);
+  if (extra.length > 0) {
+    fail({ code: "BAD_USAGE", message: `Unexpected argument for sender-domain remove: ${extra[0]}` });
+  }
   const projectId = resolveProjectId(parseFlag(args, "--project"));
   try {
     await getSdk().senderDomain.remove(projectId);
@@ -152,11 +167,14 @@ async function remove(args) {
 }
 
 async function inboundToggle(action, args) {
-  let domain = null;
-  let projectOpt = null;
-  for (let i = 0; i < args.length; i++) {
-    if (args[i] === "--project" && args[i + 1]) { projectOpt = args[++i]; }
-    else if (!args[i].startsWith("--") && !domain) { domain = args[i]; }
+  const parsedArgs = normalizeArgv(args);
+  const valueFlags = ["--project"];
+  assertKnownFlags(parsedArgs, [...valueFlags, "--help", "-h"], valueFlags);
+  const positionals = positionalArgs(parsedArgs, valueFlags);
+  let domain = positionals[0] ?? null;
+  let projectOpt = flagValue(parsedArgs, "--project");
+  if (positionals.length > 1) {
+    fail({ code: "BAD_USAGE", message: `Unexpected argument for sender-domain inbound-${action}: ${positionals[1]}` });
   }
   const projectId = resolveProjectId(projectOpt);
 

package/lib/sites.mjs

@@ -6,6 +6,7 @@ import { allowanceAuthHeaders, resolveProjectId, updateProject } from "./config.
 import { resolveFilePathsInManifest } from "./manifest.mjs";
 import { getSdk } from "./sdk.mjs";
 import { reportSdkError, fail } from "./sdk-errors.mjs";
+import { assertKnownFlags, flagValue, normalizeArgv, positionalArgs } from "./argparse.mjs";
 
 const SMALL_DIR_THRESHOLD = 5;
 
@@ -187,14 +188,25 @@ function failUnsupportedTarget() {
 }
 
 async function deploy(args) {
+  const parsedArgs = normalizeArgv(args);
+  const valueFlags = ["--manifest", "--project", "--target"];
+  assertKnownFlags(parsedArgs, [...valueFlags, "--quiet", "--inherit", "--help", "-h"], valueFlags);
+  const extra = positionalArgs(parsedArgs, valueFlags);
+  if (extra.length > 0) {
+    fail({
+      code: "BAD_USAGE",
+      message: `Unexpected argument for sites deploy: ${extra[0]}`,
+      hint: "Use `run402 sites deploy --manifest <file> [--project <id>]`.",
+    });
+  }
   const opts = { manifest: null, project: undefined, target: undefined, quiet: false };
-  for (let i = 0; i < args.length; i++) {
-    if (args[i] === "--help" || args[i] === "-h") { console.log(HELP); process.exit(0); }
-    if (args[i] === "--manifest" && args[i + 1]) opts.manifest = args[++i];
-    if (args[i] === "--project" && args[i + 1]) opts.project = args[++i];
-    if (args[i] === "--target" && args[i + 1]) opts.target = args[++i];
-    if (args[i] === "--quiet") opts.quiet = true;
-    if (args[i] === "--inherit") {
+  opts.manifest = flagValue(parsedArgs, "--manifest");
+  opts.project = flagValue(parsedArgs, "--project") ?? undefined;
+  opts.target = flagValue(parsedArgs, "--target") ?? undefined;
+  opts.quiet = parsedArgs.includes("--quiet");
+  for (let i = 0; i < parsedArgs.length; i++) {
+    if (parsedArgs[i] === "--help" || parsedArgs[i] === "-h") { console.log(HELP); process.exit(0); }
+    if (parsedArgs[i] === "--inherit") {
       console.error(JSON.stringify({
         status: "error",
         message: "--inherit is removed; the SDK now uploads only changed files automatically.",
@@ -231,6 +243,17 @@ async function deploy(args) {
 }
 
 async function deployDir(args) {
+  const parsedArgs = normalizeArgv(args);
+  const valueFlags = ["--project", "--target"];
+  assertKnownFlags(parsedArgs, [...valueFlags, "--quiet", "--dry-run", "--confirm-prune", "--inherit", "--help", "-h"], valueFlags);
+  const positionals = positionalArgs(parsedArgs, valueFlags);
+  if (positionals.length > 1) {
+    fail({
+      code: "BAD_USAGE",
+      message: `Unexpected argument for sites deploy-dir: ${positionals[1]}`,
+      hint: "Use `run402 sites deploy-dir <path> --project <id>`.",
+    });
+  }
   const opts = {
     dir: null,
     project: undefined,
@@ -239,20 +262,20 @@ async function deployDir(args) {
     dryRun: false,
     confirmPrune: false,
   };
-  for (let i = 0; i < args.length; i++) {
-    if (args[i] === "--help" || args[i] === "-h") { console.log(SUB_HELP["deploy-dir"]); process.exit(0); }
-    if (args[i] === "--project" && args[i + 1]) { opts.project = args[++i]; continue; }
-    if (args[i] === "--target" && args[i + 1]) { opts.target = args[++i]; continue; }
-    if (args[i] === "--quiet") { opts.quiet = true; continue; }
-    if (args[i] === "--dry-run") { opts.dryRun = true; continue; }
-    if (args[i] === "--confirm-prune") { opts.confirmPrune = true; continue; }
-    if (args[i] === "--inherit") {
+  opts.dir = positionals[0] ?? null;
+  opts.project = flagValue(parsedArgs, "--project") ?? undefined;
+  opts.target = flagValue(parsedArgs, "--target") ?? undefined;
+  opts.quiet = parsedArgs.includes("--quiet");
+  opts.dryRun = parsedArgs.includes("--dry-run");
+  opts.confirmPrune = parsedArgs.includes("--confirm-prune");
+  for (let i = 0; i < parsedArgs.length; i++) {
+    if (parsedArgs[i] === "--help" || parsedArgs[i] === "-h") { console.log(SUB_HELP["deploy-dir"]); process.exit(0); }
+    if (parsedArgs[i] === "--inherit") {
       fail({
         code: "BAD_USAGE",
         message: "--inherit is removed; the SDK now uploads only changed files automatically.",
       });
     }
-    if (!args[i].startsWith("-") && opts.dir === null) { opts.dir = args[i]; continue; }
   }
   if (!opts.dir) {
     fail({

package/lib/subdomains.mjs

@@ -1,6 +1,7 @@
 import { resolveProject, resolveProjectId } from "./config.mjs";
 import { getSdk } from "./sdk.mjs";
 import { reportSdkError, fail } from "./sdk-errors.mjs";
+import { assertKnownFlags, flagValue, normalizeArgv, positionalArgs } from "./argparse.mjs";
 
 const HELP = `run402 subdomains — Manage custom subdomains
 
@@ -78,22 +79,25 @@ Examples:
 `,
 };
 
-async function claim(positionalArgs, flagArgs) {
-  const opts = { project: null, deployment: null };
-  for (let i = 0; i < flagArgs.length; i++) {
-    if (flagArgs[i] === "--project" && flagArgs[i + 1]) opts.project = flagArgs[++i];
-    if (flagArgs[i] === "--deployment" && flagArgs[i + 1]) opts.deployment = flagArgs[++i];
-  }
+async function claim(args) {
+  const parsedArgs = normalizeArgv(args);
+  const valueFlags = ["--project", "--deployment"];
+  assertKnownFlags(parsedArgs, [...valueFlags, "--help", "-h"], valueFlags);
+  const opts = {
+    project: flagValue(parsedArgs, "--project"),
+    deployment: flagValue(parsedArgs, "--deployment"),
+  };
   let name, deploymentId;
-  if (positionalArgs.length > 1) {
+  const positionals = positionalArgs(parsedArgs, valueFlags);
+  if (positionals.length > 1) {
     fail({
       code: "BAD_USAGE",
-      message: `Unexpected argument for subdomains claim: ${positionalArgs[1]}`,
+      message: `Unexpected argument for subdomains claim: ${positionals[1]}`,
       hint: "Use `run402 subdomains claim <name> --deployment <deployment_id>`.",
     });
   }
-  if (positionalArgs.length === 1) {
-    name = positionalArgs[0];
+  if (positionals.length === 1) {
+    name = positionals[0];
   }
   if (!name) {
     fail({
@@ -123,13 +127,12 @@ async function claim(positionalArgs, flagArgs) {
 }
 
 async function deleteSubdomain(allArgs) {
-  const argList = Array.isArray(allArgs) ? allArgs : [];
-  let opts = { project: null };
-  let name = null;
-  for (let i = 0; i < argList.length; i++) {
-    if (argList[i] === "--project" && argList[i + 1]) { opts.project = argList[++i]; }
-    else if (!argList[i].startsWith("--") && !name) { name = argList[i]; }
-  }
+  const argList = normalizeArgv(Array.isArray(allArgs) ? allArgs : []);
+  const valueFlags = ["--project"];
+  assertKnownFlags(argList, [...valueFlags, "--confirm", "--help", "-h"], valueFlags);
+  const opts = { project: flagValue(argList, "--project") };
+  const positionals = positionalArgs(argList, valueFlags);
+  let name = positionals[0] ?? null;
   if (!name) {
     fail({
       code: "BAD_USAGE",
@@ -137,6 +140,9 @@ async function deleteSubdomain(allArgs) {
       hint: "run402 subdomains delete <name> --confirm [--project <id>]",
     });
   }
+  if (positionals.length > 1) {
+    fail({ code: "BAD_USAGE", message: `Unexpected argument for subdomains delete: ${positionals[1]}` });
+  }
   if (!argList.includes("--confirm")) {
     fail({
       code: "CONFIRMATION_REQUIRED",
@@ -154,13 +160,13 @@ async function deleteSubdomain(allArgs) {
 }
 
 function parseProjectFlag(args) {
-  let project = null;
-  const rest = [];
-  for (let i = 0; i < args.length; i++) {
-    if (args[i] === "--project" && args[i + 1]) { project = args[++i]; }
-    else { rest.push(args[i]); }
-  }
-  return { project, rest };
+  const parsedArgs = normalizeArgv(args);
+  const valueFlags = ["--project"];
+  assertKnownFlags(parsedArgs, [...valueFlags, "--help", "-h"], valueFlags);
+  return {
+    project: flagValue(parsedArgs, "--project"),
+    rest: positionalArgs(parsedArgs, valueFlags),
+  };
 }
 
 async function list(args) {
@@ -186,17 +192,7 @@ export async function run(sub, args) {
   if (!sub || sub === '--help' || sub === '-h') { console.log(HELP); process.exit(0); }
   if (Array.isArray(args) && (args.includes("--help") || args.includes("-h"))) { console.log(SUB_HELP[sub] || HELP); process.exit(0); }
   switch (sub) {
-    case "claim": {
-      const positional = [];
-      const flags = [];
-      let i = 0;
-      while (i < args.length) {
-        if (args[i].startsWith("--")) { flags.push(args[i], args[i + 1]); i += 2; }
-        else { positional.push(args[i]); i++; }
-      }
-      await claim(positional, flags);
-      break;
-    }
+    case "claim": await claim(args); break;
     case "delete": await deleteSubdomain(args); break;
     case "list":   await list(args); break;
     default: