sqlsaber 0.29.1__tar.gz → 0.30.0__tar.gz

{sqlsaber-0.29.1 → sqlsaber-0.30.0}/AGENT.md

@@ -11,9 +11,8 @@
 ## Architecture
 
 - **CLI App**: Agentic SQL assistant for natural language to SQL
-- **Core modules**: `agents/` (AI logic), `cli/` (commands), `database/` (connections), `mcp/` (Model Context Protocol server)
+- **Core modules**: `agents/` (AI logic), `cli/` (commands), `database/` (connections)
 - **Database support**: PostgreSQL, SQLite, MySQL via asyncpg/aiosqlite/aiomysql
-- **MCP integration**: Exposes tools via `sqlsaber-mcp` for Claude Code and other MCP clients
 
 ## Code Style
 

{sqlsaber-0.29.1 → sqlsaber-0.30.0}/CLAUDE.md

@@ -9,9 +9,8 @@
 ## Architecture
 
 - **CLI App**: Agentic SQL assistant for natural language to SQL
-- **Core modules**: `agents/` (AI logic), `cli/` (commands), `database/` (connections), `mcp/` (Model Context Protocol server)
+- **Core modules**: `agents/` (AI logic), `cli/` (commands), `database/` (connections)
 - **Database support**: PostgreSQL, SQLite, MySQL via asyncpg/aiosqlite/aiomysql
-- **MCP integration**: Exposes tools via `sqlsaber-mcp` for Claude Code and other MCP clients
 
 ## Code Style
 

{sqlsaber-0.29.1 → sqlsaber-0.30.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlsaber
-Version: 0.29.1
+Version: 0.30.0
 Summary: SQLsaber - Open-source agentic SQL assistant
 License-File: LICENSE
 Requires-Python: >=3.12
@@ -9,7 +9,6 @@ Requires-Dist: aiosqlite>=0.21.0
 Requires-Dist: asyncpg>=0.30.0
 Requires-Dist: cyclopts>=3.22.1
 Requires-Dist: duckdb>=0.9.2
-Requires-Dist: fastmcp>=2.9.0
 Requires-Dist: httpx>=0.28.1
 Requires-Dist: keyring>=25.6.0
 Requires-Dist: platformdirs>=4.0.0
@@ -44,10 +43,7 @@ Ask your questions in natural language and `sqlsaber` will gather the right cont
   - [Resume Past Conversation](#resume-past-conversation)
   - [Database Selection](#database-selection)
 - [Examples](#examples)
-- [MCP Server Integration](#mcp-server-integration)
-  - [Starting the MCP Server](#starting-the-mcp-server)
-  - [Configuring MCP Clients](#configuring-mcp-clients)
-  - [Available MCP Tools](#available-mcp-tools)
+
 - [How It Works](#how-it-works)
 - [Contributing](#contributing)
 - [License](#license)
@@ -60,7 +56,7 @@ Ask your questions in natural language and `sqlsaber` will gather the right cont
 - Interactive REPL mode
 - Conversation threads (store, display, and resume conversations)
 - Support for PostgreSQL, MySQL, SQLite, DuckDB, and CSVs
-- MCP (Model Context Protocol) server support
+
 - Extended thinking mode for select models (Anthropic, OpenAI, Google, Groq)
 - Beautiful formatted output
 
@@ -220,43 +216,6 @@ saber "show me orders with customer details for this week"
 saber "which products had the highest sales growth last quarter?"
 ```
 
-## MCP Server Integration
-
-SQLSaber includes an MCP (Model Context Protocol) server that allows AI agents like Claude Code to directly leverage tools available in SQLSaber.
-
-### Starting the MCP Server
-
-Run the MCP server using uvx:
-
-```bash
-uvx --from sqlsaber saber-mcp
-```
-
-### Configuring MCP Clients
-
-#### Claude Code
-
-Add SQLSaber as an MCP server in Claude Code:
-
-```bash
-claude mcp add sqlsaber -- uvx --from sqlsaber saber-mcp
-```
-
-#### Other MCP Clients
-
-For other MCP clients, configure them to run the command: `uvx --from sqlsaber saber-mcp`
-
-### Available MCP Tools
-
-Once connected, the MCP client will have access to these tools:
-
-- `get_databases()` - Lists all configured databases
-- `list_tables(database)` - Get all tables in a database with row counts
-- `introspect_schema(database, table_pattern?)` - Get detailed schema information
-- `execute_sql(database, query, limit?)` - Execute SQL queries (read-only)
-
-The MCP server uses your existing SQLSaber database configurations, so make sure to set up your databases using `saber db add` first.
-
 ## How It Works
 
 SQLsaber uses a multi-step agentic process to gather the right context and execute SQL queries to answer your questions:

{sqlsaber-0.29.1 → sqlsaber-0.30.0}/README.md

@@ -22,10 +22,7 @@ Ask your questions in natural language and `sqlsaber` will gather the right cont
   - [Resume Past Conversation](#resume-past-conversation)
   - [Database Selection](#database-selection)
 - [Examples](#examples)
-- [MCP Server Integration](#mcp-server-integration)
-  - [Starting the MCP Server](#starting-the-mcp-server)
-  - [Configuring MCP Clients](#configuring-mcp-clients)
-  - [Available MCP Tools](#available-mcp-tools)
+
 - [How It Works](#how-it-works)
 - [Contributing](#contributing)
 - [License](#license)
@@ -38,7 +35,7 @@ Ask your questions in natural language and `sqlsaber` will gather the right cont
 - Interactive REPL mode
 - Conversation threads (store, display, and resume conversations)
 - Support for PostgreSQL, MySQL, SQLite, DuckDB, and CSVs
-- MCP (Model Context Protocol) server support
+
 - Extended thinking mode for select models (Anthropic, OpenAI, Google, Groq)
 - Beautiful formatted output
 
@@ -198,43 +195,6 @@ saber "show me orders with customer details for this week"
 saber "which products had the highest sales growth last quarter?"
 ```
 
-## MCP Server Integration
-
-SQLSaber includes an MCP (Model Context Protocol) server that allows AI agents like Claude Code to directly leverage tools available in SQLSaber.
-
-### Starting the MCP Server
-
-Run the MCP server using uvx:
-
-```bash
-uvx --from sqlsaber saber-mcp
-```
-
-### Configuring MCP Clients
-
-#### Claude Code
-
-Add SQLSaber as an MCP server in Claude Code:
-
-```bash
-claude mcp add sqlsaber -- uvx --from sqlsaber saber-mcp
-```
-
-#### Other MCP Clients
-
-For other MCP clients, configure them to run the command: `uvx --from sqlsaber saber-mcp`
-
-### Available MCP Tools
-
-Once connected, the MCP client will have access to these tools:
-
-- `get_databases()` - Lists all configured databases
-- `list_tables(database)` - Get all tables in a database with row counts
-- `introspect_schema(database, table_pattern?)` - Get detailed schema information
-- `execute_sql(database, query, limit?)` - Execute SQL queries (read-only)
-
-The MCP server uses your existing SQLSaber database configurations, so make sure to set up your databases using `saber db add` first.
-
 ## How It Works
 
 SQLsaber uses a multi-step agentic process to gather the right context and execute SQL queries to answer your questions:

{sqlsaber-0.29.1 → sqlsaber-0.30.0}/docs/src/content/docs/changelog.md

@@ -7,6 +7,20 @@ All notable changes to SQLsaber will be documented here.
 
 ### Unreleased
 
+---
+
+### v0.30.0 - 2025-10-07
+
+#### Removed
+
+- MCP server support and related console scripts (`saber-mcp`, `sqlsaber-mcp`)
+
+  > `sqlsaber` can still be used as a cli in coding agents like Claude Code, Codex, or Amp.
+  >
+  > Just *ask* the coding agent to invoke `sqlsaber` cli with your question.
+
+
+
 ### v0.29.1 - 2025-10-05
 
 #### Fixed

{sqlsaber-0.29.1 → sqlsaber-0.30.0}/docs/src/content/docs/guides/getting-started.mdx

@@ -94,8 +94,8 @@ SQLsaber will:
 4. Present the results and analysis
 
 <script
-  src="https://asciinema.org/a/739399.js"
-  id="asciicast-739399"
+  src="https://asciinema.org/a/39e71PIiGJetHBPy08L1TOotB.js"
+  id="asciicast-39e71PIiGJetHBPy08L1TOotB"
   async="true"
 ></script>
 

{sqlsaber-0.29.1 → sqlsaber-0.30.0}/docs/src/content/docs/index.mdx

@@ -5,7 +5,8 @@ template: splash
 hero:
   tagline: Stop fighting your database. Gather the right context automatically and get insights with a collaborative SQL agent.
   image:
-    file: ../../assets/sqlsaber-hero.svg
+    alt: "Animated SQLsaber workflow"
+    file: ../../assets/sqlsaber.gif
   actions:
     - text: Get started
       link: /installation/
@@ -25,8 +26,8 @@ import {
 } from "@astrojs/starlight/components";
 
 <script
-  src="https://asciinema.org/a/741230.js"
-  id="asciicast-741230"
+  src="https://asciinema.org/a/746773.js"
+  id="asciicast-746773"
   async="true"
 ></script>
 
@@ -61,7 +62,7 @@ import {
   </li>
   <li class="flex items-center gap-3">
     <Icon name="forward-slash" />
-    <span>MCP integration for Claude Code and other AI tools</span>
+    <span>Use as CLI in your coding agent of choice</span>
   </li>
   <li class="flex items-center gap-3">
     <Icon name="sun" />
@@ -94,10 +95,8 @@ import {
     <Code
       code={`# Install SQLsaber
 $ uv tool install sqlsaber
-\n# Add your database
-$ saber db add mydb
 \n# Start asking questions
-$ saber "what's our revenue this quarter?"`}
+$ saber`}
       lang="bash"
     />
   </div>

sqlsaber-0.30.0/docs/src/styles/global.css

@@ -0,0 +1,243 @@
+/* Fonts (must be first to satisfy PostCSS import order) */
+@import url("https://fonts.googleapis.com/css2?family=Geist+Mono:wght@100..900&family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap");
+
+@layer base, starlight, theme, components, utilities;
+@import "@astrojs/starlight-tailwind";
+@import "tailwindcss/theme.css" layer(theme);
+@import "tailwindcss/utilities.css" layer(utilities);
+
+/* Theme tokens (light) */
+:root {
+    --background: oklch(1 0 0);
+    --foreground: oklch(0.1448 0 0);
+    --card: oklch(1 0 0);
+    --card-foreground: oklch(0.1448 0 0);
+    --popover: oklch(1 0 0);
+    --popover-foreground: oklch(0.1448 0 0);
+    --primary: oklch(0.5555 0 0);
+    --primary-foreground: oklch(0.9851 0 0);
+    --secondary: oklch(0.9702 0 0);
+    --secondary-foreground: oklch(0.2046 0 0);
+    --muted: oklch(0.9702 0 0);
+    --muted-foreground: oklch(0.5486 0 0);
+    --accent: oklch(0.9702 0 0);
+    --accent-foreground: oklch(0.2046 0 0);
+    --destructive: oklch(0.583 0.2387 28.4765);
+    --destructive-foreground: oklch(0.9702 0 0);
+    --border: oklch(0.9219 0 0);
+    --input: oklch(0.9219 0 0);
+    --ring: oklch(0.709 0 0);
+    --chart-1: oklch(0.5555 0 0);
+    --chart-2: oklch(0.5555 0 0);
+    --chart-3: oklch(0.5555 0 0);
+    --chart-4: oklch(0.5555 0 0);
+    --chart-5: oklch(0.5555 0 0);
+    --sidebar: oklch(0.9851 0 0);
+    --sidebar-foreground: oklch(0.1448 0 0);
+    --sidebar-primary: oklch(0.2046 0 0);
+    --sidebar-primary-foreground: oklch(0.9851 0 0);
+    --sidebar-accent: oklch(0.9702 0 0);
+    --sidebar-accent-foreground: oklch(0.2046 0 0);
+    --sidebar-border: oklch(0.9219 0 0);
+    --sidebar-ring: oklch(0.709 0 0);
+    --font-sans: Geist Mono, monospace;
+    --font-serif: Geist Mono, monospace;
+    --font-mono: Geist Mono, monospace;
+    --radius: 0rem;
+    --shadow-2xs: 0px 1px 0px 0px hsl(0 0% 0% / 0);
+    --shadow-xs: 0px 1px 0px 0px hsl(0 0% 0% / 0);
+    --shadow-sm:
+        0px 1px 0px 0px hsl(0 0% 0% / 0), 0px 1px 2px -1px hsl(0 0% 0% / 0);
+    --shadow:
+        0px 1px 0px 0px hsl(0 0% 0% / 0), 0px 1px 2px -1px hsl(0 0% 0% / 0);
+    --shadow-md:
+        0px 1px 0px 0px hsl(0 0% 0% / 0), 0px 2px 4px -1px hsl(0 0% 0% / 0);
+    --shadow-lg:
+        0px 1px 0px 0px hsl(0 0% 0% / 0), 0px 4px 6px -1px hsl(0 0% 0% / 0);
+    --shadow-xl:
+        0px 1px 0px 0px hsl(0 0% 0% / 0), 0px 8px 10px -1px hsl(0 0% 0% / 0);
+    --shadow-2xl: 0px 1px 0px 0px hsl(0 0% 0% / 0);
+    --tracking-normal: 0em;
+    --spacing: 0.25rem;
+}
+
+/* Dark mode tokens — support common selectors used by Starlight and Tailwind */
+:root.dark,
+html.dark,
+:root[data-theme="dark"],
+html[data-theme="dark"],
+body.dark,
+body[data-theme="dark"] {
+    --background: oklch(0.1448 0 0);
+    --foreground: oklch(0.9851 0 0);
+    --card: oklch(0.2134 0 0);
+    --card-foreground: oklch(0.9851 0 0);
+    --popover: oklch(0.2686 0 0);
+    --popover-foreground: oklch(0.9851 0 0);
+    --primary: oklch(0.5555 0 0);
+    --primary-foreground: oklch(0.9851 0 0);
+    --secondary: oklch(0.2686 0 0);
+    --secondary-foreground: oklch(0.9851 0 0);
+    --muted: oklch(0.2686 0 0);
+    --muted-foreground: oklch(0.709 0 0);
+    --accent: oklch(0.3715 0 0);
+    --accent-foreground: oklch(0.9851 0 0);
+    --destructive: oklch(0.7022 0.1892 22.2279);
+    --destructive-foreground: oklch(0.2686 0 0);
+    --border: oklch(0.3407 0 0);
+    --input: oklch(0.4386 0 0);
+    --ring: oklch(0.5555 0 0);
+    --chart-1: oklch(0.5555 0 0);
+    --chart-2: oklch(0.5555 0 0);
+    --chart-3: oklch(0.5555 0 0);
+    --chart-4: oklch(0.5555 0 0);
+    --chart-5: oklch(0.5555 0 0);
+    --sidebar: oklch(0.2046 0 0);
+    --sidebar-foreground: oklch(0.9851 0 0);
+    --sidebar-primary: oklch(0.9851 0 0);
+    --sidebar-primary-foreground: oklch(0.2046 0 0);
+    --sidebar-accent: oklch(0.2686 0 0);
+    --sidebar-accent-foreground: oklch(0.9851 0 0);
+    --sidebar-border: oklch(1 0 0);
+    --sidebar-ring: oklch(0.4386 0 0);
+    --font-sans: Geist Mono, monospace;
+    --font-serif: Geist Mono, monospace;
+    --font-mono: Geist Mono, monospace;
+    --radius: 0rem;
+    --shadow-2xs: 0px 1px 0px 0px hsl(0 0% 0% / 0);
+    --shadow-xs: 0px 1px 0px 0px hsl(0 0% 0% / 0);
+    --shadow-sm:
+        0px 1px 0px 0px hsl(0 0% 0% / 0), 0px 1px 2px -1px hsl(0 0% 0% / 0);
+    --shadow:
+        0px 1px 0px 0px hsl(0 0% 0% / 0), 0px 1px 2px -1px hsl(0 0% 0% / 0);
+    --shadow-md:
+        0px 1px 0px 0px hsl(0 0% 0% / 0), 0px 2px 4px -1px hsl(0 0% 0% / 0);
+    --shadow-lg:
+        0px 1px 0px 0px hsl(0 0% 0% / 0), 0px 4px 6px -1px hsl(0 0% 0% / 0);
+    --shadow-xl:
+        0px 1px 0px 0px hsl(0 0% 0% / 0), 0px 8px 10px -1px hsl(0 0% 0% / 0);
+    --shadow-2xl: 0px 1px 0px 0px hsl(0 0% 0% / 0);
+}
+
+/* Map tokens into Tailwind theme so utilities like bg-background work */
+@theme inline {
+    --color-background: var(--background);
+    --color-foreground: var(--foreground);
+    --color-card: var(--card);
+    --color-card-foreground: var(--card-foreground);
+    --color-popover: var(--popover);
+    --color-popover-foreground: var(--popover-foreground);
+    --color-primary: var(--primary);
+    --color-primary-foreground: var(--primary-foreground);
+    --color-secondary: var(--secondary);
+    --color-secondary-foreground: var(--secondary-foreground);
+    --color-muted: var(--muted);
+    --color-muted-foreground: var(--muted-foreground);
+    --color-accent: var(--accent);
+    --color-accent-foreground: var(--accent-foreground);
+    --color-destructive: var(--destructive);
+    --color-destructive-foreground: var(--destructive-foreground);
+    --color-border: var(--border);
+    --color-input: var(--input);
+    --color-ring: var(--ring);
+    --color-chart-1: var(--chart-1);
+    --color-chart-2: var(--chart-2);
+    --color-chart-3: var(--chart-3);
+    --color-chart-4: var(--chart-4);
+    --color-chart-5: var(--chart-5);
+    --color-sidebar: var(--sidebar);
+    --color-sidebar-foreground: var(--sidebar-foreground);
+    --color-sidebar-primary: var(--sidebar-primary);
+    --color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
+    --color-sidebar-accent: var(--sidebar-accent);
+    --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
+    --color-sidebar-border: var(--sidebar-border);
+    --color-sidebar-ring: var(--sidebar-ring);
+
+    /* Accent scale for Starlight (use your accent tone across the scale) */
+    --color-accent-50: var(--accent);
+    --color-accent-100: var(--accent);
+    --color-accent-200: var(--accent);
+    --color-accent-300: var(--accent);
+    --color-accent-400: var(--accent);
+    --color-accent-500: var(--accent);
+    --color-accent-600: var(--accent);
+    --color-accent-700: var(--accent);
+    --color-accent-800: var(--accent);
+    --color-accent-900: var(--accent);
+    --color-accent-950: var(--accent);
+
+    --font-sans: var(--font-sans);
+    --font-mono: var(--font-mono);
+    --font-serif: var(--font-serif);
+
+    --radius-sm: calc(var(--radius) - 4px);
+    --radius-md: calc(var(--radius) - 2px);
+    --radius-lg: var(--radius);
+    --radius-xl: calc(var(--radius) + 4px);
+
+    --shadow-2xs: var(--shadow-2xs);
+    --shadow-xs: var(--shadow-xs);
+    --shadow-sm: var(--shadow-sm);
+    --shadow: var(--shadow);
+    --shadow-md: var(--shadow-md);
+    --shadow-lg: var(--shadow-lg);
+    --shadow-xl: var(--shadow-xl);
+    --shadow-2xl: var(--shadow-2xl);
+}
+
+/* Base rules */
+@layer base {
+    * {
+        @apply border-border outline-ring/50;
+    }
+    body {
+        @apply bg-background text-foreground;
+    }
+    /* Square buttons & form controls to match theme radius */
+    button,
+    [role="button"],
+    a[role="button"],
+    .btn,
+    .Button,
+    .link-button,
+    .sl-button,
+    input,
+    select,
+    textarea {
+        border-radius: var(--radius);
+    }
+}
+
+/* Link contrast: use accent-foreground (dark in light mode, light in dark mode) */
+@layer theme {
+    a:not([role="button"]):not(.sl-button):not(.link-button) {
+        color: var(--accent-foreground);
+    }
+    a:not([role="button"]):not(.sl-button):not(.link-button):visited {
+        color: var(--accent-foreground);
+    }
+    a:not([role="button"]):not(.sl-button):not(.link-button):hover {
+        color: var(--primary);
+    }
+}
+
+@layer components {
+    /* Expand hero "image" area so embeds like Asciinema have more room */
+    .hero > .hero-html {
+        width: min(100%, 40rem);
+        margin-inline: auto;
+    }
+
+    .hero > picture,
+    .hero > img {
+        width: min(100%, 40rem);
+        margin-inline: auto;
+    }
+
+    .hero > picture img,
+    .hero > img {
+        width: 100%;
+        height: auto;
+    }
+}

{sqlsaber-0.29.1 → sqlsaber-0.30.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sqlsaber"
-version = "0.29.1"
+version = "0.30.0"
 description = "SQLsaber - Open-source agentic SQL assistant"
 readme = "README.md"
 requires-python = ">=3.12"
@@ -15,7 +15,6 @@ dependencies = [
     "aiomysql>=0.2.0",
     "aiosqlite>=0.21.0",
     "duckdb>=0.9.2",
-    "fastmcp>=2.9.0",
     "cyclopts>=3.22.1",
     "prompt-toolkit>3.0.51",
     "sqlglot[rs]>=27.20.0",
@@ -34,5 +33,3 @@ packages = ["src/sqlsaber"]
 [project.scripts]
 sqlsaber = "sqlsaber.cli.commands:main"
 saber = "sqlsaber.cli.commands:main"
-sqlsaber-mcp = "sqlsaber.mcp.mcp:main"
-saber-mcp = "sqlsaber.mcp.mcp:main"

{sqlsaber-0.29.1 → sqlsaber-0.30.0}/src/sqlsaber/agents/base.py

@@ -61,7 +61,7 @@ class BaseSQLAgent(ABC):
     def _init_tools(self) -> None:
         """Initialize SQL tools with database connection."""
         # Get all SQL tools and set their database connection
-        for tool_name in tool_registry.list_tools(category="sql"):
+        for tool_name in tool_registry.list_tools():
             tool = tool_registry.get_tool(tool_name)
             if isinstance(tool, SQLTool):
                 tool.set_connection(self.db)

{sqlsaber-0.29.1 → sqlsaber-0.30.0}/src/sqlsaber/agents/pydantic_ai_agent.py

@@ -24,7 +24,6 @@ from sqlsaber.database import (
     SQLiteConnection,
 )
 from sqlsaber.memory.manager import MemoryManager
-from sqlsaber.tools.instructions import InstructionBuilder
 from sqlsaber.tools.registry import tool_registry
 from sqlsaber.tools.sql_tools import SQLTool
 
@@ -43,7 +42,6 @@ class SQLSaberAgent:
         self.database_name = database_name
         self.config = Config()
         self.memory_manager = memory_manager or MemoryManager()
-        self.instruction_builder = InstructionBuilder(tool_registry)
         self.db_type = self._get_database_type_name()
 
         # Thinking configuration (CLI override or config default)
@@ -61,7 +59,7 @@ class SQLSaberAgent:
 
     def _configure_sql_tools(self) -> None:
         """Ensure SQL tools receive the active database connection."""
-        for tool_name in tool_registry.list_tools(category="sql"):
+        for tool_name in tool_registry.list_tools():
             tool = tool_registry.get_tool(tool_name)
             if isinstance(tool, SQLTool):
                 tool.set_connection(self.db_connection)
@@ -165,30 +163,54 @@ class SQLSaberAgent:
         return Agent(model_obj, name="sqlsaber")
 
     def _setup_system_prompt(self, agent: Agent) -> None:
-        """Set up the dynamic system prompt for the agent."""
+        """Configure the agent's system prompt using a simple prompt string."""
         if not self.is_oauth:
 
             @agent.system_prompt(dynamic=True)
             async def sqlsaber_system_prompt(ctx: RunContext) -> str:
-                instructions = self.instruction_builder.build_instructions(
-                    db_type=self.db_type
-                )
-
-                # Add memory context if available
-                mem = ""
-                if self.database_name:
-                    mem = self.memory_manager.format_memories_for_prompt(
-                        self.database_name
-                    )
-
-                parts = [p for p in (instructions, mem) if p and p.strip()]
-                return "\n\n".join(parts) if parts else ""
+                return self.system_prompt_text(include_memory=True)
         else:
 
             @agent.system_prompt(dynamic=True)
             async def sqlsaber_system_prompt(ctx: RunContext) -> str:
+                # OAuth clients (Claude Code) ignore custom system prompts; we inject later.
                 return "You are Claude Code, Anthropic's official CLI for Claude."
 
+    def system_prompt_text(self, include_memory: bool = True) -> str:
+        """Return the original SQLSaber system prompt as a single string."""
+        db = self.db_type
+        base = (
+            f"You are a helpful SQL assistant that helps users query their {db} database.\n\n"
+            "Your responsibilities:\n"
+            "1. Understand user's natural language requests, think and convert them to SQL\n"
+            "2. Use the provided tools efficiently to explore database schema\n"
+            "3. Generate appropriate SQL queries\n"
+            "4. Execute queries safely - queries that modify the database are not allowed\n"
+            "5. Format and explain results clearly\n\n"
+            "IMPORTANT - Tool Usage Strategy:\n"
+            "1. ALWAYS start with 'list_tables' to see available tables and row counts. Use this first to discover available tables.\n"
+            "2. Use 'introspect_schema' with a table_pattern to get details ONLY for relevant tables. Use table patterns like 'sample%' or '%experiment%' to filter related tables.\n"
+            "3. Execute SQL queries safely with automatic LIMIT clauses for SELECT statements. Only SELECT queries are permitted for security.\n\n"
+            "Tool-Specific Guidelines:\n"
+            "- introspect_schema: Use 'introspect_schema' with a table_pattern to get details ONLY for relevant tables. Use table patterns like 'sample%' or '%experiment%' to filter related tables.\n"
+            "- execute_sql: Execute SQL queries safely with automatic LIMIT clauses for SELECT statements. Only SELECT queries are permitted for security.\n\n"
+            "Guidelines:\n"
+            "- Use proper JOIN syntax and avoid cartesian products\n"
+            "- Include appropriate WHERE clauses to limit results\n"
+            "- Explain what the query does in simple terms\n"
+            "- Handle errors gracefully and suggest fixes\n"
+            "- Be security conscious - use parameterized queries when needed\n"
+            "- Timestamp columns must be converted to text when you write queries\n"
+            "- Use table patterns like 'sample%' or '%experiment%' to filter related tables"
+        )
+
+        if include_memory and self.database_name:
+            mem = self.memory_manager.format_memories_for_prompt(self.database_name)
+            mem = mem.strip()
+            if mem:
+                return f"{base}\n\n{mem}"
+        return base
+
     def _register_tools(self, agent: Agent) -> None:
         """Register all the SQL tools with the agent."""
 

{sqlsaber-0.29.1 → sqlsaber-0.30.0}/src/sqlsaber/cli/models.py

@@ -152,7 +152,7 @@ def list():
         table.add_column("Name", style="success")
         table.add_column("Description", style="info")
         table.add_column("Context", style="warning", justify="right")
-        table.add_column("Current", style="bold accent", justify="center")
+        table.add_column("Current", style="accent", justify="center")
 
         current_model = model_manager.get_current_model()
 

{sqlsaber-0.29.1 → sqlsaber-0.30.0}/src/sqlsaber/cli/streaming.py

@@ -144,17 +144,8 @@ class StreamingQueryHandler:
             prepared_prompt: str | list[str] = user_query
             no_history = not message_history
             if sqlsaber_agent.is_oauth and no_history:
-                instructions = sqlsaber_agent.instruction_builder.build_instructions(
-                    db_type=sqlsaber_agent.db_type
-                )
-                mem = ""
-                if sqlsaber_agent.database_name:
-                    mem = sqlsaber_agent.memory_manager.format_memories_for_prompt(
-                        sqlsaber_agent.database_name
-                    )
-                parts = [p for p in (instructions, mem) if p and str(p).strip()]
-                if parts:
-                    injected = "\n\n".join(parts)
+                injected = sqlsaber_agent.system_prompt_text(include_memory=True)
+                if injected and str(injected).strip():
                     prepared_prompt = [injected, user_query]
 
             # Show a transient status until events start streaming

{sqlsaber-0.29.1 → sqlsaber-0.30.0}/src/sqlsaber/theme/manager.py

@@ -9,7 +9,7 @@ from typing import Dict
 from platformdirs import user_config_dir
 from prompt_toolkit.styles import Style as PTStyle
 from prompt_toolkit.styles.pygments import style_from_pygments_cls
-from pygments.styles import get_style_by_name
+from pygments.styles import get_all_styles, get_style_by_name
 from pygments.token import Token
 from pygments.util import ClassNotFound
 from rich.console import Console
@@ -200,6 +200,9 @@ def get_theme_manager() -> ThemeManager:
     user_cfg = _load_user_theme_config()
     env_name = os.getenv("SQLSABER_THEME")
 
+    if env_name and env_name.lower() not in get_all_styles():
+        env_name = None
+
     name = (
         env_name or user_cfg.get("theme", {}).get("name") or DEFAULT_THEME_NAME
     ).lower()