qualty 0.1.25 → 0.1.27

package/bin/qualty.js

@@ -30,6 +30,7 @@ import {
 const DEFAULT_QUALTY_API_URL = "https://qualty-api-production.up.railway.app";
 
 const PROJECT_CONFIG_FILENAME = ".qualty.json";
+const DOTENV_FILENAME = ".env";
 const QUALTY_SHARED_CREDS_DIR = join(homedir(), ".qualty");
 const QUALTY_SHARED_CREDS_PATH = join(QUALTY_SHARED_CREDS_DIR, "credentials");
 
@@ -48,6 +49,47 @@ function getProjectConfigWritePath() {
   return findProjectConfigPath() || join(process.cwd(), PROJECT_CONFIG_FILENAME);
 }
 
+function findProjectDotenvPath() {
+  let current = process.cwd();
+  for (;;) {
+    const candidate = join(current, DOTENV_FILENAME);
+    if (existsSync(candidate)) return candidate;
+    const parent = dirname(current);
+    if (parent === current) return null;
+    current = parent;
+  }
+}
+
+function parseDotenvText(text) {
+  const out = {};
+  for (const raw of String(text || "").split("\n")) {
+    const line = raw.trim();
+    if (!line || line.startsWith("#") || !line.includes("=")) continue;
+    const eq = line.indexOf("=");
+    const key = line.slice(0, eq).trim();
+    let value = line.slice(eq + 1).trim();
+    if (
+      (value.startsWith('"') && value.endsWith('"'))
+      || (value.startsWith("'") && value.endsWith("'"))
+    ) {
+      value = value.slice(1, -1);
+    }
+    if (key) out[key] = value;
+  }
+  return out;
+}
+
+/** Project .env walked up from cwd (same resolution as Qualty MCP). */
+function loadProjectDotenv() {
+  const path = findProjectDotenvPath();
+  if (!path) return {};
+  try {
+    return parseDotenvText(readFileSync(path, "utf8"));
+  } catch {
+    return {};
+  }
+}
+
 function readSharedCredentials() {
   if (!existsSync(QUALTY_SHARED_CREDS_PATH)) return {};
   try {
@@ -124,7 +166,14 @@ function normalizeApiUrl(raw, { label = "API URL" } = {}) {
 }
 
 function qualtyBaseUrlFromEnv() {
-  return String(process.env.QUALTY_BASE_URL || process.env.QUALTY_API_URL || "").trim();
+  const dotenv = loadProjectDotenv();
+  return String(
+    dotenv.QUALTY_BASE_URL
+      || dotenv.QUALTY_API_URL
+      || process.env.QUALTY_BASE_URL
+      || process.env.QUALTY_API_URL
+      || ""
+  ).trim();
 }
 
 function resolveApiUrl(args = {}) {
@@ -142,8 +191,14 @@ function resolveApiUrl(args = {}) {
 }
 
 function resolveToken(args = {}) {
+  if (args.token) return String(args.token).trim();
+  const dotenv = loadProjectDotenv();
+  const fromDotenv = String(dotenv.QUALTY_API_TOKEN || "").trim();
+  if (fromDotenv) return fromDotenv;
+  const fromProcessEnv = String(process.env.QUALTY_API_TOKEN || "").trim();
+  if (fromProcessEnv) return fromProcessEnv;
   const creds = readSharedCredentials();
-  return args.token || process.env.QUALTY_API_TOKEN || creds.api_token || "";
+  return String(creds.api_token || "").trim();
 }
 
 function resolveOrgId(args = {}) {
@@ -187,13 +242,17 @@ function usage() {
       "Usage:",
       "  qualty setup [--token <bearer-token>] [--org <org-id>]",
       "  qualty auth setup [--project <project-id>] [--profile <profile-name>] [--headed]",
-      "  qualty auth export-ci [--project <project-id>] [--profile <profile-name>] [--org <org-id>]",
-      "                   [--all-profiles] [--profiles <name1,name2>]",
-      "                   [--suite-id <suite-uuid>] [--ids <id1,id2>]  export profiles required by tests",
-      "                   [--url <api-base-url>] [--repo <owner/repo>]",
-      "                   [--output <path>] [--no-file] [--copy] [--gzip] [--include-token]",
-      "                   [--set-secret | --set-github]  gh: secrets (token, API URL, auth bundle) + variables",
-      "                   [--cli-repo <owner/repo>] [--cli-ref <branch>]  Optional CI variables",
+      "  qualty auth export [--project <project-id>] [--profile <profile-name>] [--org <org-id>]",
+      "               [--profiles <name1,name2>] [--repo <owner/repo>]",
+      "               [--output <path>] [--no-file] [--copy] [--set-secret | --set-github]",
+      "               Push login profile state to GitHub only (not API token, org, or project vars).",
+      "  qualty ci setup [--project <project-id>] [--profile <profile-name>] [--org <org-id>]",
+      "               [--all-profiles] [--profiles <name1,name2>]",
+      "               [--suite-id <suite-uuid>] [--ids <id1,id2>]  bundle login profiles required by tests",
+      "               [--url <api-base-url>] [--repo <owner/repo>]",
+      "               [--output <path>] [--no-file] [--copy] [--gzip] [--include-token]",
+      "               [--set-secret | --set-github]  gh: secrets (token, API URL, auth bundle) + variables",
+      "               [--cli-repo <owner/repo>] [--cli-ref <branch>]  Optional CI variables",
       "  qualty auth restore-ci [--org <org-id>] [--project <project-id>] [--profile <fallback-profile>]",
       "                   Reads QUALTY_AUTH_STATE_B64 (+ _2, _3, … shards) and writes ~/.qualty/local-contexts/…",
       "  qualty connect --project <project-id> [--port 3000] [--token <bearer-token>] [--org <org-id>]",
@@ -206,7 +265,7 @@ function usage() {
       "  qualty resolve --project <project-id> [--suite-id <suite-id>] [--ids <id1,id2>] [--json] [--token <bearer-token>]",
       "",
       "Env vars:",
-      "  QUALTY_API_TOKEN  Bearer token used for auth",
+      "  QUALTY_API_TOKEN  Project .env first (same as MCP), then process env, then ~/.qualty/credentials",
       "  QUALTY_BASE_URL   API base URL when --url is not set (default: production)",
       "  QUALTY_LOCAL_CONCURRENCY  Local parallel workers for --local runs (default: 4)",
       "",
@@ -393,9 +452,7 @@ async function runSetup(args) {
 
   try {
     const currentOrgId = String(args.org || projectCfg.default_org_id || "");
-    const currentToken = String(
-      args.token || process.env.QUALTY_API_TOKEN || sharedCreds.api_token || ""
-    );
+    const currentToken = resolveToken(args);
 
     let token = "";
     if (args.token) {
@@ -542,7 +599,7 @@ function localAuthStatePath({ orgId, projectId, profile }) {
   return join(QUALTY_SHARED_CREDS_DIR, "local-contexts", orgSeg, projectSeg, `${profileSeg}.json`);
 }
 
-function authExportCiOutputPath(statePath) {
+function ciSetupAuthBundleOutputPath(statePath) {
   return statePath.replace(/\.json$/i, ".b64");
 }
 
@@ -674,6 +731,37 @@ function syncGithubCiConfig({
   return results;
 }
 
+/**
+ * Push only auth bundle secrets and auth-related repository variables (no API token or org/project).
+ */
+function syncGithubAuthProfileOnly({ repo, profile, profileNames, authShards }) {
+  const results = [];
+  const record = (kind, name, outcome) => {
+    results.push({ kind, name, ...outcome });
+  };
+
+  for (const shard of authShards || []) {
+    record("secret", shard.secretName, setGithubSecret(shard.secretName, shard.payload, { repo }));
+  }
+
+  const names = (profileNames || []).filter(Boolean);
+  if (names.length > 0) {
+    record("variable", AUTH_PROFILES_VARIABLE, setGithubVariable(AUTH_PROFILES_VARIABLE, names.join(","), { repo }));
+  }
+  if (profile) {
+    record("variable", "QUALTY_AUTH_PROFILE", setGithubVariable("QUALTY_AUTH_PROFILE", profile, { repo }));
+  }
+  if ((authShards || []).length > 1) {
+    record(
+      "variable",
+      AUTH_SHARDS_VARIABLE,
+      setGithubVariable(AUTH_SHARDS_VARIABLE, String(authShards.length), { repo })
+    );
+  }
+
+  return results;
+}
+
 function printGithubSyncResults(results, { repo }) {
   const target = repo ? ` (repo ${repo})` : "";
   const printGroup = (title, rows) => {
@@ -754,7 +842,7 @@ function configStringValue(projectCfg, key, configPath) {
   );
 }
 
-function missingExportCiField(fieldLabel, { flag, configKey, configPath, hasFlag }) {
+function missingCiSetupField(fieldLabel, { flag, configKey, configPath, hasFlag }) {
   const configHint = configPath
     ? `${PROJECT_CONFIG_FILENAME} at ${configPath} (${configKey})`
     : `${PROJECT_CONFIG_FILENAME} (not found walking up from ${process.cwd()})`;
@@ -770,7 +858,7 @@ function missingExportCiField(fieldLabel, { flag, configKey, configPath, hasFlag
   ].join(" ");
 }
 
-function resolveExportCiConfig(args, { requireProfile = true } = {}) {
+function resolveCiSetupConfig(args, { requireProfile = true } = {}) {
   const { configPath, config: projectCfg } = readProjectConfigStrict();
 
   const orgFromFlag = String(args.org || "").trim();
@@ -804,7 +892,7 @@ function resolveExportCiConfig(args, { requireProfile = true } = {}) {
 
   if (!orgId) {
     throw new Error(
-      missingExportCiField("org ID", {
+      missingCiSetupField("org ID", {
         flag: "--org",
         configKey: "default_org_id",
         configPath,
@@ -814,7 +902,7 @@ function resolveExportCiConfig(args, { requireProfile = true } = {}) {
   }
   if (!projectId) {
     throw new Error(
-      missingExportCiField("project ID", {
+      missingCiSetupField("project ID", {
         flag: "--project",
         configKey: "default_project_id",
         configPath,
@@ -827,7 +915,7 @@ function resolveExportCiConfig(args, { requireProfile = true } = {}) {
     allProfiles || profilesList.length > 0 || Boolean(suiteId) || explicitIds.length > 0;
   if (requireProfile && !profile && !hasMultiProfileMode) {
     throw new Error(
-      missingExportCiField("auth profile", {
+      missingCiSetupField("auth profile", {
         flag: "--profile",
         configKey: "default_auth_profile",
         configPath,
@@ -910,7 +998,7 @@ async function resolveRequiredProfileNamesFromTests({
   return [...names];
 }
 
-async function resolveExportProfileEntries({
+async function resolveCiSetupProfileEntries({
   orgId,
   projectId,
   profile,
@@ -1033,7 +1121,7 @@ async function runAuthRestoreCi(args) {
   const payloads = collectAuthShardPayloadsFromEnv(process.env);
   if (payloads.length === 0) {
     throw new Error(
-      `Missing ${AUTH_SECRET_PRIMARY}. Run qualty auth export-ci --set-github from your app repo.`
+      `Missing ${AUTH_SECRET_PRIMARY}. Run qualty ci setup --set-github (first time) or qualty auth export --set-github (profile refresh).`
     );
   }
 
@@ -1052,7 +1140,198 @@ async function runAuthRestoreCi(args) {
   console.log(`Restored ${restored.length} login profile(s).`);
 }
 
-async function runAuthExportCi(args) {
+async function runAuthExport(args) {
+  if (
+    parseBoolean(args["all-profiles"], false) ||
+    String(args["suite-id"] || args.suite || "").trim() ||
+    String(args.ids || "")
+      .split(",")
+      .map((part) => part.trim())
+      .filter(Boolean).length > 0
+  ) {
+    throw new Error(
+      "qualty auth export only updates login profile secrets. For full CI bootstrap use: qualty ci setup"
+    );
+  }
+
+  const profilesList = String(args.profiles || "")
+    .split(",")
+    .map((part) => part.trim())
+    .filter(Boolean);
+  const { orgId, projectId, profile, apiUrl, configPath } = resolveCiSetupConfig(args, {
+    requireProfile: profilesList.length === 0,
+  });
+  const token = resolveToken(args);
+
+  const profileEntries = await resolveCiSetupProfileEntries({
+    orgId,
+    projectId,
+    profile,
+    allProfiles: false,
+    profilesList,
+    suiteId: "",
+    explicitIds: [],
+    apiUrl,
+    token,
+  });
+  const profileNames = profileEntries.map((entry) => entry.name);
+  const primaryProfile = profile || profileNames[0] || "";
+
+  const manifest = buildAuthBundleManifest({ orgId, projectId, profileEntries });
+  const authShards = shardAuthBundleManifest(manifest);
+  const primaryShard = authShards[0];
+
+  const setGithubFlag =
+    parseBoolean(args["set-github"], false) || parseBoolean(args["set-secret"], false);
+  const noFile = parseBoolean(args["no-file"], false);
+  const outputPath = noFile
+    ? String(args.output || "").trim()
+    : String(args.output || "").trim() ||
+      ciSetupAuthBundleOutputPath(
+        localAuthStatePath({ orgId, projectId, profile: profileEntries[0].localProfileName })
+      );
+  const copyToClipboardFlag = parseBoolean(args.copy, false);
+  const githubRepo = String(args.repo || "").trim();
+
+  if (outputPath) {
+    writeFileSync(outputPath, primaryShard.payload, "utf8");
+    try {
+      chmodSync(outputPath, 0o600);
+    } catch {
+      // ignore platforms that do not support chmod
+    }
+    for (let index = 1; index < authShards.length; index += 1) {
+      const shard = authShards[index];
+      const shardPath = outputPath.replace(/(\.[^./]+)?$/, `_${index + 1}$1`);
+      writeFileSync(shardPath, shard.payload, "utf8");
+      try {
+        chmodSync(shardPath, 0o600);
+      } catch {
+        // ignore
+      }
+    }
+  }
+
+  const skipPayloadPrint = Boolean(outputPath || copyToClipboardFlag || setGithubFlag);
+  const totalSecretBytes = authShards.reduce(
+    (sum, shard) => sum + Buffer.byteLength(shard.payload, "utf8"),
+    0
+  );
+
+  // eslint-disable-next-line no-console
+  console.log("");
+  // eslint-disable-next-line no-console
+  console.log("=== Qualty → GitHub Actions (login profiles only) ===");
+  // eslint-disable-next-line no-console
+  console.log("");
+  // eslint-disable-next-line no-console
+  console.log(
+    `Auth bundle: ${profileNames.length} profile(s), ${authShards.length} secret shard(s), ${totalSecretBytes} bytes total`
+  );
+  for (const shard of authShards) {
+    // eslint-disable-next-line no-console
+    console.log(
+      `  - ${shard.secretName}: ${shard.profileNames.join(", ")} (${Buffer.byteLength(shard.payload, "utf8")} bytes)`
+    );
+  }
+  // eslint-disable-next-line no-console
+  console.log("");
+  if (outputPath) {
+    // eslint-disable-next-line no-console
+    console.log(`Wrote ${AUTH_SECRET_PRIMARY} to ${outputPath}`);
+    for (let index = 1; index < authShards.length; index += 1) {
+      const shard = authShards[index];
+      const shardPath = outputPath.replace(/(\.[^./]+)?$/, `_${index + 1}$1`);
+      // eslint-disable-next-line no-console
+      console.log(`Wrote ${shard.secretName} to ${shardPath}`);
+    }
+    // eslint-disable-next-line no-console
+    console.log("");
+  }
+  if (setGithubFlag) {
+    const syncResults = syncGithubAuthProfileOnly({
+      repo: githubRepo,
+      profile: primaryProfile,
+      profileNames,
+      authShards,
+    });
+    printGithubSyncResults(syncResults, { repo: githubRepo });
+    const failedAuth = syncResults.filter((row) => row.kind === "secret" && !row.ok);
+    if (failedAuth.length > 0 && outputPath) {
+      // eslint-disable-next-line no-console
+      console.log("  Manual auth secrets:");
+      authShards.forEach((shard, index) => {
+        const shardPath =
+          index === 0 ? outputPath : outputPath.replace(/(\.[^./]+)?$/, `_${index + 1}$1`);
+        // eslint-disable-next-line no-console
+        console.log(`    gh secret set ${shard.secretName} < ${shardPath}`);
+      });
+      // eslint-disable-next-line no-console
+      console.log("");
+    }
+  } else {
+    // eslint-disable-next-line no-console
+    console.log("GitHub secrets (login state only — does not update QUALTY_API_TOKEN or org/project):");
+    // eslint-disable-next-line no-console
+    console.log("");
+    for (const shard of authShards) {
+      // eslint-disable-next-line no-console
+      console.log("---");
+      // eslint-disable-next-line no-console
+      console.log(`Name:  ${shard.secretName}`);
+      if (skipPayloadPrint) {
+        // eslint-disable-next-line no-console
+        console.log(
+          `Value: (see file above${copyToClipboardFlag && shard.secretName === AUTH_SECRET_PRIMARY ? " or clipboard" : ""})`
+        );
+      } else {
+        // eslint-disable-next-line no-console
+        console.log("Value:");
+        // eslint-disable-next-line no-console
+        console.log(shard.payload);
+      }
+    }
+    // eslint-disable-next-line no-console
+    console.log("---");
+    // eslint-disable-next-line no-console
+    console.log("");
+    // eslint-disable-next-line no-console
+    console.log(
+      "Re-run with --set-github from this repo's git root to push via gh (after qualty ci setup for first-time CI)."
+    );
+    // eslint-disable-next-line no-console
+    console.log("");
+  }
+  if (copyToClipboardFlag) {
+    if (copyToClipboard(primaryShard.payload)) {
+      // eslint-disable-next-line no-console
+      console.log(`✓ Copied ${AUTH_SECRET_PRIMARY} to clipboard.`);
+    } else {
+      // eslint-disable-next-line no-console
+      console.log("Could not copy to clipboard on this machine.");
+    }
+    // eslint-disable-next-line no-console
+    console.log("");
+  }
+  for (const entry of profileEntries) {
+    // eslint-disable-next-line no-console
+    console.log(`Profile "${entry.name}" → ${entry.statePath}`);
+  }
+  if (configPath) {
+    // eslint-disable-next-line no-console
+    console.log(`Config: ${configPath}`);
+  }
+  // eslint-disable-next-line no-console
+  console.log("");
+  // eslint-disable-next-line no-console
+  console.log(
+    "When login expires, re-run qualty auth setup then qualty auth export --set-github (or qualty ci setup for a full refresh)."
+  );
+  // eslint-disable-next-line no-console
+  console.log("");
+}
+
+async function runCiSetup(args) {
   const {
     orgId,
     projectId,
@@ -1061,18 +1340,18 @@ async function runAuthExportCi(args) {
     configPath,
     allProfiles,
     profilesList,
-    suiteId: exportSuiteId,
+    suiteId: configSuiteId,
     explicitIds,
-  } = resolveExportCiConfig(args);
+  } = resolveCiSetupConfig(args);
   const token = resolveToken(args);
 
-  const profileEntries = await resolveExportProfileEntries({
+  const profileEntries = await resolveCiSetupProfileEntries({
     orgId,
     projectId,
     profile,
     allProfiles,
     profilesList,
-    suiteId: exportSuiteId,
+    suiteId: configSuiteId,
     explicitIds,
     apiUrl,
     token,
@@ -1090,12 +1369,12 @@ async function runAuthExportCi(args) {
   const outputPath = noFile
     ? String(args.output || "").trim()
     : String(args.output || "").trim() ||
-      authExportCiOutputPath(
+      ciSetupAuthBundleOutputPath(
         localAuthStatePath({ orgId, projectId, profile: profileEntries[0].localProfileName })
       );
   const copyToClipboardFlag = parseBoolean(args.copy, false);
   const githubRepo = String(args.repo || "").trim();
-  const suiteId = String(args["suite-id"] || args.suite || exportSuiteId || "").trim();
+  const suiteId = String(args["suite-id"] || args.suite || configSuiteId || "").trim();
   const cliRepo = String(args["cli-repo"] || "").trim();
   const cliRef = String(args["cli-ref"] || "").trim();
 
@@ -1202,10 +1481,10 @@ async function runAuthExportCi(args) {
     console.log(
       "1. GitHub Actions config was pushed via gh (secrets + repository variables — see sync above). Fix any ✗ manually."
     );
-    if (!suiteId && !exportSuiteId && explicitIds.length === 0) {
+    if (!suiteId && !configSuiteId && explicitIds.length === 0) {
       // eslint-disable-next-line no-console
       console.log(
-        "   Tip: pass --suite-id or --ids to export only login profiles required by those tests."
+        "   Tip: pass --suite-id or --ids to bundle only login profiles required by those tests."
       );
     }
     if (authShards.length > 1) {
@@ -1359,7 +1638,9 @@ async function runAuthExportCi(args) {
   // eslint-disable-next-line no-console
   console.log("");
   // eslint-disable-next-line no-console
-  console.log("When login expires, re-run qualty auth setup and qualty auth export-ci to refresh secrets.");
+  console.log(
+    "When login expires, re-run qualty auth setup and qualty auth export --set-github (or qualty ci setup --set-github for a full refresh)."
+  );
   // eslint-disable-next-line no-console
   console.log("");
 }
@@ -2472,8 +2753,8 @@ async function runAuthSetup(args) {
     console.log("");
     // eslint-disable-next-line no-console
     console.log(
-      `[qualty][auth] For GitHub Actions secrets, run:\n` +
-        `  qualty auth export-ci --project ${project.id} --profile "${profile}"`
+      `[qualty][auth] Push this profile to GitHub Actions:\n` +
+        `  qualty auth export --project ${project.id} --profile "${profile}" --set-github`
     );
   } finally {
     rl.close();
@@ -2495,21 +2776,29 @@ async function main() {
     await runSetup(args);
     return;
   }
+  if (command === "ci") {
+    const sub = args._[1];
+    if (sub === "setup") {
+      await runCiSetup(args);
+      return;
+    }
+    throw new Error("Unknown ci subcommand. Use: qualty ci setup");
+  }
   if (command === "auth") {
     const sub = args._[1];
     if (sub === "setup") {
       await runAuthSetup(args);
       return;
     }
-    if (sub === "export-ci") {
-      await runAuthExportCi(args);
+    if (sub === "export") {
+      await runAuthExport(args);
       return;
     }
     if (sub === "restore-ci") {
       await runAuthRestoreCi(args);
       return;
     }
-    throw new Error("Unknown auth subcommand. Use: qualty auth setup | qualty auth export-ci | qualty auth restore-ci");
+    throw new Error("Unknown auth subcommand. Use: qualty auth setup | qualty auth export | qualty auth restore-ci");
   }
   if (command === "run") {
     if (parseBoolean(args.local, false)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qualty",
-  "version": "0.1.25",
+  "version": "0.1.27",
   "description": "Qualty CLI for localhost and CI test runs",
   "bin": {
     "qualty": "bin/qualty.js"