adption login approach for the next launch

igorcosta · igorcosta · commit 697cb4358f89 · 2026-03-30T16:14:30.000+13:00
diff --git a/src/auth/ensureAuth.ts b/src/auth/ensureAuth.ts
@@ -12,48 +12,35 @@ import { showModal } from '../ui/ink/components/Modal.js';
 import packageJson from '../../package.json' with { type: 'json' };
 import type { LoadedConfig } from '../types.js';
 
-// Large FIGlet ASCII art — circles on left (lines 1-2), "Autohand Code" fills all lines
+// ASCII logo + ANSI Regular FIGlet "Autohand" — side-by-side, cross-platform
+const GAP = '     ';
 const LOGO_LINES = [
-  '◎ ◎ ◎ ◎      ___         __        __                    __   ______          __',
-  '◎ ◎ ◎ ◎     /   | __  __/ /_____  / /_  ____ _____  ____/ /  / ____/___  ____/ /__',
-  '            / /| |/ / / / __/ __ \\/ __ \\/ __ `/ __ \\/ __  /  / /   / __ \\/ __  / _ \\',
-  '           / ___ / /_/ / /_/ /_/ / / / / /_/ / / / / /_/ /  / /___/ /_/ / /_/ /  __/',
-  '          /_/  |_\\__,_/\\__/\\____/_/ /_/\\__,_/_/ /_/\\__,_/   \\____/\\____/\\__,_/\\___/',
+  '(@) (@) (@) (@)' + GAP + ' █████  ██    ██ ████████  ██████  ██   ██  █████  ███    ██ ██████',
+  '(@) (@) (@) (@)' + GAP + '██   ██ ██    ██    ██    ██    ██ ██   ██ ██   ██ ████   ██ ██   ██',
+  '               ' + GAP + '███████ ██    ██    ██    ██    ██ ███████ ███████ ██ ██  ██ ██   ██',
+  '               ' + GAP + '██   ██ ██    ██    ██    ██    ██ ██   ██ ██   ██ ██  ██ ██ ██   ██',
+  '               ' + GAP + '██   ██  ██████     ██     ██████  ██   ██ ██   ██ ██   ████ ██████',
 ];
 
+/** Total number of rendered lines. */
+const WELCOME_HEIGHT = LOGO_LINES.length;
+
 /**
- * Typewriter: circles appear column by column on both rows,
- * then the full FIGlet text reveals line by line.
+ * Typewriter: renders the logo line by line, horizontally centered.
  */
 async function typewriteWelcome(startRow: number): Promise<void> {
-  const hide = '\x1b[?25l';
-  const show = '\x1b[?25h';
-  const moveTo = (r: number, c: number) => `\x1b[${r};${c}H`;
-
-  process.stdout.write(hide);
-
-  // Phase 1: Type circles column by column (both rows at once)
-  for (let col = 0; col < 4; col++) {
-    const x = 1 + col * 2; // column position (◎ + space = 2 chars)
-    process.stdout.write(moveTo(startRow, x) + chalk.white('◎'));
-    process.stdout.write(moveTo(startRow + 1, x) + chalk.white('◎'));
-    await new Promise(r => setTimeout(r, 100));
-  }
+  const cols = process.stdout.columns || 80;
+  const maxWidth = Math.max(...LOGO_LINES.map(l => l.length));
+  const leftPad = Math.max(0, Math.floor((cols - maxWidth) / 2));
+  const pad = ' '.repeat(leftPad);
 
-  await new Promise(r => setTimeout(r, 150));
-
-  // Phase 2: Reveal the text portion of each line
+  process.stdout.write('\x1b[?25l'); // hide cursor
   for (let i = 0; i < LOGO_LINES.length; i++) {
-    const line = LOGO_LINES[i];
-    // For circle lines (0,1), only write the text part after the circles
-    const textStart = i < 2 ? 9 : 0; // circles take 9 chars "◎ ◎ ◎ ◎ "
-    const text = i < 2 ? line.slice(textStart) : line;
-    const col = i < 2 ? 10 : 1;
-    process.stdout.write(moveTo(startRow + i, col) + chalk.white(text));
-    await new Promise(r => setTimeout(r, 60));
+    process.stdout.write(`\x1b[${startRow + i};1H\x1b[2K`);
+    process.stdout.write(chalk.white(pad + LOGO_LINES[i]));
+    await new Promise(r => setTimeout(r, 70));
   }
-
-  process.stdout.write(show);
+  process.stdout.write('\x1b[?25h'); // show cursor
 }
 
 /**
@@ -148,19 +135,22 @@ async function promptLogin(config: LoadedConfig): Promise<LoadedConfig> {
     // Clear screen and position content vertically centered
     process.stdout.write('\x1b[2J\x1b[H');
 
-    // Layout: logo (5 lines) + blank + version + blank + modal (~12 lines)
-    const logoHeight = LOGO_LINES.length;
-    const contentHeight = logoHeight + 6;
+    // Layout: logo (8 lines) + blank + version + blank + modal (~12)
+    const contentHeight = WELCOME_HEIGHT + 6;
     const topPadding = Math.max(0, Math.floor((rows - contentHeight) / 2));
     const logoRow = topPadding + 1; // 1-based terminal row
 
-    // Typewriter the circles, then reveal the FIGlet text
+    // Typewriter: icon + FIGlet side-by-side
     await typewriteWelcome(logoRow);
 
-    // Position cursor below the logo for version + modal
-    process.stdout.write(`\x1b[${logoRow + logoHeight};1H`);
+    // Position cursor below the art for version + modal
+    process.stdout.write(`\x1b[${logoRow + WELCOME_HEIGHT};1H`);
+    const cols = process.stdout.columns || 80;
+    const maxWidth = Math.max(...LOGO_LINES.map(l => l.length));
+    const leftPad = Math.max(0, Math.floor((cols - maxWidth) / 2));
+    const versionPad = ' '.repeat(leftPad + Math.floor((maxWidth - version.length) / 2));
     console.log();
-    console.log(chalk.gray(`          ${version}`));
+    console.log(chalk.gray(`${versionPad}${version}`));
     console.log();
 
     const selected = await showModal({
diff --git a/src/commands/chrome.ts b/src/commands/chrome.ts
@@ -162,12 +162,7 @@ export async function chrome(ctx: ChromeCommandContext, args: string[] = []): Pr
 
     case 'reconnect': {
       await nativeHostReady;
-      await openChromeContinuation(
-        buildChromeOpenUrl({ extensionId, installUrl: ctx.config?.chrome?.installUrl }),
-        ctx.config?.chrome?.browser ?? 'auto',
-        { userDataDir: ctx.config?.chrome?.userDataDir, profileDirectory: ctx.config?.chrome?.profileDirectory },
-      );
-      return `${chalk.green('✓')} Native messaging host reinstalled.`;
+      return `${chalk.green('✓')} Native messaging host reinstalled. Open the Chrome side panel manually if needed.`;
     }
   }
 
diff --git a/src/commands/logout.ts b/src/commands/logout.ts
@@ -17,7 +17,7 @@ export const metadata = {
   implemented: true,
 };
 
-type LogoutContext = Pick<SlashCommandContext, 'config'>;
+type LogoutContext = Pick<SlashCommandContext, 'config' | 'currentSession'>;
 
 export async function logout(ctx: LogoutContext): Promise<string | null> {
   const config = ctx.config as LoadedConfig;
@@ -53,6 +53,11 @@ export async function logout(ctx: LogoutContext): Promise<string | null> {
     // Server logout failed, but we still clear local token
   }
 
+  // Save current session before clearing auth
+  if (ctx.currentSession) {
+    await ctx.currentSession.save();
+  }
+
   // Clear auth from config
   const updatedConfig: LoadedConfig = {
     ...config,
@@ -66,5 +71,6 @@ export async function logout(ctx: LogoutContext): Promise<string | null> {
   console.log(chalk.gray('Your local session has been cleared.'));
   console.log();
 
-  return null;
+  // Login is enforced — exit the app after logout
+  process.exit(0);
 }
diff --git a/src/core/slashCommandHandler.ts b/src/core/slashCommandHandler.ts
@@ -225,7 +225,7 @@ export class SlashCommandHandler {
           const { logout } = await import('../commands/logout.js');
           this.ctx.onBeforeModal?.();
           try {
-            return await logout({ config: this.ctx.config });
+            return await logout({ config: this.ctx.config, currentSession: this.ctx.currentSession });
           } finally {
             this.ctx.onAfterModal?.();
           }
diff --git a/src/ui/inputPrompt.ts b/src/ui/inputPrompt.ts
@@ -2689,8 +2689,11 @@ function renderPromptLine(
       readline.clearLine(output, 0);
     }
 
-    // Move down, clearing remaining content + below + help panel + status + slash suggestions
-    const downCount = prevContentLines + PROMPT_LINES_BELOW_INPUT + lastRenderedHelpLines + STATUS_LINE_COUNT + lastRenderedSlashLines;
+    // Move down, clearing remaining content + below + help panel + status + slash suggestions.
+    // Use the larger of old/new line counts so shrinking (e.g. backspace reducing
+    // wrapped lines) still clears the full previous footprint.
+    const clearContentLines = Math.max(prevContentLines, state.lineCount);
+    const downCount = clearContentLines + PROMPT_LINES_BELOW_INPUT + lastRenderedHelpLines + STATUS_LINE_COUNT + lastRenderedSlashLines;
     for (let i = 0; i < downCount; i++) {
       readline.moveCursor(output, 0, 1);
       readline.clearLine(output, 0);
diff --git a/tests/commands/auth.spec.ts b/tests/commands/auth.spec.ts
@@ -245,7 +245,7 @@ describe('logout command', () => {
     expect(consoleOutput.some((line) => line.includes('cancelled'))).toBe(true);
   });
 
-  it('clears auth on confirmed logout', async () => {
+  it('clears auth, saves session, and exits on confirmed logout', async () => {
     const mockConfig: LoadedConfig = {
       configPath: '/home/user/.autohand/config.json',
       auth: {
@@ -254,27 +254,62 @@ describe('logout command', () => {
       },
     };
 
+    const mockSession = { save: vi.fn().mockResolvedValue(undefined) };
     const mockAuthClient = {
       logout: vi.fn().mockResolvedValue(undefined),
     };
+    const exitSpy = vi.spyOn(process, 'exit').mockImplementation(() => undefined as never);
 
     mockShowModal.mockResolvedValue({ value: 'yes' });
     (getAuthClient as ReturnType<typeof vi.fn>).mockReturnValue(mockAuthClient);
     (saveConfig as ReturnType<typeof vi.fn>).mockResolvedValue(undefined);
 
     const { logout } = await import('../../src/commands/logout.js');
-    await logout({ config: mockConfig });
+    await logout({ config: mockConfig, currentSession: mockSession as any });
 
     expect(mockAuthClient.logout).toHaveBeenCalledWith('existing-token');
+    expect(mockSession.save).toHaveBeenCalled();
     expect(saveConfig).toHaveBeenCalledWith(
       expect.objectContaining({
         auth: undefined,
       })
     );
     expect(consoleOutput.some((line) => line.includes('Successfully logged out'))).toBe(true);
+    expect(exitSpy).toHaveBeenCalledWith(0);
+
+    exitSpy.mockRestore();
   });
 
-  it('clears local auth even if server logout fails', async () => {
+  it('exits even without an active session', async () => {
+    const mockConfig: LoadedConfig = {
+      configPath: '/home/user/.autohand/config.json',
+      auth: {
+        token: 'existing-token',
+        user: { id: 'user-1', email: 'test@example.com', name: 'Test User' },
+      },
+    };
+
+    const mockAuthClient = {
+      logout: vi.fn().mockResolvedValue(undefined),
+    };
+    const exitSpy = vi.spyOn(process, 'exit').mockImplementation(() => undefined as never);
+
+    mockShowModal.mockResolvedValue({ value: 'yes' });
+    (getAuthClient as ReturnType<typeof vi.fn>).mockReturnValue(mockAuthClient);
+    (saveConfig as ReturnType<typeof vi.fn>).mockResolvedValue(undefined);
+
+    const { logout } = await import('../../src/commands/logout.js');
+    await logout({ config: mockConfig });
+
+    expect(saveConfig).toHaveBeenCalledWith(
+      expect.objectContaining({ auth: undefined })
+    );
+    expect(exitSpy).toHaveBeenCalledWith(0);
+
+    exitSpy.mockRestore();
+  });
+
+  it('clears local auth and exits even if server logout fails', async () => {
     const mockConfig: LoadedConfig = {
       configPath: '/home/user/.autohand/config.json',
       auth: {
@@ -286,6 +321,7 @@ describe('logout command', () => {
     const mockAuthClient = {
       logout: vi.fn().mockRejectedValue(new Error('Network error')),
     };
+    const exitSpy = vi.spyOn(process, 'exit').mockImplementation(() => undefined as never);
 
     mockShowModal.mockResolvedValue({ value: 'yes' });
     (getAuthClient as ReturnType<typeof vi.fn>).mockReturnValue(mockAuthClient);
@@ -301,6 +337,9 @@ describe('logout command', () => {
       })
     );
     expect(consoleOutput.some((line) => line.includes('Successfully logged out'))).toBe(true);
+    expect(exitSpy).toHaveBeenCalledWith(0);
+
+    exitSpy.mockRestore();
   });
 });
 

Original file line number	Diff line number	Diff line change
`@@ -162,12 +162,7 @@ export async function chrome(ctx: ChromeCommandContext, args: string[] = []): Pr`
`162`	`162`
`163`	`163`	`case 'reconnect': {`
`164`	`164`	`await nativeHostReady;`
`165`		`- await openChromeContinuation(`
`166`		`- buildChromeOpenUrl({ extensionId, installUrl: ctx.config?.chrome?.installUrl }),`
`167`		`- ctx.config?.chrome?.browser ?? 'auto',`
`168`		`- { userDataDir: ctx.config?.chrome?.userDataDir, profileDirectory: ctx.config?.chrome?.profileDirectory },`
`169`		`- );`
`170`		- return `${chalk.green('✓')} Native messaging host reinstalled.`;
	`165`	+ return `${chalk.green('✓')} Native messaging host reinstalled. Open the Chrome side panel manually if needed.`;
`171`	`166`	`}`
`172`	`167`	`}`
`173`	`168`
Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ export class SlashCommandHandler {`
`225`	`225`	`const { logout } = await import('../commands/logout.js');`
`226`	`226`	`this.ctx.onBeforeModal?.();`
`227`	`227`	`try {`
`228`		`- return await logout({ config: this.ctx.config });`
	`228`	`+ return await logout({ config: this.ctx.config, currentSession: this.ctx.currentSession });`
`229`	`229`	`} finally {`
`230`	`230`	`this.ctx.onAfterModal?.();`
`231`	`231`	`}`