atris 2.5.4 → 2.6.0

package/atris/policies/atris-design.md

@@ -19,33 +19,93 @@ this is the "distribution center" — statistically average, aesthetically dead.
 
 ## typography
 
-**avoid:** inter, roboto, open sans, lato, system defaults
+**avoid:** inter, roboto, open sans, lato, arial, montserrat, system defaults. also avoid monospace as lazy shorthand for "technical/developer" vibes.
 
 **try instead:**
-- monospace for dev tools: jetbrains mono, fira code
-- editorial vibes: playfair display, crimson pro
-- clean technical: ibm plex, source sans
+- instead of inter → instrument sans, plus jakarta sans, outfit
+- instead of roboto → onest, figtree, urbanist
+- instead of open sans → source sans 3, nunito sans, dm sans
+- editorial/premium → fraunces, newsreader, lora, playfair display, crimson pro
+- dev tools → jetbrains mono, fira code
+- clean technical → ibm plex, source sans
 
 **the move:** pick ONE distinctive font. use weight extremes (200 vs 800, not 400 vs 500). size jumps should be dramatic (3x), not timid (1.2x).
 
+**type scale:** use a modular scale with fluid sizing. 5 sizes covers most needs:
+
+| role | size | use |
+|------|------|-----|
+| xs | 0.75rem | captions, legal |
+| sm | 0.875rem | secondary UI, metadata |
+| base | 1rem | body text |
+| lg | 1.25-1.5rem | subheadings, lead |
+| xl+ | 2-4rem | headlines, hero |
+
+use `clamp()` for fluid sizing: `clamp(1rem, 0.5rem + 2vw, 2rem)`. use `ch` units for measure: `max-width: 65ch` for readable body text.
+
+**vertical rhythm:** your `line-height` should be the base unit for all vertical spacing. if body is `line-height: 1.5` on `16px` (= 24px), spacing values should be multiples of 24px.
+
+**font loading:** prevent layout shift with proper loading:
+```css
+@font-face {
+  font-family: 'CustomFont';
+  src: url('font.woff2') format('woff2');
+  font-display: swap;
+}
+```
+match fallback metrics with `size-adjust`, `ascent-override`, `descent-override` to minimize FOUT reflow.
+
 ---
 
 ## color
 
-**avoid:** purple/violet on white, generic startup palettes, safe grays
+**avoid:** purple/violet on white, generic startup palettes, safe grays, pure black (#000), pure white (#fff), the AI color palette (cyan-on-dark, purple-to-blue gradients, neon accents on dark backgrounds), gradient text for "impact"
 
 **the move:** commit to a palette and stick to it. use css variables. one dominant color with a sharp accent beats five evenly-distributed colors.
 
-dark backgrounds are easier to make look good. steal from places you like — linear.app, vercel.com, raycast.com, arc browser.
+**use OKLCH:** modern, perceptually uniform color space. equal steps in lightness actually look equal.
+```css
+:root {
+  --brand: oklch(65% 0.2 250);
+  --brand-light: oklch(90% 0.05 250);
+  --brand-dark: oklch(30% 0.15 250);
+}
+```
+
+use `color-mix()` for variants: `color-mix(in oklch, var(--brand) 80%, white)`. use `light-dark()` for theme-aware values.
+
+**tint your neutrals:** never use pure gray. always tint toward your brand hue — even 0.01 chroma in OKLCH creates subconscious cohesion:
+```css
+--gray-100: oklch(95% 0.01 250); /* not #f5f5f5 */
+--gray-900: oklch(15% 0.01 250); /* not #1a1a1a */
+```
+
+**gray on color:** never put gray text on colored backgrounds. it looks washed out. use a darker shade of the background color or transparency instead.
+
+dark backgrounds are easier to make look good. steal from places you like — linear.app, vercel.com, raycast.com, arc browser. but don't default to dark mode with glowing accents — it looks "cool" without requiring actual design decisions.
 
 ---
 
 ## layout
 
-**avoid:** the template look — hero section, 3 feature cards, testimonial carousel, big footer. every ai does this.
+**avoid:** the template look — hero section, 3 feature cards, testimonial carousel, big footer. every ai does this. also avoid:
+- wrapping everything in cards — not everything needs a container
+- nesting cards inside cards — visual noise, flatten the hierarchy
+- identical card grids — same-sized cards with icon + heading + text, repeated endlessly
+- the hero metric layout — big number, small label, supporting stats, gradient accent
+- centering everything — left-aligned text with asymmetric layouts feels more designed
+- same spacing everywhere — without rhythm, layouts feel monotonous
 
 **the move:** break the grid sometimes. asymmetry is interesting. whitespace is a feature, not wasted space. don't cram everything into 16px/24px spacing — use dramatic gaps.
 
+**fluid spacing:** use `clamp()` for spacing that breathes on larger screens:
+```css
+padding: clamp(1rem, 3vw, 4rem);
+gap: clamp(1.5rem, 4vw, 6rem);
+```
+
+**container queries:** use `@container` for component-level responsiveness instead of only viewport breakpoints. components should adapt to their container, not just the screen.
+
 ---
 
 ## motion
@@ -58,10 +118,52 @@ dark backgrounds are easier to make look good. steal from places you like — li
 - buttons that follow the cursor (harder to click, not clever)
 - FAQ/content that breaks if you scroll past before the fade-in finishes
 - animations that swap styles endlessly without purpose (rotating shapes, morphing buttons)
+- bounce or elastic easing — they feel dated and tacky. real objects decelerate smoothly.
+
+**the move:** one well-timed animation beats ten scattered ones. page load with staggered reveals (50-100ms delays) creates more impact than hover effects on every button.
+
+**easing:** use exponential easing for natural deceleration:
+```css
+--ease-out-quart: cubic-bezier(0.25, 1, 0.5, 1);
+--ease-out-expo: cubic-bezier(0.16, 1, 0.3, 1);
+```
+never linear, never bounce, never elastic. 150-300ms duration for most transitions.
+
+**only animate transform and opacity.** never animate width, height, padding, margin — they trigger layout recalculation and cause jank. for height animations, use `grid-template-rows` transitions.
+
+**reduced motion:** always respect `prefers-reduced-motion`. provide a beautiful static alternative:
+```css
+@media (prefers-reduced-motion: reduce) {
+  *, *::before, *::after {
+    animation-duration: 0.01ms !important;
+    transition-duration: 0.01ms !important;
+  }
+}
+```
 
-**the move:** one well-timed animation beats ten scattered ones. page load with staggered reveals (animation-delay) creates more impact than hover effects on every button.
+---
+
+## interaction
+
+**progressive disclosure:** start simple, reveal sophistication through interaction. basic options first, advanced behind expandable sections. hover states that reveal secondary actions.
+
+**optimistic UI:** update immediately, sync later. makes everything feel fast.
 
-css transitions: 200-300ms, ease-out. that's it.
+**empty states:** design empty states that teach the interface, not just say "nothing here." show users what to do next.
+
+**button hierarchy:** don't make every button primary. use ghost buttons, text links, secondary styles. hierarchy matters.
+
+**every interactive element needs ALL states:**
+- default — resting
+- hover — subtle feedback (brighten, scale 1.02-1.05)
+- focus — visible keyboard indicator (never remove without replacement)
+- active — click/tap feedback
+- disabled — clearly non-interactive
+- loading — async action feedback
+- error — validation state
+- success — confirmation
+
+missing states create confusion and broken experiences.
 
 ---
 
@@ -79,6 +181,25 @@ test every hover on mobile. if something only works on hover, it's broken for ha
 
 ---
 
+## responsive
+
+**avoid:** hiding critical functionality on mobile — adapt the interface, don't amputate it. also avoid:
+- fixed widths that break on small screens
+- touch targets smaller than 44x44px
+- text smaller than 14px on mobile
+- horizontal scroll from content overflow
+
+**the move:** mobile-first, then enhance for larger screens. use fluid layouts with `clamp()` and container queries. adapt the interface for different contexts — don't just shrink it.
+
+```css
+/* container queries > media queries for components */
+@container (min-width: 400px) {
+  .card { flex-direction: row; }
+}
+```
+
+---
+
 ## scroll behavior
 
 **avoid:** scrolljacking — never override native browser scroll with custom scroll logic. it feels like "moving through molasses" and users hate it.
@@ -95,21 +216,43 @@ use the "peeking" technique: let a few pixels of the next section peek above the
 
 **the move:** add depth. layered gradients, subtle patterns, mesh effects. backgrounds set mood — flat backgrounds say "I didn't think about this."
 
+but don't use glassmorphism everywhere — blur effects, glass cards, glow borders used decoratively rather than purposefully. it's AI slop.
+
 ---
 
-## context matters
+## accessibility
 
-don't impose an aesthetic — match the project. a fintech dashboard shouldn't look like a gaming site. read the room.
+this isn't optional — it's part of good design.
 
-if the project already has a design system, use it. don't fight it to show off.
+- **contrast:** 4.5:1 minimum for text, 3:1 for UI components (WCAG AA)
+- **focus indicators:** visible, high-contrast focus rings on all interactive elements. never `outline: none` without a replacement.
+- **semantic HTML:** use proper heading hierarchy, landmarks, buttons (not divs), labels on inputs
+- **color independence:** never use color as the only indicator. add icons, labels, or patterns alongside.
+- **keyboard nav:** logical tab order, no keyboard traps, all functionality accessible without a mouse
 
 ---
 
-## the convergence trap
+## visual details
 
-even with this guidance you'll find new defaults. space grotesk becomes the new inter. dark mode with amber accents becomes the new purple gradient.
+**avoid:**
+- glassmorphism everywhere (blur effects, glass cards, glow borders)
+- rounded elements with thick colored border on one side — lazy accent
+- sparklines as decoration — tiny charts that convey nothing meaningful
+- rounded rectangles with generic drop shadows — safe, forgettable
+- large icons with rounded corners above every heading — templated look
+- modals unless there's truly no better alternative — modals are lazy
+- non-system emojis used as decoration (lazy AI tell)
 
-vary your choices. alternate themes. try different directions between projects.
+---
+
+## ux writing
+
+**make every word earn its place.**
+- don't repeat information users can already see
+- don't repeat the same information — redundant headers, intros that restate the heading
+- labels and buttons should be unambiguous
+- error copy should help users fix the problem, not blame them
+- empty states should guide toward action
 
 ---
 
@@ -144,6 +287,22 @@ if a stranger can't answer all four in 5 seconds of looking at your hero, rewrit
 
 ---
 
+## context matters
+
+don't impose an aesthetic — match the project. a fintech dashboard shouldn't look like a gaming site. read the room.
+
+if the project already has a design system, use it. don't fight it to show off.
+
+---
+
+## the convergence trap
+
+even with this guidance you'll find new defaults. space grotesk becomes the new inter. dark mode with amber accents becomes the new purple gradient.
+
+vary your choices. alternate themes. try different directions between projects.
+
+---
+
 ## before shipping
 
 - can you name the aesthetic in 2-3 words?
@@ -154,12 +313,38 @@ if a stranger can't answer all four in 5 seconds of looking at your hero, rewrit
 - does scrolling feel native?
 - does the hero pass the H1 test (what/who/why/CTA)?
 - are all screenshots/assets crisp?
+- do all interactive elements have all states (hover/focus/active/disabled/loading/error)?
+- does it meet WCAG AA contrast (4.5:1 text, 3:1 UI)?
+- does it work on mobile (touch targets, no horizontal scroll, readable text)?
+- does it respect `prefers-reduced-motion`?
 - would a designer immediately clock this as ai-generated?
 
 if the last answer is yes, you're not done.
 
 ---
 
+## the ai slop test
+
+> "if you showed this interface to someone and said 'AI made this,' would they believe you immediately? if yes, that's the problem."
+
+the fingerprints of AI-generated work:
+- inter/roboto/system fonts
+- purple-to-blue gradients
+- cyan-on-dark color schemes
+- glassmorphism everywhere
+- gradient text on headings/metrics
+- hero metric layout (big number + small label)
+- identical card grids
+- bounce/elastic easing
+- dark mode with neon accents
+- sparklines as decoration
+- rounded rectangles with drop shadows
+- large icons with rounded corners above headings
+
+a distinctive interface should make someone ask "how was this made?" not "which AI made this?"
+
+---
+
 ## references
 
 look at these for inspiration, not to copy:

package/atris/skills/design/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: design
 description: Frontend aesthetics policy. Use when building UI, components, landing pages, dashboards, or any frontend work. Prevents generic ai-generated look.
-version: 1.0.0
+version: 2.0.0
 allowed-tools: Read, Write, Edit, Bash, Glob
 tags:
   - design
@@ -21,26 +21,47 @@ This skill uses the Atris workflow:
 
 ## Quick Reference
 
-**Typography:** avoid inter/roboto/system fonts. pick one distinctive font, use weight extremes (200 vs 800).
+**Typography:** avoid inter/roboto/arial/system fonts. pick one distinctive font, use weight extremes (200 vs 800). size jumps should be dramatic (3x). use `clamp()` for fluid sizing. use `ch` units for measure (`max-width: 65ch`).
 
-**Color:** commit to a palette. dark backgrounds easier to make good. steal from linear.app, vercel.com, raycast.com.
+Font alternatives: instead of Inter → Instrument Sans, Plus Jakarta Sans, Outfit. Instead of Roboto → Onest, Figtree, Urbanist. Editorial → Fraunces, Newsreader, Lora.
 
-**Layout:** break the hero + 3 cards + footer template. asymmetry is interesting. dramatic whitespace.
+**Color:** commit to a palette. use OKLCH for perceptually uniform colors. tint your neutrals toward your brand hue (never pure gray). never put gray text on colored backgrounds. never use pure black (#000) or pure white (#fff). avoid the AI palette: cyan-on-dark, purple-to-blue gradients, neon accents on dark.
 
-**Motion:** one well-timed animation beats ten scattered ones. 200-300ms ease-out. no cursor-following lines, no meteor effects, no buttons that chase the cursor.
+```css
+--brand: oklch(65% 0.2 250);
+--gray-100: oklch(95% 0.01 250); /* tinted, not pure gray */
+```
+
+**Layout:** break the hero + 3 cards + footer template. no card-in-card nesting. no identical card grids. asymmetry is interesting. dramatic whitespace. use container queries for component-level responsiveness. fluid spacing with `clamp()`.
+
+**Motion:** one well-timed animation beats ten scattered ones. use exponential easing (`cubic-bezier(0.25, 1, 0.5, 1)`), never bounce/elastic. 150-300ms duration. only animate transform and opacity. always respect `prefers-reduced-motion`. no cursor-following lines, no meteor effects, no buttons that chase the cursor.
 
-**Hover:** make elements feel inviting on hover (brighten, subtle scale). never fade out, shift, or hide content behind hover. hover doesn't exist on mobile.
+**Interaction:** progressive disclosure — start simple, reveal complexity. optimistic UI — update immediately, sync later. every interactive element needs ALL states: default, hover, focus, active, disabled, loading, error, success. don't make every button primary.
+
+**Hover:** make elements feel inviting on hover (brighten, subtle scale 1.02-1.05). never fade out, shift, or hide content behind hover. hover doesn't exist on mobile.
 
 **Scroll:** never override native scroll. use "peeking" (show a few px of next section) instead of full-screen hero + scroll arrow.
 
+**Responsive:** mobile-first. touch targets 44x44px minimum. no text under 14px on mobile. no horizontal scroll. container queries > media queries for components. adapt, don't amputate.
+
+**Accessibility:** 4.5:1 contrast for text, 3:1 for UI (WCAG AA). visible focus indicators always. semantic HTML. never use color alone as an indicator. keyboard nav with logical tab order.
+
 **Hero (H1 test):** must answer in 5 seconds — what is it, who is it for, why care, what's the CTA.
 
 **Assets:** high-res screenshots only. no fake dashboards with primary colors. no decorative non-system emojis.
 
-**Backgrounds:** add depth. gradients, patterns, mesh effects. flat = boring.
+**Backgrounds:** add depth. gradients, patterns, mesh effects. flat = boring. but no glassmorphism everywhere — that's AI slop.
 
 **Hierarchy:** 2-3 text levels max. don't mix 5 competing styles.
 
+**Visual anti-patterns:** no glassmorphism, no gradient text, no sparklines as decoration, no rounded-rect-with-colored-border, no large icons with rounded corners above headings, no hero metric layout (big number + small label), no modals unless truly necessary.
+
+## The AI Slop Test
+
+> "if you showed this to someone and said 'AI made this,' would they believe you immediately? if yes, that's the problem."
+
+Fingerprints: inter/roboto, purple-to-blue gradients, cyan-on-dark, glassmorphism, gradient text, hero metrics, identical card grids, bounce easing, dark mode with neon, sparklines as decoration, rounded rectangles with drop shadows.
+
 ## Before Shipping Checklist
 
 Run through `atris/policies/atris-design.md` "before shipping" section:
@@ -52,6 +73,10 @@ Run through `atris/policies/atris-design.md` "before shipping" section:
 - scrolling feels native?
 - hero passes H1 test (what/who/why/CTA)?
 - all assets crisp?
+- all interactive elements have all states (hover/focus/active/disabled/loading/error)?
+- WCAG AA contrast (4.5:1 text, 3:1 UI)?
+- works on mobile (44px touch targets, no horizontal scroll, readable text)?
+- respects `prefers-reduced-motion`?
 - would a designer clock this as ai-generated?
 
 ## Atris Commands

package/bin/atris.js

@@ -251,11 +251,12 @@ function showHelp() {
   console.log('  console    - Start/attach always-on coding console (tmux daemon)');
   console.log('  agent      - Select which Atris agent to use');
   console.log('  chat       - Chat with the selected Atris agent');
-  console.log('  login      - Authenticate (use --token <t> for non-interactive)');
-  console.log('  logout     - Remove credentials');
-  console.log('  whoami     - Show auth status');
-  console.log('  switch     - Switch account (atris switch <name>)');
-  console.log('  accounts   - List saved accounts');
+  console.log('  login      - Sign in or add another account');
+  console.log('  logout     - Sign out of current account');
+  console.log('  whoami     - Show active account');
+  console.log('  switch     - Switch account globally (atris switch <name>)');
+  console.log('  use        - Set account for this terminal only (atris use <name>)');
+  console.log('  accounts   - Manage accounts (list, add, remove)');
   console.log('');
   console.log('Integrations:');
   console.log('  gmail      - Email commands (inbox, read)');
@@ -384,8 +385,8 @@ const { planAtris: planCmd, doAtris: doCmd, reviewAtris: reviewCmd } = require('
 
 // Check if this is a known command or natural language input
 const knownCommands = ['init', 'log', 'status', 'analytics', 'visualize', 'brainstorm', 'autopilot', 'run', 'plan', 'do', 'review',
-                       'activate', 'agent', 'chat', 'console', 'login', 'logout', 'whoami', 'switch', 'accounts', 'update', 'upgrade', 'version', 'help', 'next', 'atris',
-                       'clean', 'verify', 'search', 'skill', 'member', 'plugin', 'experiments', 'pull', 'sync',
+                       'activate', 'agent', 'chat', 'console', 'login', 'logout', 'whoami', 'switch', 'use', 'accounts', '_resolve', '_profile-email', 'shell-init', 'update', 'upgrade', 'version', 'help', 'next', 'atris',
+                       'clean', 'verify', 'search', 'skill', 'member', 'plugin', 'experiments', 'pull', 'push', 'business', 'sync',
                        'gmail', 'calendar', 'twitter', 'slack', 'integrations'];
 
 // Check if command is an atris.md spec file - triggers welcome visualization
@@ -725,8 +726,18 @@ if (command === 'init') {
   require('../commands/auth').whoamiAtris();
 } else if (command === 'switch') {
   require('../commands/auth').switchAccount();
+} else if (command === 'use') {
+  require('../commands/auth').useAccount();
 } else if (command === 'accounts') {
-  require('../commands/auth').listAccountsCmd();
+  require('../commands/auth').accountsCmd();
+} else if (command === '_resolve') {
+  // Hidden: resolve a profile name query → print exact profile name
+  require('../commands/auth').resolveProfile();
+} else if (command === '_profile-email') {
+  // Hidden: print email for a profile name
+  require('../commands/auth').profileEmail();
+} else if (command === 'shell-init') {
+  require('../commands/auth').shellInit();
 } else if (command === 'visualize') {
   console.log('ℹ️  "atris visualize" is a legacy helper. Visualization is now built into "atris plan".');
   console.log('   Prefer: atris plan');

package/commands/auth.js

@@ -1,4 +1,4 @@
-const { loadCredentials, saveCredentials, deleteCredentials, getCredentialsPath, openBrowser, promptUser, displayAccountSummary, loadProfile, listProfiles, profileNameFromEmail } = require('../utils/auth');
+const { loadCredentials, saveCredentials, deleteCredentials, getCredentialsPath, openBrowser, promptUser, displayAccountSummary, loadProfile, listProfiles, profileNameFromEmail, deleteProfile, getTerminalSessionId, setSessionProfile, getSessionProfile, clearSessionProfile, cleanStaleSessions } = require('../utils/auth');
 const { getAppBaseUrl, apiRequestJson } = require('../utils/api');
 const fs = require('fs');
 const path = require('path');
@@ -11,8 +11,6 @@ async function loginAtris(options = {}) {
   const directToken = tokenIndex !== -1 ? args[tokenIndex + 1] : options.token;
 
   try {
-    console.log('🔐 Login to AtrisOS\n');
-
     const existing = loadCredentials();
 
     // Direct token mode (non-interactive)
@@ -30,13 +28,24 @@ async function loginAtris(options = {}) {
     }
 
     if (existing && !forceFlag) {
-      const label = existing.email || existing.user_id || 'unknown user';
-      console.log(`Already logged in as: ${label}`);
-      const confirm = await promptUser('Do you want to login again? (y/N): ');
-      if (confirm.toLowerCase() !== 'y') {
-        console.log('Login cancelled.');
+      const label = existing.email || existing.user_id || 'unknown';
+      const profiles = listProfiles();
+      console.log(`Currently signed in as: ${label}`);
+      if (profiles.length > 1) {
+        console.log(`${profiles.length} accounts saved. Use "atris switch" to change.\n`);
+      }
+      console.log('  1. Add another account');
+      console.log('  2. Re-login to current account');
+      console.log('  3. Cancel\n');
+
+      const choice = await promptUser('Choice (1-3): ');
+      if (choice === '3' || (!choice)) {
+        console.log('Cancelled.');
         process.exit(0);
       }
+      // Both 1 and 2 proceed to OAuth — the difference is just the prompt
+    } else if (!existing) {
+      console.log('Welcome to Atris! Let\'s get you signed in.\n');
     }
 
     console.log('Choose login method:');
@@ -44,21 +53,20 @@ async function loginAtris(options = {}) {
     console.log('  2. Paste existing API token');
     console.log('  3. Cancel');
 
-    const choice = await promptUser('\nEnter choice (1-3): ');
+    const methodChoice = await promptUser('\nEnter choice (1-3): ');
 
-    if (choice === '1') {
+    if (methodChoice === '1') {
       const loginUrl = `${getAppBaseUrl()}/auth/cli`;
-      console.log('\n🌐 Opening browser for OAuth login…');
-      console.log('If it does not open automatically, visit:');
-      console.log(loginUrl);
-      console.log('\nAfter signing in, copy the CLI code shown in the browser and paste it below.');
-      console.log('Codes expire after five minutes.\n');
+      console.log('\nOpening browser…');
+      console.log('If it doesn\'t open, visit:');
+      console.log(`  ${loginUrl}\n`);
+      console.log('After signing in, paste the CLI code shown in the browser.\n');
 
       openBrowser(loginUrl);
 
-      const code = await promptUser('Paste the CLI code here: ');
+      const code = await promptUser('CLI code: ');
       if (!code) {
-        console.error('✗ Error: Code is required');
+        console.error('Error: Code is required.');
         process.exit(1);
       }
 
@@ -68,7 +76,7 @@ async function loginAtris(options = {}) {
       });
 
       if (!exchange.ok || !exchange.data) {
-        console.error(`✗ Error: ${exchange.error || 'Invalid or expired code'}`);
+        console.error(`Error: ${exchange.error || 'Invalid or expired code'}`);
         process.exit(1);
       }
 
@@ -77,49 +85,47 @@ async function loginAtris(options = {}) {
       const refreshToken = payload.refresh_token;
 
       if (!token || !refreshToken) {
-        console.error('✗ Error: Backend did not return tokens. Please try again.');
+        console.error('Error: Backend did not return tokens. Try again.');
         process.exit(1);
       }
 
-      const email = payload.email || existing?.email || null;
-      const userId = payload.user_id || existing?.user_id || null;
+      const email = payload.email || null;
+      const userId = payload.user_id || null;
       const provider = payload.provider || 'atris';
 
       saveCredentials(token, refreshToken, email, userId, provider);
-      console.log('\n✓ Successfully logged in!');
+      const name = profileNameFromEmail(email);
+      console.log(`\n✓ Signed in as ${email || 'unknown'}${name ? ` (profile: ${name})` : ''}`);
       await displayAccountSummary(apiRequestJson);
-      console.log('\nYou can now use cloud features with atris commands.');
       process.exit(0);
-    } else if (choice === '2') {
-      console.log('\n📋 Manual Token Entry');
-      console.log('Get your token from: https://atris.ai/auth/cli\n');
+    } else if (methodChoice === '2') {
+      console.log('\nGet your token from: https://atris.ai/auth/cli\n');
 
-      const tokenInput = await promptUser('Paste your API token: ');
+      const tokenInput = await promptUser('API token: ');
 
       if (!tokenInput) {
-        console.error('✗ Error: Token is required');
+        console.error('Error: Token is required.');
         process.exit(1);
       }
 
       const trimmed = tokenInput.trim();
       saveCredentials(trimmed, null, existing?.email || null, existing?.user_id || null, existing?.provider || 'manual');
-      console.log('\nAttempting to validate token…\n');
+      console.log('\nValidating…\n');
 
       const summary = await displayAccountSummary(apiRequestJson);
       if (summary.error) {
-        console.log('\n⚠️ Token saved, but validation failed. You may need to relogin.');
+        console.log('\n⚠️ Token saved, but validation failed.');
       } else {
-        console.log('\n✓ Token validated successfully.');
+        console.log('\n✓ Token validated.');
       }
 
-      console.log('\nYou can now use cloud features with atris commands.');
       process.exit(0);
     } else {
-      console.log('Login cancelled.');
+      console.log('Cancelled.');
       process.exit(0);
     }
   } catch (error) {
-    console.error(`\n✗ Login failed: ${error.message || error}`);
+    console.error(`\nLogin failed: ${error.message || error}`);
     process.exit(1);
   }
 }
@@ -128,39 +134,52 @@ function logoutAtris() {
   const credentials = loadCredentials();
 
   if (!credentials) {
-    console.log('Not currently logged in.');
+    console.log('Not signed in.');
     process.exit(0);
   }
 
+  const profiles = listProfiles();
+  const currentName = profileNameFromEmail(credentials?.email);
+
   deleteCredentials();
-  console.log('✓ Successfully logged out');
-  console.log(`✓ Removed credentials from ${getCredentialsPath()}`);
+  console.log(`✓ Signed out from ${credentials.email || 'current account'}`);
+
+  // Remind about other profiles
+  const remaining = profiles.filter(p => p !== currentName);
+  if (remaining.length > 0) {
+    console.log(`\n${remaining.length} other account${remaining.length > 1 ? 's' : ''} saved.`);
+    console.log(`Switch to one: atris switch ${remaining[0]}`);
+    console.log('Or remove all: atris accounts remove --all');
+  }
 }
 
 async function whoamiAtris() {
   const { apiRequestJson } = require('../utils/api');
-  
+
   try {
     const summary = await displayAccountSummary(apiRequestJson);
     if (summary.error) {
-      console.log('\nRun "atris login" to authenticate with AtrisOS.');
+      console.log('\nRun "atris login" to sign in.');
       process.exit(1);
     }
     process.exit(0);
   } catch (error) {
-    console.error(`✗ Failed to fetch account details: ${error.message || error}`);
+    console.error(`Failed to fetch account: ${error.message || error}`);
     process.exit(1);
   }
 }
 
 async function switchAccount() {
   const args = process.argv.slice(3);
+  const globalFlag = args.includes('--global') || args.includes('-g');
   const targetName = args.filter(a => !a.startsWith('-'))[0];
 
+  // Clean up stale session files in the background
+  cleanStaleSessions();
+
   const profiles = listProfiles();
   if (profiles.length === 0) {
-    console.log('No saved profiles. Log in with different accounts to create profiles.');
-    console.log('Profiles are auto-saved on login.');
+    console.log('No saved accounts. Run "atris login" to add one.');
     process.exit(1);
   }
 
@@ -173,39 +192,50 @@ async function switchAccount() {
     profiles.forEach((name, i) => {
       const profile = loadProfile(name);
       const email = profile?.email || 'unknown';
-      const marker = name === currentName ? ' (active)' : '';
+      const marker = name === currentName ? '  ← active' : '';
       console.log(`  ${i + 1}. ${name} — ${email}${marker}`);
     });
-    console.log(`  ${profiles.length + 1}. Cancel`);
+    console.log(`  ${profiles.length + 1}. Add new account`);
+    console.log(`  ${profiles.length + 2}. Cancel`);
 
-    const choice = await promptUser(`\nEnter choice (1-${profiles.length + 1}): `);
+    const choice = await promptUser(`\nChoice (1-${profiles.length + 2}): `);
     const idx = parseInt(choice, 10) - 1;
 
+    if (idx === profiles.length) {
+      // Add new account
+      return loginAtris({ force: true });
+    }
+
     if (isNaN(idx) || idx < 0 || idx >= profiles.length) {
       console.log('Cancelled.');
       process.exit(0);
     }
 
     const chosen = profiles[idx];
-    return activateProfile(chosen, currentName);
+    return activateProfile(chosen, currentName, { global: globalFlag });
   }
 
   // Direct: atris switch <name>
-  // Fuzzy match: allow partial names
-  const exact = profiles.find(p => p === targetName);
-  const partial = !exact ? profiles.find(p => p.startsWith(targetName)) : null;
-  const match = exact || partial;
+  // Fuzzy match: exact → startsWith → substring → email substring
+  const q = targetName.toLowerCase();
+  const match = profiles.find(p => p.toLowerCase() === q)
+    || profiles.find(p => p.toLowerCase().startsWith(q))
+    || profiles.find(p => p.toLowerCase().includes(q))
+    || profiles.find(p => {
+      const profile = loadProfile(p);
+      return profile?.email?.toLowerCase().includes(q);
+    });
 
   if (!match) {
-    console.error(`Profile "${targetName}" not found.`);
+    console.error(`No account matching "${targetName}".`);
     console.log(`Available: ${profiles.join(', ')}`);
     process.exit(1);
   }
 
-  return activateProfile(match, currentName);
+  return activateProfile(match, currentName, { global: globalFlag });
 }
 
-function activateProfile(name, currentName) {
+function activateProfile(name, currentName, { global = false } = {}) {
   if (name === currentName) {
     console.log(`Already on "${name}".`);
     process.exit(0);
@@ -213,37 +243,257 @@ function activateProfile(name, currentName) {
 
   const profile = loadProfile(name);
   if (!profile || !profile.token) {
-    console.error(`Profile "${name}" is corrupted. Login again to fix it.`);
+    console.error(`Profile "${name}" is corrupted. Run "atris login" to fix.`);
     process.exit(1);
   }
 
-  // Copy profile to credentials.json
-  const credentialsPath = getCredentialsPath();
-  fs.writeFileSync(credentialsPath, JSON.stringify(profile, null, 2));
-  try { fs.chmodSync(credentialsPath, 0o600); } catch {}
+  if (global || !getTerminalSessionId()) {
+    // Global switch — write to credentials.json (affects all terminals)
+    const credentialsPath = getCredentialsPath();
+    fs.writeFileSync(credentialsPath, JSON.stringify(profile, null, 2));
+    try { fs.chmodSync(credentialsPath, 0o600); } catch {}
+    console.log(`Switched to ${profile.email || name} (global — all terminals)`);
+  } else {
+    // Per-terminal switch — write session file (only this terminal)
+    setSessionProfile(name);
+    console.log(`Switched to ${profile.email || name}`);
+  }
+}
+
+function useAccount() {
+  const args = process.argv.slice(3);
+  const targetName = args.filter(a => !a.startsWith('-'))[0];
+
+  if (!targetName) {
+    // Show current per-terminal override or global
+    const envProfile = process.env.ATRIS_PROFILE;
+    if (envProfile) {
+      const profile = loadProfile(envProfile);
+      const email = profile?.email || envProfile;
+      console.log(`This terminal: ${email} (ATRIS_PROFILE=${envProfile})`);
+    } else {
+      const current = loadCredentials();
+      if (current) {
+        console.log(`Global: ${current.email || 'unknown'} (no per-terminal override)`);
+      } else {
+        console.log('Not signed in.');
+      }
+    }
+    console.log('\nSet per-terminal account:');
+    console.log('  eval "$(atris use <name>)"');
+    console.log('\nOr manually:');
+    console.log('  export ATRIS_PROFILE=<name>');
+    process.exit(0);
+  }
+
+  // Fuzzy match the profile
+  const profiles = listProfiles();
+  const q = targetName.toLowerCase();
+  const match = profiles.find(p => p.toLowerCase() === q)
+    || profiles.find(p => p.toLowerCase().startsWith(q))
+    || profiles.find(p => p.toLowerCase().includes(q))
+    || profiles.find(p => {
+      const profile = loadProfile(p);
+      return profile?.email?.toLowerCase().includes(q);
+    });
+
+  if (!match) {
+    console.error(`No account matching "${targetName}".`);
+    console.error(`Available: ${profiles.join(', ')}`);
+    process.exit(1);
+  }
 
-  console.log(`Switched to "${name}" (${profile.email || 'unknown'})`);
+  const profile = loadProfile(match);
+  const email = profile?.email || match;
+
+  // If stdout is piped (eval mode), output just the export
+  if (!process.stdout.isTTY) {
+    process.stdout.write(`export ATRIS_PROFILE=${match}\n`);
+  } else {
+    // Interactive — print instructions
+    console.log(`export ATRIS_PROFILE=${match}`);
+    console.log(`\n# Run this to activate ${email} in this terminal:`);
+    console.log(`#   eval "$(atris use ${targetName})"`);
+    console.log(`# Or just copy the export line above.`);
+  }
+}
+
+async function accountsCmd() {
+  const args = process.argv.slice(3);
+  const subCmd = args[0];
+
+  if (subCmd === 'add' || subCmd === 'login') {
+    return loginAtris({ force: true });
+  }
+
+  if (subCmd === 'remove' || subCmd === 'rm') {
+    const target = args[1];
+    if (target === '--all') {
+      const profiles = listProfiles();
+      if (profiles.length === 0) {
+        console.log('No accounts to remove.');
+        process.exit(0);
+      }
+      const confirm = await promptUser(`Remove all ${profiles.length} accounts? (y/N): `);
+      if (confirm.toLowerCase() !== 'y') {
+        console.log('Cancelled.');
+        process.exit(0);
+      }
+      profiles.forEach(p => deleteProfile(p));
+      deleteCredentials();
+      console.log(`✓ Removed ${profiles.length} account(s).`);
+      process.exit(0);
+    }
+    if (!target) {
+      console.log('Usage: atris accounts remove <name>');
+      console.log('       atris accounts remove --all');
+      process.exit(1);
+    }
+    // Fuzzy match
+    const profiles = listProfiles();
+    const q = target.toLowerCase();
+    const match = profiles.find(p => p.toLowerCase() === q)
+      || profiles.find(p => p.toLowerCase().startsWith(q))
+      || profiles.find(p => p.toLowerCase().includes(q));
+    if (!match) {
+      console.error(`No account matching "${target}".`);
+      console.log(`Available: ${profiles.join(', ')}`);
+      process.exit(1);
+    }
+    const profile = loadProfile(match);
+    const email = profile?.email || 'unknown';
+    const confirm = await promptUser(`Remove ${match} (${email})? (y/N): `);
+    if (confirm.toLowerCase() !== 'y') {
+      console.log('Cancelled.');
+      process.exit(0);
+    }
+    deleteProfile(match);
+    // If this was the active account, clear credentials
+    const current = loadCredentials();
+    if (current && profileNameFromEmail(current.email) === match) {
+      deleteCredentials();
+      const remaining = listProfiles();
+      if (remaining.length > 0) {
+        console.log(`✓ Removed ${email}. No active account.`);
+        console.log(`Switch to another: atris switch ${remaining[0]}`);
+      } else {
+        console.log(`✓ Removed ${email}. No accounts remaining.`);
+        console.log('Run "atris login" to add one.');
+      }
+    } else {
+      console.log(`✓ Removed ${email}.`);
+    }
+    process.exit(0);
+  }
+
+  // Default: list accounts
+  return listAccountsCmd();
 }
 
 function listAccountsCmd() {
   const profiles = listProfiles();
   if (profiles.length === 0) {
-    console.log('No saved profiles. Profiles are auto-saved on login.');
+    console.log('No accounts saved. Run "atris login" to add one.');
     process.exit(0);
   }
 
   const current = loadCredentials();
-  const currentName = profileNameFromEmail(current?.email);
+  const currentUid = current?.user_id;
+  // Also check which profile name is active (env var or session)
+  const envProfile = process.env.ATRIS_PROFILE;
+  const sessionProfile = getSessionProfile();
 
-  console.log('Accounts:\n');
+  console.log('\n  Accounts\n');
   profiles.forEach(name => {
     const profile = loadProfile(name);
     const email = profile?.email || 'unknown';
-    const marker = name === currentName ? ' *' : '';
-    console.log(`  ${name} — ${email}${marker}`);
+    const isActive = profile?.user_id === currentUid;
+    if (isActive) {
+      console.log(`  ● ${name}  ${email}`);
+    } else {
+      console.log(`    ${name}  ${email}`);
+    }
   });
-  console.log('\n* = active');
-  console.log('\nSwitch: atris switch <name>');
+  console.log(`\n  Switch:  atris switch <name>`);
+  console.log(`  Add:     atris accounts add`);
+  console.log(`  Remove:  atris accounts remove <name>\n`);
+}
+
+function resolveProfile() {
+  // Hidden command: atris _resolve <query> → prints resolved profile name
+  const query = process.argv[3];
+  if (!query) { process.exit(1); }
+  const profiles = listProfiles();
+  const q = query.toLowerCase();
+  const match = profiles.find(p => p.toLowerCase() === q)
+    || profiles.find(p => p.toLowerCase().startsWith(q))
+    || profiles.find(p => p.toLowerCase().includes(q))
+    || profiles.find(p => {
+      const profile = loadProfile(p);
+      return profile?.email?.toLowerCase().includes(q);
+    });
+  if (match) {
+    process.stdout.write(match);
+    process.exit(0);
+  }
+  process.exit(1);
+}
+
+function profileEmail() {
+  // Hidden command: atris _profile-email <name> → prints email
+  const name = process.argv[3];
+  if (!name) { process.exit(1); }
+  const profile = loadProfile(name);
+  if (profile?.email) {
+    process.stdout.write(profile.email);
+    process.exit(0);
+  }
+  process.exit(1);
+}
+
+function shellInit() {
+  // Output shell function for per-terminal account switching
+  // Usage: eval "$(atris shell-init)"  (add to ~/.zshrc)
+  // Use array join to avoid JS template literal parsing issues with ${}
+  const lines = [
+    '# Atris per-terminal account switching',
+    '# Added by: eval "$(atris shell-init)"',
+    'atris() {',
+    '  if [[ "$1" == "switch" && -n "$2" && "$2" != "--"* ]]; then',
+    '    local _profile',
+    '    _profile=$(command atris _resolve "$2" 2>/dev/null)',
+    '    if [[ $? -eq 0 && -n "$_profile" ]]; then',
+    '      export ATRIS_PROFILE="$_profile"',
+    '      local _email',
+    '      _email=$(command atris _profile-email "$_profile" 2>/dev/null)',
+    '      echo "Switched to ${_email:-$_profile}"',
+    '    else',
+    '      echo "No account matching \'$2\'."',
+    '      command atris accounts',
+    '    fi',
+    '  elif [[ "$1" == "switch" && $# -eq 1 ]]; then',
+    '    command atris accounts',
+    '    echo ""',
+    '    printf "Switch to: "',
+    '    read _pick',
+    '    if [[ -n "$_pick" ]]; then',
+    '      local _profile',
+    '      _profile=$(command atris _resolve "$_pick" 2>/dev/null)',
+    '      if [[ $? -eq 0 && -n "$_profile" ]]; then',
+    '        export ATRIS_PROFILE="$_profile"',
+    '        local _email',
+    '        _email=$(command atris _profile-email "$_profile" 2>/dev/null)',
+    '        echo "Switched to ${_email:-$_profile}"',
+    '      else',
+    '        echo "No account matching \'$_pick\'."',
+    '      fi',
+    '    fi',
+    '  else',
+    '    command atris "$@"',
+    '  fi',
+    '}',
+  ];
+  console.log(lines.join('\n'));
 }
 
-module.exports = { loginAtris, logoutAtris, whoamiAtris, switchAccount, listAccountsCmd };
+module.exports = { loginAtris, logoutAtris, whoamiAtris, switchAccount, useAccount, accountsCmd, listAccountsCmd, resolveProfile, profileEmail, shellInit };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atris",
-  "version": "2.5.4",
+  "version": "2.6.0",
   "description": "atrisDev (atris dev) - CLI for AI coding agents. Works with Claude Code, Cursor, Windsurf. Make any codebase AI-navigable.",
   "main": "bin/atris.js",
   "bin": {

package/utils/auth.js

@@ -124,6 +124,101 @@ function getCredentialsPath() {
   return path.join(getAtrisDir(), 'credentials.json');
 }
 
+function getSessionsDir() {
+  const dir = path.join(getAtrisDir(), 'sessions');
+  if (!fs.existsSync(dir)) {
+    fs.mkdirSync(dir, { recursive: true });
+  }
+  return dir;
+}
+
+function getTerminalSessionId() {
+  // Unique per terminal window/tab — works across macOS terminals, tmux, VS Code, Ghostty
+  const envId = process.env.TERM_SESSION_ID     // macOS Terminal.app
+    || process.env.ITERM_SESSION_ID              // iTerm2
+    || process.env.TMUX_PANE                     // tmux pane
+    || process.env.WT_SESSION                    // Windows Terminal
+    || process.env.WEZTERM_PANE;                 // WezTerm
+  if (envId) return envId;
+
+  // Universal fallback: TTY device name (unique per terminal tab on macOS/Linux)
+  // Each Ghostty/iTerm/Terminal tab gets a unique /dev/ttysNNN
+  try {
+    // Method 1: check if stdin is a TTY and resolve its path
+    if (process.stdin.isTTY) {
+      const resolved = fs.realpathSync('/dev/stdin');
+      if (resolved && resolved.startsWith('/dev/tty')) return resolved;
+    }
+  } catch {}
+
+  try {
+    // Method 2: shell out to tty command
+    const { execSync } = require('child_process');
+    const tty = execSync('tty', { encoding: 'utf8', stdio: ['inherit', 'pipe', 'pipe'] }).trim();
+    if (tty && tty !== 'not a tty' && tty.startsWith('/dev/')) return tty;
+  } catch {}
+
+  return null;
+}
+
+function sanitizeSessionId(id) {
+  // Make filesystem-safe: replace non-alphanumeric with dashes, truncate
+  return id.replace(/[^a-zA-Z0-9_-]/g, '-').slice(0, 64);
+}
+
+function getSessionFilePath() {
+  const sessionId = getTerminalSessionId();
+  if (!sessionId) return null;
+  return path.join(getSessionsDir(), `${sanitizeSessionId(sessionId)}.json`);
+}
+
+function setSessionProfile(profileName) {
+  const sessionPath = getSessionFilePath();
+  if (!sessionPath) {
+    // No terminal session ID — fall back to global switch
+    return false;
+  }
+  fs.writeFileSync(sessionPath, JSON.stringify({
+    profile: profileName,
+    set_at: new Date().toISOString(),
+  }));
+  return true;
+}
+
+function getSessionProfile() {
+  const sessionPath = getSessionFilePath();
+  if (!sessionPath || !fs.existsSync(sessionPath)) return null;
+  try {
+    const data = JSON.parse(fs.readFileSync(sessionPath, 'utf8'));
+    return data.profile || null;
+  } catch {
+    return null;
+  }
+}
+
+function clearSessionProfile() {
+  const sessionPath = getSessionFilePath();
+  if (sessionPath && fs.existsSync(sessionPath)) {
+    fs.unlinkSync(sessionPath);
+  }
+}
+
+function cleanStaleSessions() {
+  // Remove session files older than 7 days
+  const dir = path.join(getAtrisDir(), 'sessions');
+  if (!fs.existsSync(dir)) return;
+  const cutoff = Date.now() - 7 * 24 * 60 * 60 * 1000;
+  try {
+    for (const f of fs.readdirSync(dir)) {
+      const fp = path.join(dir, f);
+      try {
+        const stat = fs.statSync(fp);
+        if (stat.mtimeMs < cutoff) fs.unlinkSync(fp);
+      } catch {}
+    }
+  } catch {}
+}
+
 function getProfilesDir() {
   const dir = path.join(getAtrisDir(), 'profiles');
   if (!fs.existsSync(dir)) {
@@ -205,6 +300,32 @@ function saveCredentials(token, refreshToken, email, userId, provider) {
 }
 
 function loadCredentials() {
+  // Priority: ATRIS_PROFILE env var → per-terminal session file → global credentials.json
+
+  // 1. Explicit env var override
+  const profileOverride = process.env.ATRIS_PROFILE;
+  if (profileOverride) {
+    const profile = loadProfile(profileOverride);
+    if (profile) return profile;
+    const profiles = listProfiles();
+    const q = profileOverride.toLowerCase();
+    const match = profiles.find(p => p.toLowerCase() === q)
+      || profiles.find(p => p.toLowerCase().startsWith(q))
+      || profiles.find(p => p.toLowerCase().includes(q));
+    if (match) {
+      const matched = loadProfile(match);
+      if (matched) return matched;
+    }
+  }
+
+  // 2. Per-terminal session override (set by atris switch)
+  const sessionProfile = getSessionProfile();
+  if (sessionProfile) {
+    const profile = loadProfile(sessionProfile);
+    if (profile) return profile;
+  }
+
+  // 3. Global credentials.json
   const credentialsPath = getCredentialsPath();
 
   if (!fs.existsSync(credentialsPath)) {
@@ -456,4 +577,10 @@ module.exports = {
   deleteProfile,
   profileNameFromEmail,
   autoSaveProfile,
+  // Per-terminal sessions
+  getTerminalSessionId,
+  setSessionProfile,
+  getSessionProfile,
+  clearSessionProfile,
+  cleanStaleSessions,
 };