timeback 0.2.2-beta.20260401223329 → 0.2.2-beta.20260402000431

package/dist/cli.js

@@ -35125,8 +35125,13 @@ var CredentialsSchema = exports_external.object({
   clientSecret: NonEmptyString2,
   email: exports_external.email("Valid email is required").optional()
 });
-var ClientIdSchema = exports_external.string().min(1, "Client ID is required").regex(/^[a-z0-9]+$/, "Client ID must contain only lowercase letters and numbers");
-var ClientSecretSchema = exports_external.string().min(1, "Client secret is required").regex(/^[a-z0-9]+$/, "Client secret must contain only lowercase letters and numbers").max(53, "Client secret must be less than 53 characters");
+var StoredCredentialsSchema = exports_external.object({
+  clientId: NonEmptyString2.optional(),
+  clientSecret: NonEmptyString2.optional(),
+  email: exports_external.email("Valid email is required").optional()
+}).refine((value) => value.email || value.clientId && value.clientSecret, "Saved credentials must include an email or a client ID/client secret pair").refine((value) => Boolean(value.clientId) === Boolean(value.clientSecret), "Saved credentials must include both client ID and client secret");
+var ClientIdSchema = exports_external.string().min(1, "Client ID is required").max(128, "Client ID must be at most 128 characters").regex(/^[\w+]+$/, "Client ID must contain only letters, digits, underscores, or +");
+var ClientSecretSchema = exports_external.string().min(24, "Client secret must be at least 24 characters").max(64, "Client secret must be at most 64 characters").regex(/^[\w+]+$/, "Client secret must contain only letters, digits, underscores, or +");
 var MasteryTrackCredentialsSchema = exports_external.object({
   apiKey: NonEmptyString2,
   email: exports_external.email("Valid email is required")
@@ -36358,24 +36363,41 @@ async function writeCredentialsStore(store) {
   await writeFile(CREDENTIALS_FILE, JSON.stringify(cleaned, null, 2), { mode: 384 });
   return true;
 }
-async function getSavedCredentials(environment) {
-  const store = await readCredentialsStore();
+function getStoredCredentialsFromStore(store, environment) {
   const namespaced = store.timeback?.[environment];
   if (namespaced) {
-    const result = CredentialsSchema.safeParse(namespaced);
+    const result = StoredCredentialsSchema.safeParse(namespaced);
     if (result.success) {
       return result.data;
     }
   }
   const legacy = store[environment];
   if (legacy) {
-    const result = CredentialsSchema.safeParse(legacy);
+    const result = StoredCredentialsSchema.safeParse(legacy);
     if (result.success) {
       return result.data;
     }
   }
   return null;
 }
+async function getStoredCredentials(environment) {
+  const store = await readCredentialsStore();
+  return getStoredCredentialsFromStore(store, environment);
+}
+function toCredentials(stored) {
+  if (stored?.clientId && stored.clientSecret) {
+    return {
+      clientId: stored.clientId,
+      clientSecret: stored.clientSecret,
+      email: stored.email
+    };
+  }
+  return null;
+}
+async function getSavedCredentials(environment) {
+  const stored = await getStoredCredentials(environment);
+  return toCredentials(stored);
+}
 async function saveCredentials(environment, credentials) {
   const store = await readCredentialsStore();
   store.timeback = store.timeback ?? {};
@@ -36383,6 +36405,44 @@ async function saveCredentials(environment, credentials) {
   delete store[environment];
   return writeCredentialsStore(store);
 }
+async function saveCredentialEmail(environment, email3) {
+  const store = await readCredentialsStore();
+  const existing = getStoredCredentialsFromStore(store, environment);
+  if (email3) {
+    store.timeback = store.timeback ?? {};
+    store.timeback[environment] = {
+      ...existing ?? {},
+      email: email3
+    };
+  } else if (existing?.clientId && existing.clientSecret) {
+    store.timeback = store.timeback ?? {};
+    store.timeback[environment] = {
+      clientId: existing.clientId,
+      clientSecret: existing.clientSecret
+    };
+  } else {
+    delete store.timeback?.[environment];
+    if (store.timeback && Object.keys(store.timeback).length === 0) {
+      delete store.timeback;
+    }
+  }
+  delete store[environment];
+  return writeCredentialsStore(store);
+}
+async function getStoredCredentialEmail(environment) {
+  const stored = await getStoredCredentials(environment);
+  return stored?.email;
+}
+async function getEnvironmentsWithStoredEmail() {
+  const store = await readCredentialsStore();
+  const environments = [];
+  for (const env2 of ENVIRONMENTS) {
+    if (getStoredCredentialsFromStore(store, env2)?.email) {
+      environments.push(env2);
+    }
+  }
+  return environments;
+}
 async function clearCredentials(environment) {
   const store = await readCredentialsStore();
   if (environment) {
@@ -36403,18 +36463,23 @@ async function getConfiguredEnvironments() {
   const store = await readCredentialsStore();
   const configured = [];
   for (const env2 of ENVIRONMENTS) {
-    const namespaced = store.timeback?.[env2];
-    if (namespaced && CredentialsSchema.safeParse(namespaced).success) {
-      configured.push(env2);
-      continue;
-    }
-    const legacy = store[env2];
-    if (legacy && CredentialsSchema.safeParse(legacy).success) {
+    if (toCredentials(getStoredCredentialsFromStore(store, env2))) {
       configured.push(env2);
     }
   }
   return configured;
 }
+async function getAvailableEnvironments() {
+  const available = await getConfiguredEnvironments();
+  if (getEnvCredentials()) {
+    for (const env2 of ENVIRONMENTS) {
+      if (!available.includes(env2)) {
+        available.push(env2);
+      }
+    }
+  }
+  return available;
+}
 function getEnvCredentials() {
   const clientId = process.env.TIMEBACK_API_CLIENT_ID ?? process.env.TIMEBACK_CLIENT_ID;
   const clientSecret = process.env.TIMEBACK_API_CLIENT_SECRET ?? process.env.TIMEBACK_CLIENT_SECRET;
@@ -36428,10 +36493,12 @@ function getEnvCredentials() {
 }
 async function loadCredentials(environment) {
   const envCreds = getEnvCredentials();
+  const storedCreds = await getStoredCredentials(environment);
   if (envCreds) {
-    return { success: true, credentials: envCreds, source: "env" };
+    const merged = storedCreds?.email ? { ...envCreds, email: storedCreds.email } : envCreds;
+    return { success: true, credentials: merged, source: "env" };
   }
-  const savedCreds = await getSavedCredentials(environment);
+  const savedCreds = toCredentials(storedCreds);
   if (savedCreds) {
     return { success: true, credentials: savedCreds, source: "saved" };
   }
@@ -39316,7 +39383,7 @@ You need to configure your Timeback API credentials first.`, "Credentials Setup"
 }
 async function runImportFlow(opts = {}) {
   const { format: format2 = true } = opts;
-  let configuredEnvs = await getConfiguredEnvironments();
+  let configuredEnvs = await getAvailableEnvironments();
   if (configuredEnvs.length === 0) {
     const setupResult = await setupCredentials();
     if (setupResult === "cancelled") {
@@ -39325,7 +39392,7 @@ async function runImportFlow(opts = {}) {
     if (setupResult === "error") {
       return { success: false, error: "Credential validation failed" };
     }
-    configuredEnvs = await getConfiguredEnvironments();
+    configuredEnvs = await getAvailableEnvironments();
     if (configuredEnvs.length === 0) {
       return { success: false, error: "Failed to configure credentials" };
     }
@@ -47245,11 +47312,15 @@ function exitCancelled(isOverwriting, exitOnComplete) {
 // src/commands/credentials/email.ts
 async function updateEmail(options = {}) {
   const { exitOnComplete = true, env: envOption } = options;
-  const configuredEnvs = [];
-  for (const env2 of ENVIRONMENTS) {
-    const creds = await getSavedCredentials(env2);
-    if (creds)
-      configuredEnvs.push(env2);
+  const emailEnvs = await getEnvironmentsWithStoredEmail();
+  const requestedEnv = envOption && ENVIRONMENTS.includes(envOption) ? envOption : undefined;
+  let configuredEnvs;
+  if (requestedEnv) {
+    const hasStoredEmail = await getStoredCredentialEmail(requestedEnv);
+    const hasUsableCredentials = (await loadCredentials(requestedEnv)).success;
+    configuredEnvs = hasStoredEmail || hasUsableCredentials ? [requestedEnv] : [];
+  } else {
+    configuredEnvs = [...new Set([...await getAvailableEnvironments(), ...emailEnvs])];
   }
   if (configuredEnvs.length === 0) {
     M2.warn("No credentials configured");
@@ -47279,15 +47350,8 @@ async function updateEmail(options = {}) {
     }
     targetEnv = selected;
   }
-  const currentCreds = await getSavedCredentials(targetEnv);
-  if (!currentCreds) {
-    M2.error("Credentials not found");
-    outro.error("Credentials not found");
-    if (exitOnComplete)
-      process.exit(0);
-    return false;
-  }
-  const currentEmail = currentCreds.email;
+  const currentCredsResult = await loadCredentials(targetEnv);
+  const currentEmail = currentCredsResult.success ? currentCredsResult.credentials.email : await getStoredCredentialEmail(targetEnv);
   const message = currentEmail ? `Email ${dim(`(current: ${currentEmail})`)}` : `Email ${dim("(not set)")}`;
   const email3 = await he({
     message,
@@ -47316,6 +47380,14 @@ async function updateEmail(options = {}) {
     return true;
   }
   if (normalizedEmail) {
+    if (!currentCredsResult.success) {
+      M2.error("Credentials required to set email");
+      outro.error("Credentials required to set email");
+      if (exitOnComplete)
+        process.exit(0);
+      return false;
+    }
+    const currentCreds = currentCredsResult.credentials;
     const s = Y2();
     s.start("Validating email...");
     const result = await validateEmailWithTimeback(targetEnv, currentCreds.clientId, currentCreds.clientSecret, normalizedEmail);
@@ -47336,10 +47408,7 @@ async function updateEmail(options = {}) {
         email: normalizedEmail
       });
       if (accountCreated) {
-        await saveCredentials(targetEnv, {
-          ...currentCreds,
-          email: normalizedEmail
-        });
+        await saveCredentialEmail(targetEnv, normalizedEmail);
         M2.success(`Email saved for ${targetEnv}`);
         outro.success();
       } else {
@@ -47349,20 +47418,14 @@ async function updateEmail(options = {}) {
         process.exit(0);
       return accountCreated;
     }
-    await saveCredentials(targetEnv, {
-      ...currentCreds,
-      email: normalizedEmail
-    });
+    await saveCredentialEmail(targetEnv, normalizedEmail);
     s.stop(green(`Email updated for ${targetEnv}`));
     outro.success();
     if (exitOnComplete)
       process.exit(0);
     return true;
   }
-  await saveCredentials(targetEnv, {
-    ...currentCreds,
-    email: undefined
-  });
+  await saveCredentialEmail(targetEnv, undefined);
   outro.success(`Email cleared for ${targetEnv}`);
   if (exitOnComplete)
     process.exit(0);
@@ -47380,13 +47443,19 @@ async function listCredentials(options = {}) {
   const { exitOnComplete = true } = options;
   const timebackLines = [];
   const masteryTrackLines = [];
+  const envCreds = getEnvCredentials();
   let hasAnyTimeback = false;
   let hasAnyMasteryTrack = false;
+  let hasSavedTimeback = false;
+  const hasEnvTimeback = Boolean(envCreds);
   for (const env2 of ENVIRONMENTS) {
     const creds = await getSavedCredentials(env2);
-    if (creds) {
+    if (creds && hasEnvTimeback) {
+      timebackLines.push(`${dim("●")} ${env2}: ${creds.clientId}`);
+      hasSavedTimeback = true;
+    } else if (creds) {
       timebackLines.push(`${green("●")} ${env2}: ${creds.clientId}`);
-      hasAnyTimeback = true;
+      hasSavedTimeback = true;
     } else {
       timebackLines.push(`${dim("○")} ${env2}: not configured`);
     }
@@ -47398,12 +47467,26 @@ async function listCredentials(options = {}) {
       masteryTrackLines.push(`${dim("○")} ${env2}: not configured`);
     }
   }
+  hasAnyTimeback = hasSavedTimeback || hasEnvTimeback;
+  if (envCreds) {
+    timebackLines.push(`${green("●")} env: ${envCreds.clientId} ${yellow("[override]")}`);
+  }
   Me(timebackLines.join(`
 `), "Timeback");
   Me(masteryTrackLines.join(`
 `), "MasteryTrack");
   if (hasAnyTimeback || hasAnyMasteryTrack) {
-    outro.info(`Credentials stored in ${blueBright(underline(tildify(getCredentialsPath())))}`);
+    const details = [];
+    if (hasSavedTimeback || hasAnyMasteryTrack) {
+      details.push(`Credentials stored in ${blueBright(underline(tildify(getCredentialsPath())))}`);
+    }
+    if (hasEnvTimeback) {
+      details.push("Timeback env credentials are active");
+    }
+    if (details.length > 0) {
+      outro.info(details.join(`
+`));
+    }
   } else {
     const shouldAdd = await ye({
       message: "No credentials configured. Add now?"
@@ -47445,7 +47528,7 @@ async function removeCredentials(options = {}) {
       configuredEnvs.push(env2);
   }
   if (configuredEnvs.length === 0) {
-    M2.warn(provider === "masterytrack" ? "No MasteryTrack credentials configured" : "No credentials configured");
+    M2.warn(provider === "masterytrack" ? "No saved MasteryTrack credentials configured" : "No saved credentials configured");
     if (exitOnComplete)
       process.exit(0);
     return;
@@ -48264,7 +48347,7 @@ You need to configure your Timeback API credentials first.`, "Credentials Setup"
   return "ok";
 }
 async function ensureConfiguredEnvironments(targetEnv) {
-  let configuredEnvs = await getConfiguredEnvironments();
+  let configuredEnvs = await getAvailableEnvironments();
   const needsSetup = targetEnv ? !configuredEnvs.includes(targetEnv) : configuredEnvs.length === 0;
   if (needsSetup) {
     const setupResult = await setupCredentials2(targetEnv);
@@ -48274,7 +48357,7 @@ async function ensureConfiguredEnvironments(targetEnv) {
     if (setupResult === "error") {
       return { status: "error" };
     }
-    configuredEnvs = await getConfiguredEnvironments();
+    configuredEnvs = await getAvailableEnvironments();
     const stillMissing = targetEnv ? !configuredEnvs.includes(targetEnv) : configuredEnvs.length === 0;
     if (stillMissing) {
       return { status: "error" };
@@ -52619,8 +52702,8 @@ async function installAndDisplay(options) {
 
 // src/commands/init/lib/postInit.ts
 async function ensureSyncEmail(targetEnv) {
-  const creds = await getSavedCredentials(targetEnv);
-  if (creds && !creds.email) {
+  const result = await loadCredentials(targetEnv);
+  if (result.success && !result.credentials.email) {
     return await updateEmail({ exitOnComplete: false, env: targetEnv });
   }
   return true;
@@ -78345,8 +78428,13 @@ var CredentialsSchema2 = exports_external2.object({
   clientSecret: NonEmptyString4,
   email: exports_external2.email("Valid email is required").optional()
 });
-var ClientIdSchema2 = exports_external2.string().min(1, "Client ID is required").regex(/^[a-z0-9]+$/, "Client ID must contain only lowercase letters and numbers");
-var ClientSecretSchema2 = exports_external2.string().min(1, "Client secret is required").regex(/^[a-z0-9]+$/, "Client secret must contain only lowercase letters and numbers").max(53, "Client secret must be less than 53 characters");
+var StoredCredentialsSchema2 = exports_external2.object({
+  clientId: NonEmptyString4.optional(),
+  clientSecret: NonEmptyString4.optional(),
+  email: exports_external2.email("Valid email is required").optional()
+}).refine((value) => value.email || value.clientId && value.clientSecret, "Saved credentials must include an email or a client ID/client secret pair").refine((value) => Boolean(value.clientId) === Boolean(value.clientSecret), "Saved credentials must include both client ID and client secret");
+var ClientIdSchema2 = exports_external2.string().min(1, "Client ID is required").max(128, "Client ID must be at most 128 characters").regex(/^[\w+]+$/, "Client ID must contain only letters, digits, underscores, or +");
+var ClientSecretSchema2 = exports_external2.string().min(24, "Client secret must be at least 24 characters").max(64, "Client secret must be at most 64 characters").regex(/^[\w+]+$/, "Client secret must contain only letters, digits, underscores, or +");
 var MasteryTrackCredentialsSchema2 = exports_external2.object({
   apiKey: NonEmptyString4,
   email: exports_external2.email("Valid email is required")
@@ -78667,24 +78755,41 @@ async function writeCredentialsStore2(store) {
   await writeFile3(CREDENTIALS_FILE2, JSON.stringify(cleaned, null, 2), { mode: 384 });
   return true;
 }
-async function getSavedCredentials2(environment) {
-  const store = await readCredentialsStore2();
+function getStoredCredentialsFromStore2(store, environment) {
   const namespaced = store.timeback?.[environment];
   if (namespaced) {
-    const result = CredentialsSchema2.safeParse(namespaced);
+    const result = StoredCredentialsSchema2.safeParse(namespaced);
     if (result.success) {
       return result.data;
     }
   }
   const legacy = store[environment];
   if (legacy) {
-    const result = CredentialsSchema2.safeParse(legacy);
+    const result = StoredCredentialsSchema2.safeParse(legacy);
     if (result.success) {
       return result.data;
     }
   }
   return null;
 }
+async function getStoredCredentials2(environment) {
+  const store = await readCredentialsStore2();
+  return getStoredCredentialsFromStore2(store, environment);
+}
+function toCredentials2(stored) {
+  if (stored?.clientId && stored.clientSecret) {
+    return {
+      clientId: stored.clientId,
+      clientSecret: stored.clientSecret,
+      email: stored.email
+    };
+  }
+  return null;
+}
+async function getSavedCredentials2(environment) {
+  const stored = await getStoredCredentials2(environment);
+  return toCredentials2(stored);
+}
 async function saveCredentials2(environment, credentials) {
   const store = await readCredentialsStore2();
   store.timeback = store.timeback ?? {};
@@ -78692,6 +78797,44 @@ async function saveCredentials2(environment, credentials) {
   delete store[environment];
   return writeCredentialsStore2(store);
 }
+async function saveCredentialEmail2(environment, email32) {
+  const store = await readCredentialsStore2();
+  const existing = getStoredCredentialsFromStore2(store, environment);
+  if (email32) {
+    store.timeback = store.timeback ?? {};
+    store.timeback[environment] = {
+      ...existing ?? {},
+      email: email32
+    };
+  } else if (existing?.clientId && existing.clientSecret) {
+    store.timeback = store.timeback ?? {};
+    store.timeback[environment] = {
+      clientId: existing.clientId,
+      clientSecret: existing.clientSecret
+    };
+  } else {
+    delete store.timeback?.[environment];
+    if (store.timeback && Object.keys(store.timeback).length === 0) {
+      delete store.timeback;
+    }
+  }
+  delete store[environment];
+  return writeCredentialsStore2(store);
+}
+async function getStoredCredentialEmail2(environment) {
+  const stored = await getStoredCredentials2(environment);
+  return stored?.email;
+}
+async function getEnvironmentsWithStoredEmail2() {
+  const store = await readCredentialsStore2();
+  const environments = [];
+  for (const env22 of ENVIRONMENTS2) {
+    if (getStoredCredentialsFromStore2(store, env22)?.email) {
+      environments.push(env22);
+    }
+  }
+  return environments;
+}
 async function clearCredentials2(environment) {
   const store = await readCredentialsStore2();
   if (environment) {
@@ -78712,18 +78855,23 @@ async function getConfiguredEnvironments2() {
   const store = await readCredentialsStore2();
   const configured = [];
   for (const env22 of ENVIRONMENTS2) {
-    const namespaced = store.timeback?.[env22];
-    if (namespaced && CredentialsSchema2.safeParse(namespaced).success) {
-      configured.push(env22);
-      continue;
-    }
-    const legacy = store[env22];
-    if (legacy && CredentialsSchema2.safeParse(legacy).success) {
+    if (toCredentials2(getStoredCredentialsFromStore2(store, env22))) {
       configured.push(env22);
     }
   }
   return configured;
 }
+async function getAvailableEnvironments2() {
+  const available = await getConfiguredEnvironments2();
+  if (getEnvCredentials2()) {
+    for (const env22 of ENVIRONMENTS2) {
+      if (!available.includes(env22)) {
+        available.push(env22);
+      }
+    }
+  }
+  return available;
+}
 function getEnvCredentials2() {
   const clientId = process.env.TIMEBACK_API_CLIENT_ID ?? process.env.TIMEBACK_CLIENT_ID;
   const clientSecret = process.env.TIMEBACK_API_CLIENT_SECRET ?? process.env.TIMEBACK_CLIENT_SECRET;
@@ -78737,10 +78885,12 @@ function getEnvCredentials2() {
 }
 async function loadCredentials2(environment) {
   const envCreds = getEnvCredentials2();
+  const storedCreds = await getStoredCredentials2(environment);
   if (envCreds) {
-    return { success: true, credentials: envCreds, source: "env" };
+    const merged = storedCreds?.email ? { ...envCreds, email: storedCreds.email } : envCreds;
+    return { success: true, credentials: merged, source: "env" };
   }
-  const savedCreds = await getSavedCredentials2(environment);
+  const savedCreds = toCredentials2(storedCreds);
   if (savedCreds) {
     return { success: true, credentials: savedCreds, source: "saved" };
   }
@@ -78750,7 +78900,7 @@ async function loadCredentials2(environment) {
   };
 }
 async function loadAllCredentials2() {
-  const configuredEnvs = await getConfiguredEnvironments2();
+  const configuredEnvs = await getAvailableEnvironments2();
   const credentials = {};
   for (const env22 of configuredEnvs) {
     const result = await loadCredentials2(env22);
@@ -80264,21 +80414,40 @@ async function addCredentials2(options = {}) {
 async function listCredentials2(options = {}) {
   const { exitOnComplete = true, inline = false } = options;
   const lines = [];
+  const envCreds = getEnvCredentials2();
   let hasAny = false;
+  let hasSaved = false;
+  const hasEnv = Boolean(envCreds);
   for (const env22 of ENVIRONMENTS2) {
     const creds = await getSavedCredentials2(env22);
-    if (creds) {
+    if (creds && hasEnv) {
+      lines.push(`${dim2("●")} ${env22}: ${creds.clientId}`);
+      hasSaved = true;
+    } else if (creds) {
       lines.push(`${green2("●")} ${env22}: ${creds.clientId}`);
-      hasAny = true;
+      hasSaved = true;
     } else {
-      lines.push(`${dim2("○")} ${env22}: ${"not configured"}`);
+      lines.push(`${dim2("○")} ${env22}: not configured`);
     }
   }
+  hasAny = hasSaved || hasEnv;
+  if (envCreds) {
+    lines.push(`${green2("●")} env: ${envCreds.clientId} ${yellow2("[override]")}`);
+  }
   Me2(lines.join(`
 `), "Configured environments");
   if (hasAny) {
-    if (!inline)
-      outro2.info(`Credentials stored in ${blueBright2(underline2(getCredentialsPath2()))}`);
+    const details = [];
+    if (hasSaved) {
+      details.push(`Credentials stored in ${blueBright2(underline2(getCredentialsPath2()))}`);
+    }
+    if (hasEnv) {
+      details.push("Timeback env credentials are active");
+    }
+    if (details.length > 0 && !inline) {
+      outro2.info(details.join(`
+`));
+    }
   } else {
     const shouldAdd = await ye2({
       message: "No credentials configured. Add now?"
@@ -80295,12 +80464,12 @@ async function listCredentials2(options = {}) {
 }
 async function updateEmail2(options = {}) {
   const { exitOnComplete = true, inline = false } = options;
-  const configuredEnvs = [];
-  for (const env22 of ENVIRONMENTS2) {
-    const creds = await getSavedCredentials2(env22);
-    if (creds)
-      configuredEnvs.push(env22);
-  }
+  const configuredEnvs = [
+    ...new Set([
+      ...await getAvailableEnvironments2(),
+      ...await getEnvironmentsWithStoredEmail2()
+    ])
+  ];
   if (configuredEnvs.length === 0) {
     M22.warn("No credentials configured");
     if (!inline)
@@ -80329,16 +80498,8 @@ async function updateEmail2(options = {}) {
     }
     targetEnv = selected;
   }
-  const currentCreds = await getSavedCredentials2(targetEnv);
-  if (!currentCreds) {
-    M22.error("Credentials not found");
-    if (!inline)
-      outro2.error("Credentials not found");
-    if (exitOnComplete)
-      process.exit(0);
-    return;
-  }
-  const currentEmail = currentCreds.email;
+  const currentCredsResult = await loadCredentials2(targetEnv);
+  const currentEmail = currentCredsResult.success ? currentCredsResult.credentials.email : await getStoredCredentialEmail2(targetEnv);
   const message = currentEmail ? `Email ${dim2(`(current: ${currentEmail})`)}` : `Email ${dim2("(not set)")}`;
   const email32 = await he2({
     message,
@@ -80361,7 +80522,23 @@ async function updateEmail2(options = {}) {
   }
   const normalized = email32 ? normalizeEmail2(email32) : undefined;
   const emailUnchanged = (normalized ?? "") === (currentEmail ?? "");
+  if (emailUnchanged) {
+    if (!inline)
+      outro2.info("Email unchanged");
+    if (exitOnComplete)
+      process.exit(0);
+    return;
+  }
   if (normalized) {
+    if (!currentCredsResult.success) {
+      M22.error("Credentials required to set email");
+      if (!inline)
+        outro2.error("Credentials required to set email");
+      if (exitOnComplete)
+        process.exit(0);
+      return;
+    }
+    const currentCreds = currentCredsResult.credentials;
     const s = Y22();
     s.start("Checking account...");
     const result = await validateEmailWithTimeback2(targetEnv, currentCreds.clientId, currentCreds.clientSecret, normalized);
@@ -80382,11 +80559,8 @@ async function updateEmail2(options = {}) {
         clientSecret: currentCreds.clientSecret,
         email: normalized
       });
-      if (accountCreated && !emailUnchanged) {
-        await saveCredentials2(targetEnv, {
-          ...currentCreds,
-          email: normalized
-        });
+      if (accountCreated) {
+        await saveCredentialEmail2(targetEnv, normalized);
         M22.success(`Email saved for ${targetEnv}`);
       }
       if (!inline) {
@@ -80401,17 +80575,7 @@ async function updateEmail2(options = {}) {
       return;
     }
     s.stop(green2("Account verified"));
-    if (emailUnchanged) {
-      if (!inline)
-        outro2.info("Email unchanged");
-      if (exitOnComplete)
-        process.exit(0);
-      return;
-    }
-    await saveCredentials2(targetEnv, {
-      ...currentCreds,
-      email: normalized
-    });
+    await saveCredentialEmail2(targetEnv, normalized);
     M22.success(`Email updated for ${targetEnv}`);
     if (!inline)
       outro2.success();
@@ -80419,10 +80583,7 @@ async function updateEmail2(options = {}) {
       process.exit(0);
     return;
   }
-  await saveCredentials2(targetEnv, {
-    ...currentCreds,
-    email: undefined
-  });
+  await saveCredentialEmail2(targetEnv, undefined);
   if (!inline)
     outro2.success(`Email cleared for ${targetEnv}`);
   if (exitOnComplete)
@@ -80437,7 +80598,7 @@ async function removeCredentials2(options = {}) {
       configuredEnvs.push(env22);
   }
   if (configuredEnvs.length === 0) {
-    M22.warn("No credentials configured");
+    M22.warn("No saved credentials configured");
     if (exitOnComplete)
       process.exit(0);
     return;
@@ -80643,7 +80804,7 @@ async function promptNoConfig(credentials, configuredEnvs, opts = {}) {
 }
 async function resolveConfigSource(courseIds, opts, defaultEnvironment) {
   const parserOpts = { playcademy: opts.playcademy };
-  let configuredEnvs = await getConfiguredEnvironments2();
+  let configuredEnvs = await getAvailableEnvironments2();
   let credentials = {};
   if (courseIds.length > 0) {
     if (configuredEnvs.length > 0) {
@@ -82973,8 +83134,8 @@ var cors = (options) => {
 async function handleBootstrap(c, ctx) {
   const { bootstrap } = c.get("services");
   const env22 = c.get("env");
-  const freshCredentials = await getSavedCredentials2(env22);
-  const email32 = freshCredentials?.email;
+  const freshCredentials = await loadCredentials2(env22);
+  const email32 = freshCredentials.success ? freshCredentials.credentials.email : undefined;
   const courseIds = ctx.userConfig.courseIds[env22];
   const result = await bootstrap.getBootstrap({ email: email32, courseIds });
   return c.json(result);
@@ -84003,18 +84164,18 @@ class StatusService {
     this.ctx = ctx;
   }
   async getStatus() {
-    const configuredEnvironments = await getConfiguredEnvironments2();
+    const configuredEnvironments = await getAvailableEnvironments2();
     const [stagingCreds, productionCreds] = await Promise.all([
-      getSavedCredentials2("staging"),
-      getSavedCredentials2("production")
+      loadCredentials2("staging"),
+      loadCredentials2("production")
     ]);
-    const defaultCreds = this.ctx.defaultEnvironment === "staging" ? stagingCreds : this.ctx.defaultEnvironment === "production" ? productionCreds : null;
-    const clientId = defaultCreds?.clientId ?? stagingCreds?.clientId ?? productionCreds?.clientId ?? this.ctx.credentials.staging?.clientId ?? this.ctx.credentials.production?.clientId;
+    const defaultCreds = this.ctx.defaultEnvironment === "staging" ? stagingCreds.success ? stagingCreds.credentials : null : this.ctx.defaultEnvironment === "production" ? productionCreds.success ? productionCreds.credentials : null : null;
+    const clientId = defaultCreds?.clientId ?? (stagingCreds.success ? stagingCreds.credentials.clientId : undefined) ?? (productionCreds.success ? productionCreds.credentials.clientId : undefined) ?? this.ctx.credentials.staging?.clientId ?? this.ctx.credentials.production?.clientId;
     return {
       config: this.ctx.userConfig,
       environment: this.ctx.defaultEnvironment,
       configuredEnvironments,
-      hasEmail: !!stagingCreds?.email || !!productionCreds?.email,
+      hasEmail: stagingCreds.success && Boolean(stagingCreds.credentials.email) || productionCreds.success && Boolean(productionCreds.credentials.email),
       clientId,
       sensors: this.ctx.derivedSensors
     };
@@ -84664,7 +84825,7 @@ async function launchServer(serverConfig, userConfig, credentials, env22, opts,
 }
 async function handleCourseIdsCase(courseIds, opts, serverConfig) {
   const env22 = opts.env ?? await promptEnvironmentForCourseIds(courseIds.length);
-  let configuredEnvs = await getConfiguredEnvironments2();
+  let configuredEnvs = await getAvailableEnvironments2();
   let credentials = configuredEnvs.length > 0 ? await loadAllCredentials2() : {};
   const resolvedResult = await resolveConfigSource(courseIds, opts, env22);
   if (!resolvedResult) {
@@ -84716,7 +84877,7 @@ async function handleConfigFileCase(userConfig, configPath, opts, serverConfig)
   await launchServer(serverConfig, userConfig, credentials, env22, opts, configPath);
 }
 async function handleImportFlowCase(opts, serverConfig) {
-  let configuredEnvs = await getConfiguredEnvironments2();
+  let configuredEnvs = await getAvailableEnvironments2();
   let credentials = {};
   let selectedEnv;
   if (configuredEnvs.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "timeback",
-	"version": "0.2.2-beta.20260401223329",
+	"version": "0.2.2-beta.20260402000431",
 	"type": "module",
 	"bin": {
 		"timeback": "./dist/cli.js"