@secretstash/cli 0.1.8 → 0.1.9

package/dist/index.js

@@ -314,7 +314,9 @@ var ApiClient = class {
         body: JSON.stringify({ refreshToken })
       });
       if (!response.ok) {
-        configManager.logout();
+        if (response.status === 401 || response.status === 403) {
+          configManager.logout();
+        }
         return false;
       }
       const json = await response.json();
@@ -322,11 +324,10 @@ var ApiClient = class {
       configManager.setTokens(
         tokens.accessToken,
         tokens.refreshToken,
-        tokens.expiresIn || 900
+        tokens.expiresIn || 3600
       );
       return true;
     } catch {
-      configManager.logout();
       return false;
     }
   }
@@ -891,9 +892,21 @@ async function handleBrowserLogin() {
       configManager.setUser(user.id, user.email);
       ui.br();
       ui.keyValue("Email", user.email);
-      ui.keyValue("Config", configManager.getConfigPath());
-      ui.br();
-      ui.info(`Run ${ui.code("sstash teams")} to see your teams`);
+      const hasTeam = configManager.getCurrentTeam();
+      const hasProject = configManager.getCurrentProject();
+      if (hasTeam && hasProject) {
+        ui.br();
+        ui.subheading("Current Context");
+        ui.keyValue("Team", hasTeam.name);
+        ui.keyValue("Project", hasProject.name);
+        const env = configManager.getCurrentEnvironment();
+        if (env) ui.keyValue("Environment", ui.envBadge(env));
+      } else {
+        ui.br();
+        ui.box("Get Started", [
+          `Run ${colors.highlight("stash init")} to set up a project in this directory`
+        ]);
+      }
       return;
     }
     if (status === "expired") {
@@ -949,7 +962,7 @@ async function handleServiceTokenLogin(token, fromEnvVar = false) {
     `  ${colors.highlight("export SECRETSTASH_TOKEN=" + token.substring(0, 16) + "...")}`,
     "",
     `  ${colors.muted("# Then run CLI commands normally")}`,
-    `  ${colors.highlight("sstash pull -q")}`
+    `  ${colors.highlight("stash pull -q")}`
   ]);
 }
 function registerAuthCommands(program2) {
@@ -986,7 +999,7 @@ function registerAuthCommands(program2) {
   });
   program2.command("whoami").description("Display current user information").action(async () => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     if (configManager.isServiceTokenAuth()) {
@@ -1032,7 +1045,7 @@ function registerAuthCommands(program2) {
   });
   program2.command("2fa").description("Manage two-factor authentication").command("setup").description("Set up two-factor authentication").action(async () => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const spinner = ui.spinner("Setting up 2FA...");
@@ -1130,8 +1143,10 @@ function registerAuthCommands(program2) {
     ui.br();
     ui.keyValue("Email", email);
     ui.br();
-    ui.info("We recommend setting up 2FA for added security");
-    ui.info(`Run ${ui.code("sstash 2fa setup")} to enable two-factor authentication`);
+    ui.box("Get Started", [
+      `${colors.highlight("stash init")} - Set up your first project`,
+      `${colors.muted("stash 2fa setup")} - Enable two-factor authentication (recommended)`
+    ]);
   });
 }
 
@@ -1142,7 +1157,7 @@ function registerTeamCommands(program2) {
   const teams = program2.command("teams").description("Manage teams");
   teams.command("list").alias("ls").description("List all teams you belong to").action(async () => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const spinner = ui.spinner("Fetching teams...");
@@ -1155,7 +1170,7 @@ function registerTeamCommands(program2) {
     spinner.stop();
     if (!result.data?.teams.length) {
       ui.warning("You are not a member of any teams");
-      ui.info(`Create one with ${ui.code("sstash teams create")}`);
+      ui.info(`Create one with ${ui.code("stash teams create")}`);
       return;
     }
     ui.heading("Your Teams");
@@ -1170,11 +1185,11 @@ function registerTeamCommands(program2) {
       header: ["", "Name", "Slug", "Role"]
     });
     ui.br();
-    ui.info(`Switch teams with ${ui.code("sstash teams use <slug>")}`);
+    ui.info(`Switch teams with ${ui.code("stash teams use <slug>")}`);
   });
   teams.command("create").description("Create a new team").option("-n, --name <name>", "Team name").action(async (options) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     let name = options.name;
@@ -1198,21 +1213,22 @@ function registerTeamCommands(program2) {
       ui.error(result.error.message);
       process.exit(1);
     }
+    const team = result.data.team;
     configManager.setCurrentTeam({
-      id: result.data.id,
-      name: result.data.name,
-      slug: result.data.slug
+      id: team.id,
+      name: team.name,
+      slug: team.slug
     });
     spinner.succeed(`Team "${name}" created successfully`);
     ui.br();
-    ui.keyValue("ID", result.data.id);
-    ui.keyValue("Slug", result.data.slug);
+    ui.keyValue("ID", team.id);
+    ui.keyValue("Slug", team.slug);
     ui.br();
-    ui.info(`Create your first project with ${ui.code("sstash projects create")}`);
+    ui.info(`Create your first project with ${ui.code("stash projects create")}`);
   });
   teams.command("use <slug>").description("Switch to a different team").action(async (slug) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const spinner = ui.spinner("Fetching teams...");
@@ -1226,6 +1242,15 @@ function registerTeamCommands(program2) {
     if (!team) {
       spinner.fail();
       ui.error(`Team "${slug}" not found or you don't have access`);
+      if (result.data?.teams.length) {
+        ui.br();
+        ui.info("Your teams:");
+        result.data.teams.forEach((t) => {
+          ui.info(`  ${t.slug} - ${t.name}`);
+        });
+      } else {
+        ui.info(`You're not a member of any teams. Create one with ${ui.code("stash teams create")}`);
+      }
       process.exit(1);
     }
     configManager.setCurrentTeam({
@@ -1241,7 +1266,7 @@ function registerTeamCommands(program2) {
     const currentTeam = configManager.getCurrentTeam();
     if (!currentTeam) {
       ui.warning("No team selected");
-      ui.info(`Select one with ${ui.code("sstash teams use <slug>")}`);
+      ui.info(`Select one with ${ui.code("stash teams use <slug>")}`);
       return;
     }
     ui.heading("Current Team");
@@ -1251,12 +1276,12 @@ function registerTeamCommands(program2) {
   });
   teams.command("invite <email>").description("Invite a member to the current team").option("-r, --role <role>", "Role for the invited member (member|admin)", "member").action(async (email, options) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const currentTeam = configManager.getCurrentTeam();
     if (!currentTeam) {
-      ui.error("No team selected. Run `sstash teams use <slug>` first.");
+      ui.error("No team selected. Run `stash teams use <slug>` first.");
       process.exit(1);
     }
     const role = options.role.toLowerCase();
@@ -1282,12 +1307,12 @@ function registerTeamCommands(program2) {
   });
   teams.command("members").description("List members of the current team").action(async () => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const currentTeam = configManager.getCurrentTeam();
     if (!currentTeam) {
-      ui.error("No team selected. Run `sstash teams use <slug>` first.");
+      ui.error("No team selected. Run `stash teams use <slug>` first.");
       process.exit(1);
     }
     const spinner = ui.spinner("Fetching team members...");
@@ -1319,12 +1344,12 @@ function registerTeamCommands(program2) {
   });
   teams.command("remove <email>").description("Remove a member from the current team").option("-f, --force", "Skip confirmation prompt").action(async (email, options) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const currentTeam = configManager.getCurrentTeam();
     if (!currentTeam) {
-      ui.error("No team selected. Run `sstash teams use <slug>` first.");
+      ui.error("No team selected. Run `stash teams use <slug>` first.");
       process.exit(1);
     }
     const spinner = ui.spinner("Looking up member...");
@@ -1377,12 +1402,12 @@ function registerTeamCommands(program2) {
   });
   teams.command("role <email> <role>").description("Change a member's role in the current team").option("-f, --force", "Skip confirmation prompt").action(async (email, role, options) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const currentTeam = configManager.getCurrentTeam();
     if (!currentTeam) {
-      ui.error("No team selected. Run `sstash teams use <slug>` first.");
+      ui.error("No team selected. Run `stash teams use <slug>` first.");
       process.exit(1);
     }
     const validRoles = ["admin", "member"];
@@ -1457,7 +1482,7 @@ var { prompt: prompt3 } = enquirer3;
 function requireTeam() {
   const team = configManager.getCurrentTeam();
   if (!team) {
-    ui.error("No team selected. Run `sstash teams use <slug>` first.");
+    ui.error("No team selected. Run `stash teams use <slug>` first.");
     process.exit(1);
   }
   return team;
@@ -1466,7 +1491,7 @@ function registerProjectCommands(program2) {
   const projects = program2.command("projects").description("Manage projects");
   projects.command("list").alias("ls").description("List all projects in the current team").action(async () => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const team = requireTeam();
@@ -1480,7 +1505,7 @@ function registerProjectCommands(program2) {
     spinner.stop();
     if (!result.data?.projects.length) {
       ui.warning(`No projects in team "${team.name}"`);
-      ui.info(`Create one with ${ui.code("sstash projects create")}`);
+      ui.info(`Create one with ${ui.code("stash projects create")}`);
       return;
     }
     ui.heading(`Projects in ${team.name}`);
@@ -1496,11 +1521,11 @@ function registerProjectCommands(program2) {
       header: ["", "Name", "Slug", "Environments", "Secrets"]
     });
     ui.br();
-    ui.info(`Switch projects with ${ui.code("sstash projects use <slug>")}`);
+    ui.info(`Switch projects with ${ui.code("stash projects use <slug>")}`);
   });
   projects.command("create").description("Create a new project").option("-n, --name <name>", "Project name").option("-d, --description <description>", "Project description").action(async (options) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const team = requireTeam();
@@ -1534,21 +1559,22 @@ function registerProjectCommands(program2) {
       ui.error(result.error.message);
       process.exit(1);
     }
+    const project = result.data.project;
     configManager.setCurrentProject({
-      id: result.data.id,
-      name: result.data.name,
-      slug: result.data.slug
+      id: project.id,
+      name: project.name,
+      slug: project.slug
     });
     spinner.succeed(`Project "${name}" created successfully`);
     ui.br();
-    ui.keyValue("ID", result.data.id);
-    ui.keyValue("Slug", result.data.slug);
+    ui.keyValue("ID", project.id);
+    ui.keyValue("Slug", project.slug);
     ui.br();
-    ui.info(`Create environments with ${ui.code("sstash environments create")}`);
+    ui.info(`Create environments with ${ui.code("stash environments create")}`);
   });
   projects.command("use <slug>").description("Switch to a different project").action(async (slug) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const team = requireTeam();
@@ -1563,6 +1589,15 @@ function registerProjectCommands(program2) {
     if (!project) {
       spinner.fail();
       ui.error(`Project "${slug}" not found in team "${team.name}"`);
+      if (result.data?.projects.length) {
+        ui.br();
+        ui.info("Available projects:");
+        result.data.projects.forEach((p) => {
+          ui.info(`  ${p.slug} - ${p.name}`);
+        });
+      } else {
+        ui.info(`No projects exist yet. Create one with ${ui.code("stash projects create")}`);
+      }
       process.exit(1);
     }
     configManager.setCurrentProject({
@@ -1577,7 +1612,7 @@ function registerProjectCommands(program2) {
     const currentProject = configManager.getCurrentProject();
     if (!currentProject) {
       ui.warning("No project selected");
-      ui.info(`Select one with ${ui.code("sstash projects use <slug>")}`);
+      ui.info(`Select one with ${ui.code("stash projects use <slug>")}`);
       return;
     }
     ui.heading("Current Project");
@@ -1587,7 +1622,7 @@ function registerProjectCommands(program2) {
   });
   projects.command("delete <slug>").alias("rm").description("Delete a project and all its environments and secrets").option("-f, --force", "Skip confirmation prompt").action(async (slug, options) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const team = requireTeam();
@@ -1653,7 +1688,7 @@ var { prompt: prompt4 } = enquirer4;
 function requireProject() {
   const project = configManager.getCurrentProject();
   if (!project) {
-    ui.error("No project selected. Run `sstash projects use <slug>` first.");
+    ui.error("No project selected. Run `stash projects use <slug>` first.");
     process.exit(1);
   }
   return project;
@@ -1662,7 +1697,7 @@ function registerEnvironmentCommands(program2) {
   const envs = program2.command("environments").alias("envs").description("Manage environments");
   envs.command("list").alias("ls").description("List all environments in the current project").action(async () => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const project = requireProject();
@@ -1676,7 +1711,7 @@ function registerEnvironmentCommands(program2) {
     spinner.stop();
     if (!result.data?.environments.length) {
       ui.warning(`No environments in project "${project.name}"`);
-      ui.info(`Create one with ${ui.code("sstash environments create")}`);
+      ui.info(`Create one with ${ui.code("stash environments create")}`);
       return;
     }
     ui.heading(`Environments in ${project.name}`);
@@ -1696,11 +1731,11 @@ function registerEnvironmentCommands(program2) {
       header: ["", "Name", "Slug", "Secrets", "Inherits From"]
     });
     ui.br();
-    ui.info(`Switch environments with ${ui.code("sstash environments use <slug>")}`);
+    ui.info(`Switch environments with ${ui.code("stash environments use <slug>")}`);
   });
   envs.command("create").description("Create a new environment").option("-n, --name <name>", "Environment name").option("--inherit-from <slug>", "Inherit secrets from parent environment (e.g., development)").action(async (options) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const project = requireProject();
@@ -1751,20 +1786,21 @@ function registerEnvironmentCommands(program2) {
       ui.error(result.error.message);
       process.exit(1);
     }
-    configManager.setCurrentEnvironment(result.data.slug);
+    const environment = result.data.environment;
+    configManager.setCurrentEnvironment(environment.slug);
     spinner.succeed(`Environment "${name}" created successfully`);
     ui.br();
-    ui.keyValue("ID", result.data.id);
-    ui.keyValue("Slug", result.data.slug);
+    ui.keyValue("ID", environment.id);
+    ui.keyValue("Slug", environment.slug);
     if (options.inheritFrom) {
       ui.keyValue("Inherits from", options.inheritFrom);
     }
     ui.br();
-    ui.info(`Add secrets with ${ui.code("sstash secrets create")} or ${ui.code("sstash push")}`);
+    ui.info(`Add secrets with ${ui.code("stash secrets create")} or ${ui.code("stash push")}`);
   });
   envs.command("use <slug>").description("Switch to a different environment").action(async (slug) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const project = requireProject();
@@ -1779,6 +1815,15 @@ function registerEnvironmentCommands(program2) {
     if (!env) {
       spinner.fail();
       ui.error(`Environment "${slug}" not found in project "${project.name}"`);
+      if (result.data?.environments.length) {
+        ui.br();
+        ui.info("Available environments:");
+        result.data.environments.forEach((e) => {
+          ui.info(`  ${e.slug} - ${e.name}`);
+        });
+      } else {
+        ui.info(`No environments exist yet. Create one with ${ui.code("stash environments create")}`);
+      }
       process.exit(1);
     }
     configManager.setCurrentEnvironment(env.slug);
@@ -1788,7 +1833,7 @@ function registerEnvironmentCommands(program2) {
     const currentEnv = configManager.getCurrentEnvironment();
     if (!currentEnv) {
       ui.warning("No environment selected");
-      ui.info(`Select one with ${ui.code("sstash environments use <slug>")}`);
+      ui.info(`Select one with ${ui.code("stash environments use <slug>")}`);
       return;
     }
     ui.heading("Current Environment");
@@ -1796,17 +1841,17 @@ function registerEnvironmentCommands(program2) {
   });
   envs.command("clone <source> <target>").description("Clone an environment with all its secrets").action(async (source, target) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const teamSlug = projectConfig.getEffectiveTeam();
     const projectSlug = projectConfig.getEffectiveProject();
     if (!teamSlug) {
-      ui.error("No team selected. Run `sstash teams use <slug>` first.");
+      ui.error("No team selected. Run `stash teams use <slug>` first.");
       process.exit(1);
     }
     if (!projectSlug) {
-      ui.error("No project selected. Run `sstash projects use <slug>` first.");
+      ui.error("No project selected. Run `stash projects use <slug>` first.");
       process.exit(1);
     }
     const { password } = await prompt4({
@@ -1875,11 +1920,11 @@ function registerEnvironmentCommands(program2) {
       console.log(`    ${colors.success("+")} ${secret.key}`);
     }
     ui.br();
-    ui.info(`Switch to the new environment with ${ui.code(`sstash environments use ${target}`)}`);
+    ui.info(`Switch to the new environment with ${ui.code(`stash environments use ${target}`)}`);
   });
   envs.command("delete <slug>").description("Delete an environment").option("-f, --force", "Skip confirmation prompts").action(async (slug, options) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const project = requireProject();
@@ -1957,16 +2002,26 @@ function requireContext() {
   const teamSlug = projectConfig.getEffectiveTeam();
   const projectSlug = projectConfig.getEffectiveProject();
   const environment = projectConfig.getEffectiveEnvironment();
-  if (!teamSlug) {
-    ui.error("No team selected. Run `sstash teams use <slug>` first.");
-    process.exit(1);
-  }
-  if (!projectSlug) {
-    ui.error("No project selected. Run `sstash projects use <slug>` first.");
-    process.exit(1);
-  }
-  if (!environment) {
-    ui.error("No environment selected. Run `sstash environments use <slug>` first.");
+  const missing = [];
+  if (!teamSlug) missing.push("team");
+  if (!projectSlug) missing.push("project");
+  if (!environment) missing.push("environment");
+  if (missing.length > 0) {
+    ui.error(`Missing context: ${missing.join(", ")}`);
+    ui.br();
+    ui.info("Set up your context with one of these options:");
+    ui.br();
+    ui.keyValue("Quick setup", ui.code("stash init"));
+    ui.keyValue("View context", ui.code("stash context"));
+    if (missing.includes("team")) {
+      ui.keyValue("Set team", ui.code("stash teams use <slug>"));
+    }
+    if (missing.includes("project")) {
+      ui.keyValue("Set project", ui.code("stash projects use <slug>"));
+    }
+    if (missing.includes("environment")) {
+      ui.keyValue("Set environment", ui.code("stash environments use <slug>"));
+    }
     process.exit(1);
   }
   return { teamSlug, projectSlug, environment };
@@ -2014,7 +2069,7 @@ function registerSecretCommands(program2) {
       process.exit(1);
     }
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const ctx = requireContext();
@@ -2038,7 +2093,7 @@ function registerSecretCommands(program2) {
       } else if (options.format === "env") {
       } else {
         ui.warning("No secrets in this environment");
-        ui.info(`Add secrets with ${ui.code("sstash secrets create")} or ${ui.code("sstash push")}`);
+        ui.info(`Add secrets with ${ui.code("stash secrets create")} or ${ui.code("stash push")}`);
       }
       return;
     }
@@ -2101,7 +2156,7 @@ function registerSecretCommands(program2) {
   });
   secrets.command("set <key> [value]").description("Create or update a single secret").option("-e, --env <environment>", "Environment to use").option("-p, --project <project>", "Project slug to use").option("-d, --description <description>", "Secret description").option("--from-file <file>", "Read value from file").option("--expires <date>", "Set expiration date (YYYY-MM-DD format)").action(async (key, value, options) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const ctx = requireContext();
@@ -2177,7 +2232,7 @@ function registerSecretCommands(program2) {
   });
   secrets.command("get <key>").description("Get a single secret value").option("-e, --env <environment>", "Environment to use").option("-p, --project <project>", "Project slug to use").option("-r, --reveal", "Show unmasked value").action(async (key, options) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const ctx = requireContext();
@@ -2215,7 +2270,7 @@ function registerSecretCommands(program2) {
   });
   secrets.command("delete <key>").alias("rm").description("Delete a single secret").option("-e, --env <environment>", "Environment to use").option("-p, --project <project>", "Project slug to use").option("-f, --force", "Skip confirmation").action(async (key, options) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const ctx = requireContext();
@@ -2266,7 +2321,7 @@ function registerSecretCommands(program2) {
   });
   secrets.command("history <key>").description("Show version history for a secret").option("-e, --env <environment>", "Environment to use").option("-p, --project <project>", "Project slug to use").option("-l, --limit <n>", "Number of versions to show", "10").action(async (key, options) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const ctx = requireContext();
@@ -2354,16 +2409,16 @@ function registerSecretCommands(program2) {
     });
     ui.br();
     ui.info(`Showing ${versions.length} version(s)`);
-    ui.info(`Use ${ui.code(`sstash secrets rollback ${key} --version <n>`)} to restore a previous version`);
+    ui.info(`Use ${ui.code(`stash secrets rollback ${key} --version <n>`)} to restore a previous version`);
   });
   secrets.command("rollback <key>").description("Restore a secret to a previous version").option("-e, --env <environment>", "Environment to use").option("-p, --project <project>", "Project slug to use").option("-v, --version <n>", "Version number to restore (required)").action(async (key, options) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     if (!options.version) {
       ui.error("Version number is required. Use --version <n>");
-      ui.info(`Use ${ui.code(`sstash secrets history ${key}`)} to see available versions`);
+      ui.info(`Use ${ui.code(`stash secrets history ${key}`)} to see available versions`);
       process.exit(1);
     }
     const version2 = parseInt(options.version, 10);
@@ -2482,7 +2537,7 @@ function registerSecretCommands(program2) {
   });
   program2.command("pull").description("Pull secrets from SecretStash to a local .env file").option("-e, --env <environment>", "Environment to pull from").option("-o, --output <file>", "Output file path").option("-f, --force", "Overwrite existing file without confirmation").action(async (options) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const ctx = requireContext();
@@ -2525,7 +2580,7 @@ function registerSecretCommands(program2) {
   });
   program2.command("export").description("Export secrets in various formats (env, json, yaml)").option("-e, --env <environment>", "Environment to export from").option("-f, --format <format>", "Output format (env, json, yaml)", "env").option("-o, --output <file>", "Output file path (default: stdout)").action(async (options) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const ctx = requireContext();
@@ -2603,7 +2658,7 @@ function registerSecretCommands(program2) {
   });
   program2.command("push").description("Push secrets from a local .env file to SecretStash").option("-e, --env <environment>", "Environment to push to").option("-i, --input <file>", "Input file path").option("--dry-run", "Show what would be pushed without making changes").action(async (options) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const ctx = requireContext();
@@ -2685,7 +2740,7 @@ function registerSecretCommands(program2) {
   });
   program2.command("run").description("Run a command with secrets injected as environment variables").option("-e, --env <environment>", "Environment to use").argument("<command...>", "Command to run").action(async (commandArgs, options) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const ctx = requireContext();
@@ -2728,7 +2783,7 @@ function registerSecretCommands(program2) {
   });
   program2.command("init").description("Initialize SecretStash in the current directory").action(async () => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     ui.heading("Initialize SecretStash");
@@ -2740,20 +2795,46 @@ function registerSecretCommands(program2) {
       process.exit(1);
     }
     teamsSpinner.stop();
+    let selectedTeam;
     if (!teamsResult.data?.teams.length) {
-      ui.error("No teams found. Create one first with `sstash teams create`");
-      process.exit(1);
+      ui.info("No teams found. Let's create your first team.");
+      const { name } = await prompt5({
+        type: "input",
+        name: "name",
+        message: "Team name:",
+        initial: "My Team",
+        validate: (value) => value ? true : "Name is required"
+      });
+      const createTeamSpinner = ui.spinner("Creating team...");
+      const createTeamResult = await apiClient.createTeam(name);
+      if (createTeamResult.error) {
+        createTeamSpinner.fail();
+        ui.error(createTeamResult.error.message);
+        process.exit(1);
+      }
+      createTeamSpinner.succeed(`Team "${name}" created`);
+      selectedTeam = createTeamResult.data.team;
+      configManager.setCurrentTeam({
+        id: selectedTeam.id,
+        name: selectedTeam.name,
+        slug: selectedTeam.slug
+      });
+    } else if (teamsResult.data.teams.length === 1) {
+      selectedTeam = teamsResult.data.teams[0];
+      ui.info(`Using team: ${selectedTeam.name}`);
+    } else {
+      const { teamSlug: teamSlug2 } = await prompt5({
+        type: "select",
+        name: "teamSlug",
+        message: "Select team:",
+        choices: teamsResult.data.teams.map((t) => ({
+          name: t.slug,
+          message: `${t.name} (${t.slug})`
+        }))
+      });
+      selectedTeam = teamsResult.data.teams.find((t) => t.slug === teamSlug2);
     }
-    const { teamSlug } = await prompt5({
-      type: "select",
-      name: "teamSlug",
-      message: "Select team:",
-      choices: teamsResult.data.teams.map((t) => ({
-        name: t.slug,
-        message: `${t.name} (${t.slug})`
-      }))
-    });
-    const selectedTeam = teamsResult.data.teams.find((t) => t.slug === teamSlug);
+    const teamSlug = selectedTeam.slug;
     const projectsSpinner = ui.spinner("Fetching projects...");
     const projectsResult = await apiClient.getProjects(selectedTeam.id);
     projectsSpinner.stop();
@@ -2771,7 +2852,7 @@ function registerSecretCommands(program2) {
         ui.error(createResult.error.message);
         process.exit(1);
       }
-      projectSlug = createResult.data.slug;
+      projectSlug = createResult.data.project.slug;
     } else {
       const response = await prompt5({
         type: "select",
@@ -2797,7 +2878,7 @@ function registerSecretCommands(program2) {
           ui.error(createResult.error.message);
           process.exit(1);
         }
-        projectSlug = createResult.data.slug;
+        projectSlug = createResult.data.project.slug;
       } else {
         projectSlug = response.projectSlug;
       }
@@ -2820,9 +2901,9 @@ function registerSecretCommands(program2) {
     ui.success(`Created ${configPath}`);
     ui.br();
     ui.box("Next Steps", [
-      `1. Add secrets: ${ui.code("sstash push .env")}`,
-      `2. Pull secrets: ${ui.code("sstash pull")}`,
-      `3. Run with secrets: ${ui.code("sstash run npm start")}`,
+      `1. Add secrets: ${ui.code("stash push .env")}`,
+      `2. Pull secrets: ${ui.code("stash pull")}`,
+      `3. Run with secrets: ${ui.code("stash run npm start")}`,
       "",
       `Add ${ui.code(".secretstash.json")} to version control`,
       `Add ${ui.code(".env*")} to .gitignore`
@@ -2830,7 +2911,7 @@ function registerSecretCommands(program2) {
   });
   secrets.command("tag <key> <tagname>").description("Add a tag to a secret").option("-e, --env <environment>", "Environment to use").option("-p, --project <project>", "Project slug to use").action(async (key, tagname, options) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const ctx = requireContext();
@@ -2838,7 +2919,7 @@ function registerSecretCommands(program2) {
     const projectSlug = options.project || ctx.projectSlug;
     const currentTeam = configManager.getCurrentTeam();
     if (!currentTeam) {
-      ui.error("No team selected. Run `sstash teams use <slug>` first.");
+      ui.error("No team selected. Run `stash teams use <slug>` first.");
       process.exit(1);
     }
     const spinner = ui.spinner("Looking up secret and tag...");
@@ -2878,7 +2959,7 @@ function registerSecretCommands(program2) {
     if (!tag) {
       spinner.fail();
       ui.error(`Tag "${tagname}" not found`);
-      ui.info(`Create it with ${ui.code(`sstash tags create ${tagname}`)}`);
+      ui.info(`Create it with ${ui.code(`stash tags create ${tagname}`)}`);
       process.exit(1);
     }
     const secretsResult = await apiClient.getSecrets(env.id);
@@ -2910,7 +2991,7 @@ function registerSecretCommands(program2) {
   });
   secrets.command("untag <key> <tagname>").description("Remove a tag from a secret").option("-e, --env <environment>", "Environment to use").option("-p, --project <project>", "Project slug to use").action(async (key, tagname, options) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const ctx = requireContext();
@@ -2918,7 +2999,7 @@ function registerSecretCommands(program2) {
     const projectSlug = options.project || ctx.projectSlug;
     const currentTeam = configManager.getCurrentTeam();
     if (!currentTeam) {
-      ui.error("No team selected. Run `sstash teams use <slug>` first.");
+      ui.error("No team selected. Run `stash teams use <slug>` first.");
       process.exit(1);
     }
     const spinner = ui.spinner("Looking up secret and tag...");
@@ -2985,12 +3066,12 @@ function registerSecretCommands(program2) {
   });
   secrets.command("expiring").description("List secrets that are expiring soon").option("--days <days>", "Number of days to look ahead", "7").action(async (options) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const teamSlug = projectConfig.getEffectiveTeam();
     if (!teamSlug) {
-      ui.error("No team selected. Run `sstash teams use <slug>` first.");
+      ui.error("No team selected. Run `stash teams use <slug>` first.");
       process.exit(1);
     }
     const days = parseInt(options.days) || 7;
@@ -3139,11 +3220,11 @@ function requirePartialContext() {
   const teamSlug = projectConfig.getEffectiveTeam();
   const projectSlug = projectConfig.getEffectiveProject();
   if (!teamSlug) {
-    ui.error("No team selected. Run `sstash teams use <slug>` first.");
+    ui.error("No team selected. Run `stash teams use <slug>` first.");
     process.exit(1);
   }
   if (!projectSlug) {
-    ui.error("No project selected. Run `sstash projects use <slug>` first.");
+    ui.error("No project selected. Run `stash projects use <slug>` first.");
     process.exit(1);
   }
   return { teamSlug, projectSlug };
@@ -3151,7 +3232,7 @@ function requirePartialContext() {
 function registerDiffCommand(program2) {
   program2.command("diff <env1> <env2>").description("Compare secrets between two environments").option("-p, --project <slug>", "Use specific project").option("--show-unchanged", "Include secrets that are the same in both environments").option("-f, --format <format>", "Output format: table or json", "table").action(async (env1, env2, options) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const ctx = requirePartialContext();
@@ -3205,15 +3286,15 @@ function requireContext2() {
   const projectSlug = projectConfig.getEffectiveProject();
   const environment = projectConfig.getEffectiveEnvironment();
   if (!teamSlug) {
-    ui.error("No team selected. Run `sstash teams use <slug>` first.");
+    ui.error("No team selected. Run `stash teams use <slug>` first.");
     process.exit(1);
   }
   if (!projectSlug) {
-    ui.error("No project selected. Run `sstash projects use <slug>` first.");
+    ui.error("No project selected. Run `stash projects use <slug>` first.");
     process.exit(1);
   }
   if (!environment) {
-    ui.error("No environment selected. Run `sstash environments use <slug>` first.");
+    ui.error("No environment selected. Run `stash environments use <slug>` first.");
     process.exit(1);
   }
   return { teamSlug, projectSlug, environment };
@@ -3249,7 +3330,7 @@ function registerShareCommands(program2) {
   const share = program2.command("share").description("Share secrets via temporary links");
   share.command("create <key>").alias("new").description("Create a share link for a secret").option("-e, --expires <time>", "Expiration time (e.g., 1h, 24h, 7d, 30m)", "24h").option("--one-time", "Link can only be viewed once").option("--env <environment>", "Environment (overrides current)").action(async (key, options) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const ctx = requireContext2();
@@ -3293,7 +3374,7 @@ function registerShareCommands(program2) {
   });
   share.command("list").alias("ls").description("List active share links").option("-a, --all", "Include expired and revoked links").action(async (options) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const spinner = ui.spinner("Fetching share links...");
@@ -3308,7 +3389,7 @@ function registerShareCommands(program2) {
     spinner.stop();
     if (!result.data?.shares.length) {
       ui.warning("No share links found");
-      ui.info(`Create one with ${ui.code("sstash share create <KEY>")}`);
+      ui.info(`Create one with ${ui.code("stash share create <KEY>")}`);
       return;
     }
     ui.heading("Share Links");
@@ -3335,11 +3416,11 @@ function registerShareCommands(program2) {
     });
     ui.br();
     ui.info(`${result.data.shares.length} share link(s) total`);
-    ui.info(`Revoke with ${ui.code("sstash share revoke <id>")}`);
+    ui.info(`Revoke with ${ui.code("stash share revoke <id>")}`);
   });
   share.command("revoke <id>").description("Revoke a share link").option("-f, --force", "Skip confirmation prompt").action(async (id, options) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     if (!options.force) {
@@ -3472,7 +3553,7 @@ async function checkAuthentication() {
       name: "Authentication",
       status: "fail",
       message: "Not authenticated",
-      hint: "Run: sstash login"
+      hint: "Run: stash login"
     };
   }
   const user = configManager.getUser();
@@ -3503,7 +3584,7 @@ function checkTokenExpiration() {
       name: "Token expiration",
       status: "fail",
       message: "No token found",
-      hint: "Run: sstash login"
+      hint: "Run: stash login"
     };
   }
   if (configManager.isTokenExpired()) {
@@ -3511,7 +3592,7 @@ function checkTokenExpiration() {
       name: "Token expiration",
       status: "warn",
       message: "Token expired or expiring soon",
-      hint: "Run: sstash login"
+      hint: "Run: stash login"
     };
   }
   return {
@@ -3535,7 +3616,7 @@ function checkTeamSelected() {
     name: "Team selected",
     status: "fail",
     message: "No team selected",
-    hint: "Run: sstash teams use <slug>"
+    hint: "Run: stash teams use <slug>"
   };
 }
 function checkProjectSelected() {
@@ -3553,7 +3634,7 @@ function checkProjectSelected() {
     name: "Project selected",
     status: "fail",
     message: "No project selected",
-    hint: "Run: sstash projects use <slug>"
+    hint: "Run: stash projects use <slug>"
   };
 }
 function checkEnvironmentSelected() {
@@ -3570,7 +3651,7 @@ function checkEnvironmentSelected() {
     name: "Environment selected",
     status: "fail",
     message: "No environment selected",
-    hint: "Run: sstash environments use <name>"
+    hint: "Run: stash environments use <name>"
   };
 }
 function checkLocalConfigExists() {
@@ -3585,7 +3666,7 @@ function checkLocalConfigExists() {
     name: "Local config file",
     status: "warn",
     message: ".secretstash.json not found",
-    hint: "Run: sstash init (optional, for project-specific config)"
+    hint: "Run: stash init (optional, for project-specific config)"
   };
 }
 function checkLocalConfigValid() {
@@ -3758,12 +3839,12 @@ function registerTagCommands(program2) {
   const tags = program2.command("tags").description("Manage tags for organizing secrets");
   tags.command("list").alias("ls").description("List all tags in the current team").action(async () => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const currentTeam = configManager.getCurrentTeam();
     if (!currentTeam) {
-      ui.error("No team selected. Run `sstash teams use <slug>` first.");
+      ui.error("No team selected. Run `stash teams use <slug>` first.");
       process.exit(1);
     }
     const spinner = ui.spinner("Fetching tags...");
@@ -3776,7 +3857,7 @@ function registerTagCommands(program2) {
     spinner.stop();
     if (!result.data?.tags.length) {
       ui.warning("No tags found");
-      ui.info(`Create one with ${ui.code("sstash tags create <name>")}`);
+      ui.info(`Create one with ${ui.code("stash tags create <name>")}`);
       return;
     }
     ui.heading(`Tags in ${currentTeam.name}`);
@@ -3793,12 +3874,12 @@ function registerTagCommands(program2) {
   });
   tags.command("create <name>").description("Create a new tag").option("-c, --color <hex>", "Hex color for the tag (e.g., #FF5733)").action(async (name, options) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const currentTeam = configManager.getCurrentTeam();
     if (!currentTeam) {
-      ui.error("No team selected. Run `sstash teams use <slug>` first.");
+      ui.error("No team selected. Run `stash teams use <slug>` first.");
       process.exit(1);
     }
     if (options.color && !/^#[0-9A-Fa-f]{6}$/.test(options.color)) {
@@ -3821,12 +3902,12 @@ function registerTagCommands(program2) {
   });
   tags.command("delete <name>").alias("rm").description("Delete a tag").option("-f, --force", "Skip confirmation prompt").action(async (name, options) => {
     if (!configManager.isAuthenticated()) {
-      ui.error("Not authenticated. Run `sstash login` first.");
+      ui.error("Not authenticated. Run `stash login` first.");
       process.exit(1);
     }
     const currentTeam = configManager.getCurrentTeam();
     if (!currentTeam) {
-      ui.error("No team selected. Run `sstash teams use <slug>` first.");
+      ui.error("No team selected. Run `stash teams use <slug>` first.");
       process.exit(1);
     }
     const spinner = ui.spinner("Looking up tag...");
@@ -4034,10 +4115,10 @@ function registerExecCommand(program2) {
   program2.command("exec").description("Run a command with secrets injected as environment variables (CI/CD friendly)").requiredOption("--project <slug>", "Project slug").requiredOption("--env <environment>", "Environment name (e.g., production, staging)").option("--token <token>", "Service token (defaults to SECRETS_TOKEN env var)").option("--api-url <url>", "API URL (defaults to VAULT_API_URL env var or configured URL)").argument("<command...>", "Command to run").allowExcessArguments(true).action(async (commandArgs, options) => {
     if (!commandArgs || commandArgs.length === 0) {
       ui.error("No command provided");
-      ui.info("Usage: sstash exec --project=<slug> --env=<environment> -- <command> [args...]");
+      ui.info("Usage: stash exec --project=<slug> --env=<environment> -- <command> [args...]");
       ui.info("");
       ui.info("Example:");
-      ui.info("  sstash exec --project=myapp --env=production -- npm run build");
+      ui.info("  stash exec --project=myapp --env=production -- npm run build");
       process.exit(1);
     }
     const token = options.token || process.env.SECRETS_TOKEN;
@@ -4046,7 +4127,7 @@ function registerExecCommand(program2) {
       ui.info("Provide a token via --token flag or SECRETS_TOKEN environment variable");
       ui.info("");
       ui.info("Generate a service token from the SecretStash dashboard or CLI:");
-      ui.info('  sstash tokens create --name "CI Token" --env production');
+      ui.info('  stash tokens create --name "CI Token" --env production');
       process.exit(1);
     }
     if (!token.startsWith("stk_")) {
@@ -4126,6 +4207,154 @@ function registerExecCommand(program2) {
   });
 }
 
+// src/commands/context.ts
+function registerContextCommands(program2) {
+  const context = program2.command("context").alias("ctx").description("View and manage current context (team, project, environment)");
+  context.action(async () => {
+    ui.heading("Current Context");
+    const team = configManager.getCurrentTeam();
+    const project = configManager.getCurrentProject();
+    const environment = configManager.getCurrentEnvironment();
+    const localTeam = projectConfig.getEffectiveTeam();
+    const localProject = projectConfig.getEffectiveProject();
+    const localEnv = projectConfig.getEffectiveEnvironment();
+    const hasLocalConfig = localTeam || localProject || localEnv;
+    if (team) {
+      ui.keyValue("Team", `${team.name} ${colors.muted(`(${team.slug})`)}`);
+    } else {
+      ui.keyValue("Team", colors.warning("Not set"));
+    }
+    if (project) {
+      ui.keyValue("Project", `${project.name} ${colors.muted(`(${project.slug})`)}`);
+    } else {
+      ui.keyValue("Project", colors.warning("Not set"));
+    }
+    if (environment) {
+      ui.keyValue("Environment", ui.envBadge(environment));
+    } else {
+      ui.keyValue("Environment", colors.warning("Not set"));
+    }
+    if (hasLocalConfig) {
+      ui.br();
+      ui.subheading("Local Config (.secretstash.json)");
+      if (localTeam) ui.keyValue("Team", localTeam);
+      if (localProject) ui.keyValue("Project", localProject);
+      if (localEnv) ui.keyValue("Environment", localEnv);
+    }
+    const missing = [];
+    if (!team && !localTeam) missing.push("team");
+    if (!project && !localProject) missing.push("project");
+    if (!environment && !localEnv) missing.push("environment");
+    if (missing.length > 0) {
+      ui.br();
+      ui.warning(`Missing: ${missing.join(", ")}`);
+      ui.info(`Run ${ui.code("stash init")} to set up your context`);
+    } else {
+      ui.br();
+      ui.success("Context is fully configured");
+    }
+  });
+  context.command("show").description("Show current context").action(async () => {
+    await context.parseAsync([], { from: "user" });
+  });
+  context.command("clear").description("Clear all context (team, project, environment)").option("--team", "Clear only team context").option("--project", "Clear only project context").option("--env", "Clear only environment context").action((options) => {
+    if (options.team) {
+      configManager.clearCurrentTeam();
+      configManager.clearCurrentProject();
+      configManager.clearCurrentEnvironment();
+      ui.success("Team context cleared (project and environment also cleared)");
+    } else if (options.project) {
+      configManager.clearCurrentProject();
+      configManager.clearCurrentEnvironment();
+      ui.success("Project context cleared (environment also cleared)");
+    } else if (options.env) {
+      configManager.clearCurrentEnvironment();
+      ui.success("Environment context cleared");
+    } else {
+      configManager.clearCurrentTeam();
+      configManager.clearCurrentProject();
+      configManager.clearCurrentEnvironment();
+      ui.success("All context cleared");
+    }
+  });
+  context.command("set").description("Interactively set context (team, project, environment)").action(async () => {
+    if (!configManager.isAuthenticated()) {
+      ui.error("Not authenticated. Run `stash login` first.");
+      process.exit(1);
+    }
+    ui.info("Use `stash init` for full interactive setup");
+    ui.info("Or use these commands to set context individually:");
+    ui.br();
+    ui.keyValue("Team", ui.code("stash teams use <slug>"));
+    ui.keyValue("Project", ui.code("stash projects use <slug>"));
+    ui.keyValue("Environment", ui.code("stash environments use <slug>"));
+  });
+  context.command("verify").description("Verify current context is valid and accessible").action(async () => {
+    if (!configManager.isAuthenticated()) {
+      ui.error("Not authenticated. Run `stash login` first.");
+      process.exit(1);
+    }
+    const team = configManager.getCurrentTeam();
+    const project = configManager.getCurrentProject();
+    const environment = configManager.getCurrentEnvironment();
+    let allValid = true;
+    const spinner = ui.spinner("Verifying context...");
+    if (team) {
+      const teamsResult = await apiClient.getTeams();
+      const teamExists = teamsResult.data?.teams.some((t) => t.id === team.id);
+      if (teamExists) {
+        spinner.text = `Team "${team.name}" \u2713`;
+      } else {
+        spinner.stop();
+        ui.error(`Team "${team.name}" not found or no longer accessible`);
+        allValid = false;
+      }
+    } else {
+      spinner.stop();
+      ui.warning("No team set");
+      allValid = false;
+    }
+    if (team && project) {
+      const projectsResult = await apiClient.getProjects(team.id);
+      const projectExists = projectsResult.data?.projects.some((p) => p.id === project.id);
+      if (projectExists) {
+        spinner.text = `Project "${project.name}" \u2713`;
+      } else {
+        spinner.stop();
+        ui.error(`Project "${project.name}" not found in team "${team.name}"`);
+        allValid = false;
+      }
+    } else if (!project) {
+      spinner.stop();
+      ui.warning("No project set");
+      allValid = false;
+    }
+    if (team && project && environment) {
+      const envsResult = await apiClient.getEnvironments(project.id);
+      const envExists = envsResult.data?.environments.some((e) => e.slug === environment);
+      if (envExists) {
+        spinner.succeed("Context verified");
+      } else {
+        spinner.stop();
+        ui.error(`Environment "${environment}" not found in project "${project.name}"`);
+        allValid = false;
+      }
+    } else if (!environment) {
+      spinner.stop();
+      ui.warning("No environment set");
+      allValid = false;
+    }
+    if (allValid) {
+      ui.br();
+      ui.success("All context is valid and accessible");
+    } else {
+      ui.br();
+      ui.info(`Run ${ui.code("stash init")} to fix context issues`);
+      process.exit(1);
+    }
+  });
+}
+
 // src/index.ts
 var __dirname = dirname(fileURLToPath(import.meta.url));
 var version = "0.1.0";
@@ -4150,7 +4379,7 @@ var banner = chalk3.hex("#6366f1")(`
   \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D
 `);
 var program = new Command();
-program.name("sstash").description("SecretStash CLI - Ultra-secure team secrets management").version(version, "-v, --version", "Output the current version").option("--no-banner", "Disable the banner").option("-q, --quiet", "Suppress non-essential output (useful for CI/CD)").hook("preAction", (thisCommand) => {
+program.name("stash").description("SecretStash CLI - Ultra-secure team secrets management").version(version, "-v, --version", "Output the current version").option("--no-banner", "Disable the banner").option("-q, --quiet", "Suppress non-essential output (useful for CI/CD)").hook("preAction", (thisCommand) => {
   const opts = thisCommand.opts();
   if (opts.quiet) {
     configManager.setQuiet(true);
@@ -4164,6 +4393,7 @@ registerTeamCommands(program);
 registerProjectCommands(program);
 registerEnvironmentCommands(program);
 registerSecretCommands(program);
+registerContextCommands(program);
 registerDiffCommand(program);
 registerShareCommands(program);
 registerDoctorCommand(program);
@@ -4173,44 +4403,47 @@ registerExecCommand(program);
 program.addHelpText("after", `
 ${chalk3.bold("Examples:")}
   ${chalk3.dim("# Authenticate")}
-  $ sstash login
-  $ sstash whoami
+  $ stash login
+  $ stash whoami
+
+  ${chalk3.dim("# View current context")}
+  $ stash context
 
-  ${chalk3.dim("# Set up context")}
-  $ sstash teams use my-team
-  $ sstash projects use my-project
-  $ sstash environments use development
+  ${chalk3.dim("# Set up context interactively")}
+  $ stash init
 
-  ${chalk3.dim("# Or initialize in current directory")}
-  $ sstash init
+  ${chalk3.dim("# Or set context manually")}
+  $ stash teams use my-team
+  $ stash projects use my-project
+  $ stash environments use development
 
   ${chalk3.dim("# Manage secrets")}
-  $ sstash pull                    # Pull secrets to .env
-  $ sstash push                    # Push secrets from .env
-  $ sstash run npm start           # Run with secrets injected
+  $ stash pull                    # Pull secrets to .env
+  $ stash push                    # Push secrets from .env
+  $ stash run npm start           # Run with secrets injected
 
   ${chalk3.dim("# View secrets")}
-  $ sstash secrets list
-  $ sstash secrets list --reveal
+  $ stash secrets list
+  $ stash secrets list --reveal
 
   ${chalk3.dim("# Compare environments")}
-  $ sstash diff development production
+  $ stash diff development production
 
   ${chalk3.dim("# Share secrets")}
-  $ sstash share create DATABASE_URL --expires 24h --one-time
-  $ sstash share list
-  $ sstash share revoke <id>
+  $ stash share create DATABASE_URL --expires 24h --one-time
+  $ stash share list
+  $ stash share revoke <id>
 
   ${chalk3.dim("# Organize with tags")}
-  $ sstash tags create database --color #FF5733
-  $ sstash tags list
-  $ sstash secrets tag DATABASE_URL database
+  $ stash tags create database --color #FF5733
+  $ stash tags list
+  $ stash secrets tag DATABASE_URL database
 
   ${chalk3.dim("# CI/CD - pull secrets or run commands with secrets injected")}
-  $ SECRETS_TOKEN=stk_xxx sstash ci-pull -p myapp -e production
-  $ SECRETS_TOKEN=stk_xxx sstash ci-pull -p myapp -e production --format json
-  $ eval "$(SECRETS_TOKEN=stk_xxx sstash ci-pull -p myapp -e production --format shell)"
-  $ SECRETS_TOKEN=stk_... sstash exec --project=myapp --env=production -- npm run build
+  $ SECRETS_TOKEN=stk_xxx stash ci-pull -p myapp -e production
+  $ SECRETS_TOKEN=stk_xxx stash ci-pull -p myapp -e production --format json
+  $ eval "$(SECRETS_TOKEN=stk_xxx stash ci-pull -p myapp -e production --format shell)"
+  $ SECRETS_TOKEN=stk_... stash exec --project=myapp --env=production -- npm run build
 
 ${chalk3.bold("Documentation:")}
   https://secretstash.dev/docs

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@secretstash/cli",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "CLI tool for SecretStash - secure team secrets management",
   "type": "module",
   "main": "dist/index.js",
   "bin": {
+    "stash": "./bin/vault.js",
     "sstash": "./bin/vault.js"
   },
   "scripts": {