diff --git a/.gitignore b/.gitignore
index eaa2055..74bdba0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # IDE
 .idea
 .vscode
+.claude
 
 # Dependencies
 node_modules/
diff --git a/src/cli/commands/sessions.ts b/src/cli/commands/sessions.ts
index 0a82af4..781939b 100644
--- a/src/cli/commands/sessions.ts
+++ b/src/cli/commands/sessions.ts
@@ -457,7 +457,7 @@ export async function listSessionsAndAuthProfiles(options: {
       console.log(chalk.bold('No OAuth profiles.'));
       console.log(chalk.dim('  ↳ run: mcpc login mcp.example.com'));
     } else {
-      console.log(chalk.bold('Available OAuth profiles:'));
+      console.log(chalk.bold('Saved OAuth profiles:'));
       for (const profile of profiles) {
         const hostStr = getServerHost(profile.serverUrl);
         const nameStr = chalk.magenta(profile.name);
diff --git a/src/cli/index.ts b/src/cli/index.ts
index e0d62f8..8091ec2 100644
--- a/src/cli/index.ts
+++ b/src/cli/index.ts
@@ -343,8 +343,8 @@ function createTopLevelProgram(): Command {
     `
 ${chalk.bold('MCP session commands (after connecting):')}
   <@session>                   Show MCP server info and capabilities
-  <@session> ${chalk.cyan('tools-list')}        List MCP tools
-  <@session> ${chalk.cyan('tools-get')} <name>
+  <@session> ${chalk.cyan('tools-list')}        List MCP server tools
+  <@session> ${chalk.cyan('tools-get')} <name>  Get tool details and schema
   <@session> ${chalk.cyan('tools-call')} <name> [arg:=val ... | <json> | <stdin]
   <@session> ${chalk.cyan('prompts-list')}
   <@session> ${chalk.cyan('prompts-get')} <name> [arg:=val ... | <json> | <stdin]
diff --git a/src/cli/output.ts b/src/cli/output.ts
index a61e300..ef8a799 100644
--- a/src/cli/output.ts
+++ b/src/cli/output.ts
@@ -464,7 +464,7 @@ function formatToolsSummary(tools: Tool[]): string[] {
   const lines: string[] = [];
 
   // Header with tool count
-  lines.push(chalk.bold(`Available tools (${tools.length}):`));
+  lines.push(chalk.bold(`Tools (${tools.length}):`));
 
   // Summary list of tools
   const bullet = chalk.dim('*');
@@ -497,7 +497,7 @@ function formatToolsCompact(tools: Tool[], options?: FormatOptions): string {
   const session = options?.sessionName ? `${options.sessionName} ` : '';
   lines.push('');
   lines.push(
-    `For full tool details, run \`mcpc ${session}tools-list --full\` or \`mcpc ${session}tools-get <name>\``
+    `For full tool details and schema, run \`mcpc ${session}tools-list --full\` or \`mcpc ${session}tools-get <name>\``
   );
 
   return lines.join('\n');
@@ -570,7 +570,7 @@ export function formatResources(resources: Resource[]): string {
   const lines: string[] = [];
 
   // Header with resource count
-  lines.push(chalk.bold(`Available resources (${resources.length}):`));
+  lines.push(chalk.bold(`Resources (${resources.length}):`));
 
   // Summary list of resources
   const bullet = chalk.dim('*');
@@ -627,7 +627,7 @@ export function formatResourceTemplates(templates: ResourceTemplate[]): string {
   const lines: string[] = [];
 
   // Header with template count
-  lines.push(chalk.bold(`Available resource templates (${templates.length}):`));
+  lines.push(chalk.bold(`Resource templates (${templates.length}):`));
 
   // Summary list of templates
   const bullet = chalk.dim('*');
@@ -684,7 +684,7 @@ export function formatPrompts(prompts: Prompt[]): string {
   const lines: string[] = [];
 
   // Header with prompt count
-  lines.push(chalk.bold(`Available prompts (${prompts.length}):`));
+  lines.push(chalk.bold(`Prompts (${prompts.length}):`));
 
   // Summary list of prompts
   const bullet = chalk.dim('*');
@@ -1145,6 +1145,21 @@ export function formatServerDetails(
   }
   lines.push('');
 
+  // Tools list (from bridge cache, no extra server call)
+  if (tools && tools.length > 0) {
+    lines.push(formatToolsCompact(tools, { sessionName: target }));
+    lines.push('');
+  }
+
+  // Instructions in code block
+  const trimmed = instructions ? instructions.trim() : '';
+  if (trimmed) {
+    lines.push(chalk.bold('Instructions:'));
+    lines.push(chalk.gray('````'));
+    lines.push(trimmed);
+    lines.push(chalk.gray('````'));
+  }
+
   // Commands
   lines.push(chalk.bold('Available commands:'));
   const commands: string[] = [];
@@ -1184,20 +1199,5 @@ export function formatServerDetails(
   lines.push(commands.join('\n'));
   lines.push('');
 
-  // Tools list (from bridge cache, no extra server call)
-  if (tools && tools.length > 0) {
-    lines.push(formatToolsCompact(tools, { sessionName: target }));
-    lines.push('');
-  }
-
-  // Instructions in code block
-  const trimmed = instructions ? instructions.trim() : '';
-  if (trimmed) {
-    lines.push(chalk.bold('Instructions:'));
-    lines.push(chalk.gray('````'));
-    lines.push(trimmed);
-    lines.push(chalk.gray('````'));
-  }
-
   return lines.join('\n');
 }