@ted-galago/wave-cli 0.1.2 → 0.1.4

package/dist/index.js

@@ -101,10 +101,10 @@ function parseDebug(rawDebugOption, rawDebugEnv) {
   return lowered === "1" || lowered === "true" || lowered === "yes";
 }
 function getConfig(options) {
-  const token = process.env.WAVE_API_TOKEN ?? process.env.WAVE_JWT ?? options.token ?? options.jwt;
+  const token = options.token ?? options.jwt ?? process.env.WAVE_API_TOKEN ?? process.env.WAVE_JWT;
   if (!token) {
     throw new CliError({
-      message: "Missing API token. Set WAVE_API_TOKEN (or WAVE_JWT) or pass --token/--jwt.",
+      message: "Missing API token. Pass --token/--jwt, use --token-stdin/--auth-json-stdin, or set WAVE_API_TOKEN/WAVE_JWT.",
       kind: "missing_auth",
       status: 401,
       exitCode: EXIT_CODES.missingOrInvalidAuth
@@ -113,7 +113,7 @@ function getConfig(options) {
   const baseUrl = options.baseUrl ?? process.env.WAVE_API_BASE_URL ?? process.env.WAVE_API_URL;
   if (!baseUrl) {
     throw new CliError({
-      message: "Missing API base URL. Set WAVE_API_BASE_URL (or WAVE_API_URL) or pass --base-url.",
+      message: "Missing API base URL. Pass --base-url, provide via --auth-json-stdin, or set WAVE_API_BASE_URL/WAVE_API_URL.",
       kind: "invalid_args",
       status: 400,
       exitCode: EXIT_CODES.invalidArgs
@@ -180,6 +180,9 @@ function debugLog(config, message) {
 function graphqlOperationName(command) {
   return command.split(/[^a-zA-Z0-9]/).filter(Boolean).map((part) => part[0].toUpperCase() + part.slice(1)).join("");
 }
+function toCamelCase(value) {
+  return value.replace(/_([a-z])/g, (_, char) => char.toUpperCase());
+}
 function inferStatusFromGraphqlErrors(errors) {
   if (!Array.isArray(errors) || errors.length === 0) {
     return 400;
@@ -226,18 +229,39 @@ function graphqlTypeForValue(value) {
   }
   return "JSON";
 }
+function graphqlTypeForVariable(name, value) {
+  if (name === "id" || name.endsWith("Id")) {
+    return "ID";
+  }
+  if (name.endsWith("Ids")) {
+    return "[ID!]";
+  }
+  return graphqlTypeForValue(value);
+}
+function withNonNull(typeName) {
+  return typeName.endsWith("!") ? typeName : `${typeName}!`;
+}
+function normalizeGraphqlVariables(variables) {
+  const normalized = {};
+  Object.entries(variables).forEach(([key, value]) => {
+    normalized[toCamelCase(key)] = value;
+  });
+  return normalized;
+}
 function buildGraphqlBody(input) {
+  const graphqlField = toCamelCase(input.field);
+  const graphqlVariables = normalizeGraphqlVariables(input.variables);
   const operationName = graphqlOperationName(input.command);
-  const variableEntries = Object.entries(input.variables).filter(([, value]) => value !== void 0);
-  const variableDecl = variableEntries.map(([name, value]) => `$${name}: ${graphqlTypeForValue(value)}`).join(", ");
+  const variableEntries = Object.entries(graphqlVariables).filter(([, value]) => value !== void 0);
+  const variableDecl = variableEntries.map(([name, value]) => `$${name}: ${withNonNull(graphqlTypeForVariable(name, value))}`).join(", ");
   const fieldArgs = variableEntries.map(([name]) => `${name}: $${name}`).join(", ");
   const signature = variableDecl.length > 0 ? `(${variableDecl})` : "";
   const args = fieldArgs.length > 0 ? `(${fieldArgs})` : "";
-  const query = `${input.operationType} ${operationName}${signature} { ${input.field}${args} ${input.selectionSet} }`;
+  const query = `${input.operationType} ${operationName}${signature} { ${graphqlField}${args} ${input.selectionSet} }`;
   return {
     operationName,
     query,
-    variables: input.variables
+    variables: graphqlVariables
   };
 }
 async function graphqlRequest(input) {
@@ -288,7 +312,7 @@ async function graphqlRequest(input) {
         exitCode: mapStatusToExitCode(status)
       };
     }
-    const fieldPayload = gqlData[input.field];
+    const fieldPayload = gqlData[toCamelCase(input.field)];
     if (input.operationType === "mutation") {
       const mutationPayload = fieldPayload && typeof fieldPayload === "object" ? fieldPayload : {};
       const ok = Boolean(mutationPayload.ok);
@@ -301,7 +325,9 @@ async function graphqlRequest(input) {
             status,
             data: null,
             error: {
-              code: String(mutationPayload.error_code ?? `http_${status}`),
+              code: String(
+                mutationPayload.errorCode ?? mutationPayload.error_code ?? `http_${status}`
+              ),
               message: "Mutation failed.",
               details: {
                 errors: mutationPayload.errors ?? null,
@@ -404,10 +430,10 @@ function buildCliErrorEnvelope(params) {
 }
 function defaultQuerySelectionSet(field, isList) {
   if (field === "organization") {
-    return "{ id slug members_count organization_detail { title name description timezone workspace_name } }";
+    return "{ id slug membersCount organizationDetail { title name description timezone workspaceName } }";
   }
   if (isList) {
-    return "{ data { id type attributes } count current_page total_pages }";
+    return "{ data { id type attributes } count currentPage totalPages }";
   }
   return "{ id type attributes }";
 }
@@ -447,7 +473,7 @@ function normalizeGraphqlVariable(key, value) {
   }
   return parseBooleanMaybe(trimmed);
 }
-function normalizeGraphqlVariables(raw) {
+function normalizeGraphqlVariables2(raw) {
   const normalized = {};
   Object.entries(raw).forEach(([key, value]) => {
     const next = normalizeGraphqlVariable(key, value);
@@ -504,7 +530,7 @@ async function runGraphqlMutationCommand(input) {
       operationType: "mutation",
       field: input.field,
       variables: input.variables ?? {},
-      selectionSet: input.selectionSet ?? "{ ok status error_code data errors }"
+      selectionSet: input.selectionSet ?? "{ ok status errorCode data errors }"
     });
     printEnvelopeAndExit(result);
   } catch (error) {
@@ -534,24 +560,196 @@ async function runGraphqlMutationCommand(input) {
 }
 
 // src/commands/runtimeOptions.ts
-function pickRuntimeOptions(options) {
+var stdinPromise = null;
+function normalize(raw) {
+  if (typeof raw !== "string") {
+    return void 0;
+  }
+  const trimmed = raw.trim();
+  return trimmed.length > 0 ? trimmed : void 0;
+}
+function parseBool(raw) {
+  if (typeof raw === "boolean") {
+    return raw;
+  }
+  if (typeof raw !== "string") {
+    return void 0;
+  }
+  const lowered = raw.toLowerCase();
+  if (lowered === "1" || lowered === "true" || lowered === "yes") {
+    return true;
+  }
+  if (lowered === "0" || lowered === "false" || lowered === "no") {
+    return false;
+  }
+  return void 0;
+}
+function parseAuthJson(raw) {
+  try {
+    const parsed = JSON.parse(raw);
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+      throw new Error("Expected JSON object.");
+    }
+    const obj = parsed;
+    return {
+      token: normalize(obj.token),
+      jwt: normalize(obj.jwt),
+      baseUrl: normalize(obj.baseUrl ?? obj.base_url),
+      organizationId: normalize(obj.organizationId ?? obj.organization_id),
+      timeoutMs: typeof obj.timeoutMs === "number" || typeof obj.timeoutMs === "string" ? obj.timeoutMs : typeof obj.timeout_ms === "number" || typeof obj.timeout_ms === "string" ? obj.timeout_ms : void 0,
+      debug: parseBool(obj.debug),
+      agentName: normalize(obj.agentName ?? obj.agent_name),
+      agentRunId: normalize(obj.agentRunId ?? obj.agent_run_id),
+      requestId: normalize(obj.requestId ?? obj.request_id),
+      openapiPath: normalize(obj.openapiPath ?? obj.openapi_path),
+      openapiUrl: normalize(obj.openapiUrl ?? obj.openapi_url),
+      openapiVersion: normalize(obj.openapiVersion ?? obj.openapi_version)
+    };
+  } catch (error) {
+    throw new CliError({
+      message: error instanceof Error ? `Invalid --auth-json-stdin payload: ${error.message}` : "Invalid --auth-json-stdin payload.",
+      kind: "invalid_args",
+      status: 400,
+      exitCode: EXIT_CODES.invalidArgs
+    });
+  }
+}
+async function readStdinRaw() {
+  if (!stdinPromise) {
+    stdinPromise = new Promise((resolve, reject) => {
+      if (process.stdin.isTTY) {
+        resolve("");
+        return;
+      }
+      let data = "";
+      process.stdin.setEncoding("utf8");
+      process.stdin.on("data", (chunk) => {
+        data += chunk;
+      });
+      process.stdin.on("end", () => resolve(data));
+      process.stdin.on("error", reject);
+    });
+  }
+  return stdinPromise;
+}
+function firstDefined(...values) {
+  return values.find((value) => value !== void 0);
+}
+function resolveFromSources(options, stdin, env) {
+  const token = firstDefined(
+    normalize(options.token),
+    normalize(options.jwt),
+    normalize(stdin.token),
+    normalize(stdin.jwt),
+    normalize(env.WAVE_API_TOKEN),
+    normalize(env.WAVE_JWT)
+  );
+  const baseUrl = firstDefined(
+    normalize(options.baseUrl),
+    normalize(stdin.baseUrl),
+    normalize(env.WAVE_API_BASE_URL),
+    normalize(env.WAVE_API_URL)
+  );
+  const organizationId = firstDefined(
+    normalize(options.organizationId),
+    normalize(stdin.organizationId),
+    normalize(env.WAVE_ORGANIZATION_ID),
+    normalize(env.WAVE_ORG_ID)
+  );
+  const timeoutMs = firstDefined(options.timeoutMs, stdin.timeoutMs, env.WAVE_TIMEOUT_MS);
+  const debug = firstDefined(
+    options.debug === true ? true : void 0,
+    stdin.debug,
+    parseBool(env.WAVE_DEBUG)
+  );
+  const agentName = firstDefined(
+    normalize(options.agentName),
+    normalize(stdin.agentName),
+    normalize(env.WAVE_AGENT_NAME)
+  );
+  const agentRunId = firstDefined(
+    normalize(options.agentRunId),
+    normalize(stdin.agentRunId),
+    normalize(env.WAVE_AGENT_RUN_ID)
+  );
+  const requestId = firstDefined(
+    normalize(options.requestId),
+    normalize(stdin.requestId),
+    normalize(env.WAVE_REQUEST_ID)
+  );
+  const openapiPath = firstDefined(
+    normalize(options.openapiPath),
+    normalize(stdin.openapiPath),
+    normalize(env.WAVE_OPENAPI_PATH)
+  );
+  const openapiUrl = firstDefined(
+    normalize(options.openapiUrl),
+    normalize(stdin.openapiUrl),
+    normalize(env.WAVE_OPENAPI_URL)
+  );
+  const openapiVersion = firstDefined(
+    normalize(options.openapiVersion),
+    normalize(stdin.openapiVersion),
+    normalize(env.WAVE_OPENAPI_VERSION)
+  );
   return {
-    token: options.token,
-    jwt: options.jwt,
-    baseUrl: options.baseUrl,
-    timeoutMs: options.timeoutMs,
-    debug: options.debug,
-    agentName: options.agentName,
-    agentRunId: options.agentRunId,
-    requestId: options.requestId,
-    openapiPath: options.openapiPath,
-    openapiUrl: options.openapiUrl,
-    openapiVersion: options.openapiVersion
+    organizationId,
+    runtimeOptions: {
+      token,
+      baseUrl,
+      timeoutMs,
+      debug,
+      agentName,
+      agentRunId,
+      requestId,
+      openapiPath,
+      openapiUrl,
+      openapiVersion
+    }
   };
 }
+async function resolveStdinContext(options) {
+  if (options.tokenStdin && options.authJsonStdin) {
+    throw new CliError({
+      message: "Use only one stdin auth mode: --token-stdin or --auth-json-stdin.",
+      kind: "invalid_args",
+      status: 400,
+      exitCode: EXIT_CODES.invalidArgs
+    });
+  }
+  if (!options.tokenStdin && !options.authJsonStdin) {
+    return {};
+  }
+  const raw = (await readStdinRaw()).trim();
+  if (!raw) {
+    throw new CliError({
+      message: options.tokenStdin ? "Missing stdin token. Provide token via stdin when using --token-stdin." : "Missing stdin auth JSON. Provide JSON via stdin when using --auth-json-stdin.",
+      kind: "invalid_args",
+      status: 400,
+      exitCode: EXIT_CODES.invalidArgs
+    });
+  }
+  if (options.tokenStdin) {
+    const token = normalize(raw);
+    if (!token) {
+      throw new CliError({
+        message: "Invalid stdin token. Token value is empty.",
+        kind: "invalid_args",
+        status: 400,
+        exitCode: EXIT_CODES.invalidArgs
+      });
+    }
+    return { token };
+  }
+  return parseAuthJson(raw);
+}
+async function resolveCommandContext(options) {
+  const stdin = await resolveStdinContext(options);
+  return resolveFromSources(options, stdin, process.env);
+}
 
 // src/commands/organization.ts
-function normalize(input) {
+function normalize2(input) {
   if (!input) {
     return void 0;
   }
@@ -559,10 +757,10 @@ function normalize(input) {
   return trimmed.length > 0 ? trimmed : void 0;
 }
 function resolveOrganizationId(raw) {
-  const organizationId = normalize(process.env.WAVE_ORGANIZATION_ID) ?? normalize(process.env.WAVE_ORG_ID) ?? normalize(raw);
+  const organizationId = normalize2(raw);
   if (!organizationId) {
     throw new CliError({
-      message: "Missing organization ID. Set WAVE_ORGANIZATION_ID (or WAVE_ORG_ID) or pass --organization-id.",
+      message: "Missing organization ID. Pass --organization-id, provide via --auth-json-stdin, or set WAVE_ORGANIZATION_ID.",
       kind: "invalid_args",
       status: 400,
       exitCode: EXIT_CODES.invalidArgs
@@ -1154,6 +1352,21 @@ function buildDataJsonHelp(rootKey, mode) {
 
 // src/commands/entityCrud.ts
 var idSchema = z2.string().min(1);
+function toSingularResourceName(resourcePath) {
+  if (resourcePath === "organization_meta_profiles") {
+    return "organization_meta_profile";
+  }
+  if (resourcePath === "key_metric_meta_profiles") {
+    return "key_metric_meta_profile";
+  }
+  if (resourcePath.endsWith("ies")) {
+    return resourcePath.slice(0, -3) + "y";
+  }
+  if (resourcePath.endsWith("s")) {
+    return resourcePath.slice(0, -1);
+  }
+  return resourcePath;
+}
 function parseJsonObject(raw) {
   try {
     const parsed = JSON.parse(raw);
@@ -1223,8 +1436,8 @@ function registerEntityCrudCommands(program, config) {
     list.option(`--${cliParam} <${cliParam}>`);
   });
   list.option("--query-json <queryJson>", "Additional query params as JSON object").action(async (opts, cmd) => {
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const extraQuery = parseQueryJson(opts.queryJson ? String(opts.queryJson) : void 0);
     const mappedKnownParams = Object.fromEntries(
       listParams.map((param) => {
@@ -1232,7 +1445,7 @@ function registerEntityCrudCommands(program, config) {
         return [param, opts[optionKey]];
       })
     );
-    const variables = normalizeGraphqlVariables({
+    const variables = normalizeGraphqlVariables2({
       organization_id: organizationId,
       page: opts.page,
       per: opts.per,
@@ -1241,7 +1454,7 @@ function registerEntityCrudCommands(program, config) {
     });
     await runGraphqlQueryCommand({
       command: `${config.command}.list`,
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: config.resourcePath === "feedback" ? "feedbacks" : config.resourcePath,
       variables,
       isList: true
@@ -1249,13 +1462,13 @@ function registerEntityCrudCommands(program, config) {
   });
   entityCommand.command("show").requiredOption("--id <id>").action(async (opts, cmd) => {
     const id = idSchema.parse(opts.id);
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     await runGraphqlQueryCommand({
       command: `${config.command}.show`,
-      runtimeOptions: pickRuntimeOptions(globalOpts),
-      field: config.resourcePath === "organization_meta_profiles" ? "organization_meta_profile" : config.resourcePath === "key_metric_meta_profiles" ? "key_metric_meta_profile" : config.resourcePath === "feedback" ? "feedback" : config.resourcePath.endsWith("s") ? config.resourcePath.slice(0, -1) : config.resourcePath,
-      variables: normalizeGraphqlVariables({
+      runtimeOptions: context.runtimeOptions,
+      field: config.resourcePath === "feedback" ? "feedback" : toSingularResourceName(config.resourcePath),
+      variables: normalizeGraphqlVariables2({
         organization_id: organizationId,
         id
       }),
@@ -1263,39 +1476,40 @@ function registerEntityCrudCommands(program, config) {
     });
   });
   entityCommand.command("create").requiredOption("--data-json <dataJson>", createHelp4).action(async (opts, cmd) => {
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const body = normalizeBody(String(opts.dataJson), config.rootKey);
     assertRequiredCreateFields(body, config.rootKey, config.requiredCreateFields);
     await runGraphqlMutationCommand({
       command: `${config.command}.create`,
-      runtimeOptions: pickRuntimeOptions(globalOpts),
-      field: config.resourcePath === "organization_meta_profiles" ? "create_organization_meta_profile" : config.resourcePath === "key_metric_meta_profiles" ? "create_key_metric_meta_profile" : `create_${config.resourcePath.endsWith("s") ? config.resourcePath.slice(0, -1) : config.resourcePath}`,
+      runtimeOptions: context.runtimeOptions,
+      field: `create_${toSingularResourceName(config.resourcePath)}`,
       variables: {
         organization_id: organizationId,
-        params: body[config.rootKey] ?? body
+        params: body
       }
     });
   });
   entityCommand.command("update").requiredOption("--id <id>").requiredOption("--data-json <dataJson>", updateHelp5).action(async (opts, cmd) => {
     const id = idSchema.parse(opts.id);
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const body = normalizeBody(String(opts.dataJson), config.rootKey);
-    const singular = config.resourcePath === "organization_meta_profiles" ? "organization_meta_profile" : config.resourcePath === "key_metric_meta_profiles" ? "key_metric_meta_profile" : config.resourcePath.endsWith("s") ? config.resourcePath.slice(0, -1) : config.resourcePath;
+    const singular = toSingularResourceName(config.resourcePath);
     await runGraphqlMutationCommand({
       command: `${config.command}.update`,
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: `update_${singular}`,
       variables: {
         organization_id: organizationId,
         [`${singular}_id`]: id,
-        params: body[config.rootKey] ?? body
+        params: body
       }
     });
   });
 }
 var __testables = {
+  toSingularResourceName,
   parseJsonObject,
   normalizeBody,
   assertRequiredCreateFields,
@@ -1309,15 +1523,15 @@ var summarySchema = z3.string().min(1);
 function registerTaskCommands(program) {
   const tasks = program.command("tasks").description("Task operations");
   tasks.command("list").option("--project-id <projectId>").option("--page <page>").option("--per <per>").option("--team-id <teamId>").option("--team-ids <teamIds>").option("--member-id <memberId>").option("--meeting-id <meetingId>").option("--field-name <fieldName>").option("--field-value <fieldValue>").option("--field-blank <fieldBlank>").option("--rank-direction <rankDirection>").option("--include-archived <includeArchived>").option("--query-json <queryJson>").action(async (opts, cmd) => {
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const projectId = opts.projectId ? projectIdSchema.parse(opts.projectId) : void 0;
     const extra = parseQueryJson(opts.queryJson ? String(opts.queryJson) : void 0);
     await runGraphqlQueryCommand({
       command: "tasks.list",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "tasks",
-      variables: normalizeGraphqlVariables({
+      variables: normalizeGraphqlVariables2({
         organization_id: organizationId,
         page: opts.page,
         per: opts.per,
@@ -1338,11 +1552,11 @@ function registerTaskCommands(program) {
   });
   tasks.command("show").requiredOption("--id <id>").action(async (opts, cmd) => {
     const parsed = idSchema2.parse(opts.id);
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     await runGraphqlQueryCommand({
       command: "tasks.show",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "task",
       variables: {
         organization_id: organizationId,
@@ -1354,25 +1568,27 @@ function registerTaskCommands(program) {
   tasks.command("create").requiredOption("--project-id <projectId>").option("--title <title>", "Legacy alias for --summary").option("--summary <summary>").action(async (opts, cmd) => {
     const projectId = projectIdSchema.parse(opts.projectId);
     const summary = summarySchema.parse(opts.summary ?? opts.title);
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     await runGraphqlMutationCommand({
       command: "tasks.create",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "create_task",
       variables: {
         organization_id: organizationId,
         params: {
-          project_id: projectId,
-          summary
+          task: {
+            project_id: projectId,
+            summary
+          }
         }
       }
     });
   });
   tasks.command("update").requiredOption("--id <id>").option("--summary <summary>").option("--description <description>").option("--status <status>").option("--priority <priority>").option("--due-date <dueDate>").option("--member-id <memberId>").action(async (opts, cmd) => {
     const id = idSchema2.parse(opts.id);
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const taskPayload = {
       ...opts.summary ? { summary: String(opts.summary) } : {},
       ...opts.description ? { description: String(opts.description) } : {},
@@ -1391,12 +1607,14 @@ function registerTaskCommands(program) {
     }
     await runGraphqlMutationCommand({
       command: "tasks.update",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "update_task",
       variables: {
         organization_id: organizationId,
         task_id: id,
-        params: taskPayload
+        params: {
+          task: taskPayload
+        }
       }
     });
   });
@@ -1410,14 +1628,14 @@ var projectUpdateDataJsonHelp = buildDataJsonHelp("project", "update") ?? 'JSON
 function registerProjectCommands(program) {
   const projects = program.command("projects").description("Project operations");
   projects.command("list").option("--page <page>").option("--per <per>").option("--include-archived <includeArchived>").option("--status <status>").option("--term <term>").option("--team-ids <teamIds>").option("--member-id <memberId>").option("--query-json <queryJson>").action(async (opts, cmd) => {
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const extra = parseQueryJson(opts.queryJson ? String(opts.queryJson) : void 0);
     await runGraphqlQueryCommand({
       command: "projects.list",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "projects",
-      variables: normalizeGraphqlVariables({
+      variables: normalizeGraphqlVariables2({
         organization_id: organizationId,
         page: opts.page,
         per: opts.per,
@@ -1433,11 +1651,11 @@ function registerProjectCommands(program) {
   });
   projects.command("show").requiredOption("--id <id>").action(async (opts, cmd) => {
     const id = idSchema3.parse(opts.id);
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     await runGraphqlQueryCommand({
       command: "projects.show",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "project",
       variables: {
         organization_id: organizationId,
@@ -1447,32 +1665,32 @@ function registerProjectCommands(program) {
     });
   });
   projects.command("create").requiredOption("--data-json <dataJson>", projectCreateDataJsonHelp).action(async (opts, cmd) => {
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const body = __testables.normalizeBody(String(opts.dataJson), "project");
     await runGraphqlMutationCommand({
       command: "projects.create",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "create_project",
       variables: {
         organization_id: organizationId,
-        params: body.project ?? body
+        params: body
       }
     });
   });
   projects.command("update").requiredOption("--id <id>").requiredOption("--data-json <dataJson>", projectUpdateDataJsonHelp).action(async (opts, cmd) => {
     const id = idSchema3.parse(opts.id);
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const body = __testables.normalizeBody(String(opts.dataJson), "project");
     await runGraphqlMutationCommand({
       command: "projects.update",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "update_project",
       variables: {
         organization_id: organizationId,
         project_id: id,
-        params: body.project ?? body
+        params: body
       }
     });
   });
@@ -1488,15 +1706,15 @@ var updateHelp = buildDataJsonHelp("rock", "update") ?? 'JSON object for rock or
 function registerRockCommands(program) {
   const rocks = program.command("rocks").description("Rock operations");
   rocks.command("list").option("--page <page>").option("--per <per>").option("--rock-collection-id <rockCollectionId>").option("--team-id <teamId>").option("--team-ids <teamIds>").option("--member-id <memberId>").option("--meeting-id <meetingId>").option("--annual-objective-id <annualObjectiveId>").option("--quarterly-objective-id <quarterlyObjectiveId>").option("--field-name <fieldName>").option("--field-value <fieldValue>").option("--field-blank <fieldBlank>").option("--rank-direction <rankDirection>").option("--include-archived <includeArchived>").option("--query-json <queryJson>").action(async (opts, cmd) => {
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const rockCollectionId = opts.rockCollectionId ? rockCollectionIdSchema.parse(opts.rockCollectionId) : void 0;
     const extra = parseQueryJson(opts.queryJson ? String(opts.queryJson) : void 0);
     await runGraphqlQueryCommand({
       command: "rocks.list",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "rocks",
-      variables: normalizeGraphqlVariables({
+      variables: normalizeGraphqlVariables2({
         organization_id: organizationId,
         page: opts.page,
         per: opts.per,
@@ -1519,11 +1737,11 @@ function registerRockCommands(program) {
   });
   rocks.command("show").requiredOption("--id <id>").action(async (opts, cmd) => {
     const id = idSchema4.parse(opts.id);
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     await runGraphqlQueryCommand({
       command: "rocks.show",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "rock",
       variables: {
         organization_id: organizationId,
@@ -1535,47 +1753,47 @@ function registerRockCommands(program) {
   rocks.command("update-status").requiredOption("--id <id>").requiredOption("--status <status>").action(async (opts, cmd) => {
     const id = idSchema4.parse(opts.id);
     const status = statusSchema.parse(opts.status);
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     await runGraphqlMutationCommand({
       command: "rocks.update-status",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "update_rock",
       variables: {
         organization_id: organizationId,
         rock_id: id,
-        params: { status }
+        params: { rock: { status } }
       }
     });
   });
   rocks.command("create").requiredOption("--data-json <dataJson>", createHelp).action(async (opts, cmd) => {
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const body = __testables.normalizeBody(String(opts.dataJson), "rock");
     __testables.assertRequiredCreateFields(body, "rock", ["rock_collection_id"]);
     await runGraphqlMutationCommand({
       command: "rocks.create",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "create_rock",
       variables: {
         organization_id: organizationId,
-        params: body.rock ?? body
+        params: body
       }
     });
   });
   rocks.command("update").requiredOption("--id <id>").requiredOption("--data-json <dataJson>", updateHelp).action(async (opts, cmd) => {
     const id = idSchema4.parse(opts.id);
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const body = __testables.normalizeBody(String(opts.dataJson), "rock");
     await runGraphqlMutationCommand({
       command: "rocks.update",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "update_rock",
       variables: {
         organization_id: organizationId,
         rock_id: id,
-        params: body.rock ?? body
+        params: body
       }
     });
   });
@@ -1590,14 +1808,14 @@ var updateHelp2 = buildDataJsonHelp("meeting", "update") ?? 'JSON object for mee
 function registerMeetingCommands(program) {
   const meetings = program.command("meetings").description("Meeting operations");
   meetings.command("list").option("--per <per>").option("--date <date>").option("--occurrence-date <occurrenceDate>").option("--past <past>").option("--start-time <startTime>").option("--today-and-active <todayAndActive>").option("--upcoming <upcoming>").option("--query-json <queryJson>").action(async (opts, cmd) => {
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const extra = parseQueryJson(opts.queryJson ? String(opts.queryJson) : void 0);
     await runGraphqlQueryCommand({
       command: "meetings.list",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "meetings",
-      variables: normalizeGraphqlVariables({
+      variables: normalizeGraphqlVariables2({
         organization_id: organizationId,
         per: opts.per,
         date: opts.date,
@@ -1613,11 +1831,11 @@ function registerMeetingCommands(program) {
   });
   meetings.command("show").requiredOption("--id <id>").action(async (opts, cmd) => {
     const id = idSchema5.parse(opts.id);
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     await runGraphqlQueryCommand({
       command: "meetings.show",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "meeting",
       variables: {
         organization_id: organizationId,
@@ -1629,48 +1847,50 @@ function registerMeetingCommands(program) {
   meetings.command("notes").requiredOption("--id <id>").requiredOption("--content <content>").action(async (opts, cmd) => {
     const id = idSchema5.parse(opts.id);
     const notes = notesSchema.parse(opts.content);
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     await runGraphqlMutationCommand({
       command: "meeting-notes.create",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "update_meeting",
       variables: {
         organization_id: organizationId,
         meeting_id: id,
         params: {
-          notes
+          meeting: {
+            notes
+          }
         }
       }
     });
   });
   meetings.command("create").requiredOption("--data-json <dataJson>", createHelp2).action(async (opts, cmd) => {
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const body = __testables.normalizeBody(String(opts.dataJson), "meeting");
     await runGraphqlMutationCommand({
       command: "meetings.create",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "create_meeting",
       variables: {
         organization_id: organizationId,
-        params: body.meeting ?? body
+        params: body
       }
     });
   });
   meetings.command("update").requiredOption("--id <id>").requiredOption("--data-json <dataJson>", updateHelp2).action(async (opts, cmd) => {
     const id = idSchema5.parse(opts.id);
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const body = __testables.normalizeBody(String(opts.dataJson), "meeting");
     await runGraphqlMutationCommand({
       command: "meetings.update",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "update_meeting",
       variables: {
         organization_id: organizationId,
         meeting_id: id,
-        params: body.meeting ?? body
+        params: body
       }
     });
   });
@@ -1684,14 +1904,14 @@ var updateHelp3 = buildDataJsonHelp("member", "update") ?? 'JSON object for memb
 function registerMemberCommands(program) {
   const members = program.command("members").description("Member operations");
   members.command("list").option("--page <page>").option("--per <per>").option("--query-json <queryJson>").action(async (opts, cmd) => {
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const extra = parseQueryJson(opts.queryJson ? String(opts.queryJson) : void 0);
     await runGraphqlQueryCommand({
       command: "members.list",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "members",
-      variables: normalizeGraphqlVariables({
+      variables: normalizeGraphqlVariables2({
         organization_id: organizationId,
         page: opts.page,
         per: opts.per,
@@ -1702,11 +1922,11 @@ function registerMemberCommands(program) {
   });
   members.command("show").requiredOption("--id <id>").action(async (opts, cmd) => {
     const id = idSchema6.parse(opts.id);
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     await runGraphqlQueryCommand({
       command: "members.show",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "member",
       variables: {
         organization_id: organizationId,
@@ -1716,32 +1936,32 @@ function registerMemberCommands(program) {
     });
   });
   members.command("create").requiredOption("--data-json <dataJson>", createHelp3).action(async (opts, cmd) => {
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const body = __testables.normalizeBody(String(opts.dataJson), "member");
     await runGraphqlMutationCommand({
       command: "members.create",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "create_member",
       variables: {
         organization_id: organizationId,
-        params: body.member ?? body
+        params: body
       }
     });
   });
   members.command("update").requiredOption("--id <id>").requiredOption("--data-json <dataJson>", updateHelp3).action(async (opts, cmd) => {
     const id = idSchema6.parse(opts.id);
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const body = __testables.normalizeBody(String(opts.dataJson), "member");
     await runGraphqlMutationCommand({
       command: "members.update",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "update_member",
       variables: {
         organization_id: organizationId,
         member_id: id,
-        params: body.member ?? body
+        params: body
       }
     });
   });
@@ -1757,14 +1977,14 @@ var updateHelp4 = buildDataJsonHelp("issue", "update") ?? 'JSON object for issue
 function registerIssueCommands(program) {
   const issues = program.command("issues").description("Issue operations");
   issues.command("list").option("--page <page>").option("--per <per>").option("--issue-group-id <issueGroupId>").option("--team-id <teamId>").option("--team-ids <teamIds>").option("--member-id <memberId>").option("--meeting-id <meetingId>").option("--rank-direction <rankDirection>").option("--include-archived <includeArchived>").option("--query-json <queryJson>").action(async (opts, cmd) => {
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const extra = parseQueryJson(opts.queryJson ? String(opts.queryJson) : void 0);
     await runGraphqlQueryCommand({
       command: "issues.list",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "issues",
-      variables: normalizeGraphqlVariables({
+      variables: normalizeGraphqlVariables2({
         organization_id: organizationId,
         page: opts.page,
         per: opts.per,
@@ -1782,11 +2002,11 @@ function registerIssueCommands(program) {
   });
   issues.command("show").requiredOption("--id <id>").action(async (opts, cmd) => {
     const id = idSchema7.parse(opts.id);
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     await runGraphqlQueryCommand({
       command: "issues.show",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "issue",
       variables: {
         organization_id: organizationId,
@@ -1799,40 +2019,42 @@ function registerIssueCommands(program) {
     const issueGroupId = issueGroupIdSchema.parse(opts.issueGroupId);
     const name = nameSchema.parse(opts.name);
     const issueType = issueTypeSchema.parse(opts.issueType);
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     await runGraphqlMutationCommand({
       command: "issues.create",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "create_issue",
       variables: {
         organization_id: organizationId,
         params: {
-          issue_group_id: issueGroupId,
-          name,
-          issue_type: issueType,
-          ...opts.status ? { status: String(opts.status) } : {},
-          ...opts.priority ? { priority: String(opts.priority) } : {},
-          ...opts.description ? { description: String(opts.description) } : {},
-          ...opts.dueBy ? { due_by: String(opts.dueBy) } : {},
-          ...opts.memberId ? { member_id: String(opts.memberId) } : {}
+          issue: {
+            issue_group_id: issueGroupId,
+            name,
+            issue_type: issueType,
+            ...opts.status ? { status: String(opts.status) } : {},
+            ...opts.priority ? { priority: String(opts.priority) } : {},
+            ...opts.description ? { description: String(opts.description) } : {},
+            ...opts.dueBy ? { due_by: String(opts.dueBy) } : {},
+            ...opts.memberId ? { member_id: String(opts.memberId) } : {}
+          }
         }
       }
     });
   });
   issues.command("update").requiredOption("--id <id>").requiredOption("--data-json <dataJson>", updateHelp4).action(async (opts, cmd) => {
     const id = idSchema7.parse(opts.id);
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const body = __testables.normalizeBody(String(opts.dataJson), "issue");
     await runGraphqlMutationCommand({
       command: "issues.update",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "update_issue",
       variables: {
         organization_id: organizationId,
         issue_id: id,
-        params: body.issue ?? body
+        params: body
       }
     });
   });
@@ -2040,14 +2262,14 @@ var idSchema8 = z9.string().min(1);
 function registerTeamCommands(program) {
   const teams = program.command("teams").description("Team operations");
   teams.command("list").option("--page <page>").option("--per <per>").option("--query-json <queryJson>").action(async (opts, cmd) => {
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const extra = parseQueryJson(opts.queryJson ? String(opts.queryJson) : void 0);
     await runGraphqlQueryCommand({
       command: "teams.list",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "teams",
-      variables: normalizeGraphqlVariables({
+      variables: normalizeGraphqlVariables2({
         organization_id: organizationId,
         page: opts.page,
         per: opts.per,
@@ -2058,11 +2280,11 @@ function registerTeamCommands(program) {
   });
   teams.command("show").requiredOption("--id <id>").action(async (opts, cmd) => {
     const id = idSchema8.parse(opts.id);
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     await runGraphqlQueryCommand({
       command: "teams.show",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "team",
       variables: {
         organization_id: organizationId,
@@ -2072,32 +2294,32 @@ function registerTeamCommands(program) {
     });
   });
   teams.command("create").requiredOption("--data-json <dataJson>", 'JSON object for team or {"team": {...}}').action(async (opts, cmd) => {
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const body = __testables.normalizeBody(String(opts.dataJson), "team");
     await runGraphqlMutationCommand({
       command: "teams.create",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "create_team",
       variables: {
         organization_id: organizationId,
-        params: body.team ?? body
+        params: body
       }
     });
   });
   teams.command("update").requiredOption("--id <id>").requiredOption("--data-json <dataJson>", 'JSON object for team or {"team": {...}}').action(async (opts, cmd) => {
     const id = idSchema8.parse(opts.id);
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const body = __testables.normalizeBody(String(opts.dataJson), "team");
     await runGraphqlMutationCommand({
       command: "teams.update",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "update_team",
       variables: {
         organization_id: organizationId,
         team_id: id,
-        params: body.team ?? body
+        params: body
       }
     });
   });
@@ -2109,12 +2331,12 @@ var idSchema9 = z10.string().min(1);
 function registerOrganizationCommands(program) {
   const organizations = program.command("organizations").description("Organization operations");
   organizations.command("show").option("--id <id>", "Organization ID (defaults to resolved organization context)").action(async (opts, cmd) => {
-    const globalOpts = cmd.optsWithGlobals();
-    const fallbackId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const fallbackId = resolveOrganizationId(context.organizationId);
     const id = idSchema9.parse(opts.id ?? fallbackId);
     await runGraphqlQueryCommand({
       command: "organizations.show",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "organization",
       variables: { id },
       isShow: true
@@ -2124,28 +2346,28 @@ function registerOrganizationCommands(program) {
     "--data-json <dataJson>",
     'JSON object for organization or {"organization": {...}}'
   ).action(async (opts, cmd) => {
-    const globalOpts = cmd.optsWithGlobals();
-    const fallbackId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const fallbackId = resolveOrganizationId(context.organizationId);
     const id = idSchema9.parse(opts.id ?? fallbackId);
     const body = __testables.normalizeBody(String(opts.dataJson), "organization");
     await runGraphqlMutationCommand({
       command: "organizations.update",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "update_organization",
       variables: {
         id,
-        params: body.organization ?? body
+        params: body
       }
     });
   });
   const metaProfile = organizations.command("meta-profile").description("Organization meta profile operations");
   metaProfile.command("show").option("--id <id>", "Meta profile ID (defaults to resolved organization context)").action(async (opts, cmd) => {
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const id = idSchema9.parse(opts.id ?? organizationId);
     await runGraphqlQueryCommand({
       command: "organizations.meta-profile.show",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "organization_meta_profile",
       variables: {
         organization_id: organizationId,
@@ -2158,8 +2380,8 @@ function registerOrganizationCommands(program) {
     "--data-json <dataJson>",
     'JSON object for organization_meta_profile or {"organization_meta_profile": {...}}'
   ).action(async (opts, cmd) => {
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const id = idSchema9.parse(opts.id ?? organizationId);
     const body = __testables.normalizeBody(
       String(opts.dataJson),
@@ -2167,23 +2389,23 @@ function registerOrganizationCommands(program) {
     );
     await runGraphqlMutationCommand({
       command: "organizations.meta-profile.update",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "update_organization_meta_profile",
       variables: {
         organization_id: organizationId,
         organization_meta_profile_id: id,
-        params: body.organization_meta_profile ?? body
+        params: body
       }
     });
   });
   const keyMetricMetaProfile = organizations.command("key-metric-meta-profile").description("Key metric meta profile operations");
   keyMetricMetaProfile.command("show").option("--id <id>", "Meta profile ID (defaults to resolved organization context)").action(async (opts, cmd) => {
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const id = idSchema9.parse(opts.id ?? organizationId);
     await runGraphqlQueryCommand({
       command: "organizations.key-metric-meta-profile.show",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "key_metric_meta_profile",
       variables: {
         organization_id: organizationId,
@@ -2196,8 +2418,8 @@ function registerOrganizationCommands(program) {
     "--data-json <dataJson>",
     'JSON object for key_metric_meta_profile or {"key_metric_meta_profile": {...}}'
   ).action(async (opts, cmd) => {
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const id = idSchema9.parse(opts.id ?? organizationId);
     const body = __testables.normalizeBody(
       String(opts.dataJson),
@@ -2205,12 +2427,12 @@ function registerOrganizationCommands(program) {
     );
     await runGraphqlMutationCommand({
       command: "organizations.key-metric-meta-profile.update",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "update_key_metric_meta_profile",
       variables: {
         organization_id: organizationId,
         key_metric_meta_profile_id: id,
-        params: body.key_metric_meta_profile ?? body
+        params: body
       }
     });
   });
@@ -2224,14 +2446,14 @@ function registerFoundationCommands(program) {
   const strategicPlans = foundation.command("strategic-plans").description("Strategic plan operations");
   const strategicObjectives = foundation.command("strategic-objectives").description("Strategic objective operations");
   strategicPlans.command("show").option("--id <id>", "Strategic plan ID (defaults to organization context)").option("--progress-scope <progressScope>").option("--all-progress <allProgress>").option("--all <all>").action(async (opts, cmd) => {
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const id = idSchema10.parse(opts.id ?? organizationId);
     await runGraphqlQueryCommand({
       command: "foundation.strategic-plans.show",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "strategic_plan",
-      variables: normalizeGraphqlVariables({
+      variables: normalizeGraphqlVariables2({
         organization_id: organizationId,
         id,
         progress_scope: opts.progressScope,
@@ -2245,30 +2467,30 @@ function registerFoundationCommands(program) {
     "--data-json <dataJson>",
     'JSON object for strategic_plan or {"strategic_plan": {...}}'
   ).action(async (opts, cmd) => {
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const id = idSchema10.parse(opts.id ?? organizationId);
     const body = __testables.normalizeBody(String(opts.dataJson), "strategic_plan");
     await runGraphqlMutationCommand({
       command: "foundation.strategic-plans.update",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "update_strategic_plan",
       variables: {
         organization_id: organizationId,
         strategic_plan_id: id,
-        params: body.strategic_plan ?? body
+        params: body
       }
     });
   });
   strategicObjectives.command("show").option("--id <id>", "Strategic objective ID (defaults to organization context)").option("--progress-scope <progressScope>").option("--all-progress <allProgress>").option("--all <all>").action(async (opts, cmd) => {
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const id = idSchema10.parse(opts.id ?? organizationId);
     await runGraphqlQueryCommand({
       command: "foundation.strategic-objectives.show",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "strategic_objective",
-      variables: normalizeGraphqlVariables({
+      variables: normalizeGraphqlVariables2({
         organization_id: organizationId,
         id,
         progress_scope: opts.progressScope,
@@ -2282,8 +2504,8 @@ function registerFoundationCommands(program) {
     "--data-json <dataJson>",
     'JSON object for strategic_objective or {"strategic_objective": {...}}'
   ).action(async (opts, cmd) => {
-    const globalOpts = cmd.optsWithGlobals();
-    const organizationId = resolveOrganizationId(globalOpts.organizationId);
+    const context = await resolveCommandContext(cmd.optsWithGlobals());
+    const organizationId = resolveOrganizationId(context.organizationId);
     const id = idSchema10.parse(opts.id ?? organizationId);
     const body = __testables.normalizeBody(
       String(opts.dataJson),
@@ -2291,12 +2513,12 @@ function registerFoundationCommands(program) {
     );
     await runGraphqlMutationCommand({
       command: "foundation.strategic-objectives.update",
-      runtimeOptions: pickRuntimeOptions(globalOpts),
+      runtimeOptions: context.runtimeOptions,
       field: "update_strategic_objective",
       variables: {
         organization_id: organizationId,
         strategic_objective_id: id,
-        params: body.strategic_objective ?? body
+        params: body
       }
     });
   });
@@ -2321,7 +2543,10 @@ function registerFoundationCommands(program) {
 // src/cli.ts
 function buildCli() {
   const program = new Command();
-  program.name("wave").description("Wave agent CLI").showHelpAfterError(false).allowExcessArguments(false).option("--token <token>", "API token (prefer WAVE_API_TOKEN env var)").option("--jwt <jwt>", "Legacy alias for --token (prefer WAVE_API_TOKEN env var)").option(
+  program.name("wave").description("Wave agent CLI").showHelpAfterError(false).allowExcessArguments(false).option("--token <token>", "API token (prefer WAVE_API_TOKEN env var)").option("--jwt <jwt>", "Legacy alias for --token (prefer WAVE_API_TOKEN env var)").option("--token-stdin", "Read API token from stdin").option(
+    "--auth-json-stdin",
+    "Read auth/runtime context JSON from stdin (token, baseUrl, organizationId, ...)"
+  ).option(
     "--base-url <baseUrl>",
     "API base URL (prefer WAVE_API_BASE_URL env var)"
   ).option(