@quantish/agent 0.1.25 → 0.1.26

package/LICENSE

@@ -1,24 +1,144 @@
-MIT License
+# PolyForm Noncommercial License 1.0.0
 
-Copyright (c) 2024 Quantish
+<https://polyformproject.org/licenses/noncommercial/1.0.0>
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Required Notice: Copyright 2025 Quantish Inc. (https://quantish.live)
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+## Acceptance
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+In order to get any license under these terms, you must agree
+to them as both strict obligations and conditions to all
+your licenses.
 
+## Copyright License
 
+The licensor grants you a copyright license for the software
+to do everything you might do with the software that would
+otherwise infringe the licensor's copyright in it for any
+permitted purpose.  However, you may only distribute the
+software according to [Distribution License](#distribution-license)
+and make changes or new works based on the software according
+to [Changes and New Works License](#changes-and-new-works-license).
 
+## Distribution License
+
+The licensor grants you an additional copyright license to
+distribute copies of the software.  Your license to distribute
+covers distributing the software with changes and new works
+permitted by [Changes and New Works License](#changes-and-new-works-license).
+
+## Notices
+
+You must ensure that anyone who gets a copy of any part of
+the software from you also gets a copy of these terms or the
+URL for them above, as well as copies of any plain-text lines
+beginning with `Required Notice:` that the licensor provided
+with the software.  For example:
+
+> Required Notice: Copyright Yoyodyne, Inc. (http://example.com)
+
+## Changes and New Works License
+
+The licensor grants you an additional copyright license to
+make changes and new works based on the software for any
+permitted purpose.
+
+## Patent License
+
+The licensor grants you a patent license for the software that
+covers patent claims the licensor can license, or becomes able
+to license, that you would infringe by using the software.
+
+## Noncommercial Purposes
+
+Any noncommercial purpose is a permitted purpose.
+
+## Personal Uses
+
+Personal use for research, experiment, and testing for
+the benefit of public knowledge, personal study, private
+entertainment, hobby projects, amateur pursuits, or religious
+observance, without any anticipated commercial application,
+is use for a permitted purpose.
+
+## Noncommercial Organizations
+
+Use by any charitable organization, educational institution,
+public research organization, public safety or health
+organization, environmental protection organization, or
+government institution is use for a permitted purpose
+regardless of the source of funding or obligations resulting
+from the funding.
+
+## Fair Use
+
+You may have "fair use" rights for the software under the
+law.  These terms do not limit them.
+
+## No Other Rights
+
+These terms do not allow you to sublicense or transfer any
+of your licenses to anyone else, or prevent the licensor
+from granting licenses to anyone else.  These terms do not
+imply any other licenses.
+
+## Patent Defense
+
+If you make any written claim that the software infringes
+or contributes to infringement of any patent, your patent
+license for the software granted under these terms ends
+immediately.  If your company makes such a claim, your
+patent license ends immediately for work on behalf of your
+company.
+
+## Violations
+
+The first time you are notified in writing that you have
+violated any of these terms, or done anything with the
+software not covered by your licenses, your licenses can
+nonetheless continue if you come into full compliance with
+these terms, and take practical steps to correct past
+violations, within 32 days of receiving notice.  Otherwise,
+all your licenses end immediately.
+
+## No Liability
+
+***As far as the law allows, the software comes as is,
+without any warranty or condition, and the licensor will
+not be liable to you for any damages arising out of these
+terms or the use or nature of the software, under any kind
+of legal claim.***
+
+## Definitions
+
+The **licensor** is the individual or entity offering these
+terms, and the **software** is the software the licensor
+makes available under these terms.
+
+**You** refers to the individual or entity agreeing to these
+terms.
+
+**Your company** is any legal entity, sole proprietorship,
+or other kind of organization that you work for, plus all
+organizations that have control over, are under the control
+of, or are under common control with that organization.
+**Control** means ownership of substantially all the assets
+of an entity, or the power to direct its management and
+policies by vote, contract, or otherwise.  Control can be
+direct or indirect.
+
+**Your licenses** are all the licenses granted to you for
+the software under these terms.
+
+**Use** means anything you do with the software requiring
+one of your licenses.
+
+---
+
+## Commercial Licensing
+
+For commercial use or to monetize this software as a product,
+please contact Quantish Inc. for a commercial license:
+
+Email: hello@quantish.live
+Website: https://quantish.live

package/README.md

@@ -1,11 +1,11 @@
 # @quantish/agent
 
-AI-powered coding & trading agent for Polymarket. Build trading bots, analyze markets, and execute trades using natural language.
+AI-powered coding & trading agent for Polymarket and Kalshi. Build trading bots, analyze markets, and execute trades using natural language.
 
 ## ✨ Features
 
 - **🤖 Multi-Provider AI** - Use Anthropic Claude or 100+ OpenRouter models (GLM-4.7, MiniMax, DeepSeek, etc.)
-- **💹 Live Trading** - Place orders, manage positions, check balances on Polymarket
+- **💹 Live Trading** - Trade on Polymarket (Polygon) and Kalshi (Solana via DFlow)
 - **🔧 Full Coding Tools** - Read/write files, run commands, git operations
 - **🌐 Web Search** - Search the web with Exa AI or DuckDuckGo fallback
 - **💾 Session Persistence** - Save and resume conversations across sessions
@@ -30,17 +30,26 @@ quantish
 
 ## How It Works
 
-The agent connects to two MCP (Model Context Protocol) servers:
+The agent connects to three MCP (Model Context Protocol) servers:
 
-1. **Discovery MCP** (Public) - Market search, trending markets, market details
-2. **Trading MCP** (Your API Key) - Wallet, orders, positions, trades
+| MCP | URL | Auth | Purpose |
+|-----|-----|------|---------|
+| Discovery | `quantish.live/mcp` | Public (embedded key) | Search markets across all platforms |
+| Polymarket | `quantish-sdk-production.up.railway.app/mcp` | `QUANTISH_API_KEY` | Trade on Polymarket (Polygon) |
+| Kalshi | `kalshi-mcp-production-7c2c.up.railway.app/mcp` | `KALSHI_API_KEY` | Trade on Kalshi (Solana via DFlow) |
 
-Your wallet is created and managed through our signing server, which:
-- ✅ Handles gasless transactions (Polymarket covers fees)
+**Polymarket** - Managed Polygon wallet:
+- ✅ Gasless transactions (Polymarket covers fees)
 - ✅ Signs orders using Polymarket's required format  
 - ✅ Works globally (no geo-restrictions)
 - 🔒 Non-custodial - export your private key anytime
 
+**Kalshi** - Managed Solana wallet via DFlow:
+- ✅ Trade on CFTC-regulated Kalshi markets
+- ✅ Uses DFlow protocol for on-chain settlement
+- ⚡ Small SOL fees (~0.01 SOL per trade)
+- 🔒 Non-custodial - export your private key anytime
+
 ## Interactive Commands
 
 ### Chat Commands
@@ -141,23 +150,48 @@ quantish --version          # Show version
 | `web_answer` | AI-powered Q&A (requires Exa API key) |
 | `fetch_url` | Fetch URL content |
 
-### MCP Tools (Trading)
-
-| Tool | Server | Description |
-|------|--------|-------------|
-| `search_markets` | Discovery | Search markets by query |
-| `get_trending_markets` | Discovery | Get trending/popular markets |
-| `get_market_details` | Discovery | Get market info and prices |
-| `get_balances` | Trading | Check wallet balances |
-| `get_positions` | Trading | View current positions |
-| `place_order` | Trading | Place buy/sell orders |
-| `cancel_order` | Trading | Cancel open orders |
-| `get_orders` | Trading | List orders |
-| `get_orderbook` | Trading | Get market orderbook |
-| `get_price` | Trading | Get current price |
-| `transfer_usdc` | Trading | Transfer USDC |
-| `claim_winnings` | Trading | Claim from resolved markets |
-| `export_private_key` | Trading | Export wallet private key |
+### MCP Tools - Discovery
+
+| Tool | Description |
+|------|-------------|
+| `search_markets` | Search markets across Polymarket, Kalshi, Limitless |
+| `get_trending_markets` | Get trending/popular markets |
+| `get_market_details` | Get market info and prices |
+| `get_categories` | List available categories |
+| `get_market_stats` | Get platform statistics |
+
+### MCP Tools - Polymarket Trading
+
+| Tool | Description |
+|------|-------------|
+| `get_balances` | Check USDC and position balances |
+| `get_positions` | View current positions |
+| `place_order` | Place buy/sell orders |
+| `cancel_order` | Cancel open orders |
+| `get_orders` | List orders |
+| `get_orderbook` | Get market orderbook |
+| `get_price` | Get current price |
+| `transfer_usdc` | Transfer USDC |
+| `claim_winnings` | Claim from resolved markets |
+| `export_private_key` | Export wallet private key |
+
+### MCP Tools - Kalshi Trading
+
+| Tool | Description |
+|------|-------------|
+| `kalshi_signup` | Create new account with Solana wallet |
+| `kalshi_search_markets` | Search Kalshi markets |
+| `kalshi_get_market` | Get market details by ticker |
+| `kalshi_get_events` | Browse market categories |
+| `kalshi_get_live_data` | Get live market data |
+| `kalshi_get_quote` | Get quote for buy/sell order |
+| `kalshi_place_order` | Execute a trade on Solana |
+| `kalshi_get_wallet_info` | Get wallet address and balances |
+| `kalshi_get_positions` | View Kalshi positions |
+| `kalshi_check_market_initialization` | Check if market is tokenized |
+| `kalshi_initialize_market` | Initialize market on-chain |
+| `kalshi_check_redemption_status` | Check if market can be redeemed |
+| `kalshi_export_private_key` | Export Solana private key |
 
 ## LLM Providers
 
@@ -201,9 +235,11 @@ Configuration is stored in `~/.quantish/config.json`.
 |----------|-------------|
 | `ANTHROPIC_API_KEY` | Anthropic API key |
 | `OPENROUTER_API_KEY` | OpenRouter API key |
-| `QUANTISH_API_KEY` | Quantish trading API key |
+| `QUANTISH_API_KEY` | Polymarket trading API key |
+| `KALSHI_API_KEY` | Kalshi trading API key |
 | `EXA_API_KEY` | Exa AI search key (optional) |
-| `MCP_SERVER_URL` | Custom Trading MCP server URL |
+| `MCP_SERVER_URL` | Custom Polymarket MCP server URL |
+| `KALSHI_MCP_URL` | Custom Kalshi MCP server URL |
 
 ### Export Configuration
 
@@ -217,11 +253,12 @@ The agent can build standalone applications that use the Quantish MCP API. When
 
 1. **Use HTTP API** - Don't use MCP SDK directly
 2. **Environment Variables** - Store API keys in `.env`
-3. **Two Endpoints**:
+3. **Three Endpoints**:
    - Discovery: `https://quantish.live/mcp/execute` (public)
-   - Trading: `https://quantish-sdk-production.up.railway.app/mcp/execute` (requires API key)
+   - Polymarket: `https://quantish-sdk-production.up.railway.app/mcp/execute` (requires `QUANTISH_API_KEY`)
+   - Kalshi: `https://kalshi-mcp-production-7c2c.up.railway.app/mcp` (requires `KALSHI_API_KEY`)
 
-Example API call:
+Example API calls:
 
 ```javascript
 // Discovery MCP (simple format)
@@ -237,7 +274,7 @@ const response = await fetch('https://quantish.live/mcp/execute', {
   })
 });
 
-// Trading MCP (JSON-RPC format)
+// Polymarket Trading MCP (JSON-RPC format)
 const response = await fetch('https://quantish-sdk-production.up.railway.app/mcp/execute', {
   method: 'POST',
   headers: {
@@ -248,26 +285,70 @@ const response = await fetch('https://quantish-sdk-production.up.railway.app/mcp
     jsonrpc: '2.0',
     id: 1,
     method: 'tools/call',
-    params: {
-      name: 'get_positions',
-      arguments: {}
-    }
+    params: { name: 'get_positions', arguments: {} }
+  })
+});
+
+// Kalshi Trading MCP (JSON-RPC format)
+const response = await fetch('https://kalshi-mcp-production-7c2c.up.railway.app/mcp', {
+  method: 'POST',
+  headers: {
+    'Content-Type': 'application/json',
+    'X-API-Key': process.env.KALSHI_API_KEY
+  },
+  body: JSON.stringify({
+    jsonrpc: '2.0',
+    id: 1,
+    method: 'tools/call',
+    params: { name: 'kalshi_get_positions', arguments: {} }
   })
 });
 ```
 
 ## Self-Hosting
 
-You can self-host the Quantish MCP server:
+You can self-host your own Trading MCP servers for full control over your wallet keys.
+
+### Polymarket Server
 
 ```bash
-# Set custom server URL
-quantish config --server https://your-server.com/mcp
+npm install @quantish/server
+```
 
-# Or use environment variable
+```bash
+# Configure CLI to use your server
 export MCP_SERVER_URL=https://your-server.com/mcp
 ```
 
+Resources:
+- **NPM**: [@quantish/server](https://www.npmjs.com/package/@quantish/server)
+- **GitHub**: [joinQuantish/quantish-server](https://github.com/joinQuantish/quantish-server)
+- **Polymarket API**: [docs.polymarket.com](https://docs.polymarket.com)
+
+### Kalshi Server
+
+```bash
+npm install @quantish/kalshi-server
+```
+
+```bash
+# Configure CLI to use your server
+export KALSHI_MCP_URL=https://your-kalshi-server.com/mcp
+```
+
+Required environment variables for Kalshi server:
+- `DATABASE_URL` - PostgreSQL connection string
+- `ENCRYPTION_KEY` - 64-char hex string for wallet encryption
+- `DFLOW_API_KEY` - DFlow API key
+- `SOLANA_RPC_URL` - Solana RPC endpoint
+
+Resources:
+- **NPM**: [@quantish/kalshi-server](https://www.npmjs.com/package/@quantish/kalshi-server)
+- **GitHub**: [joinQuantish/kalshi-mcp](https://github.com/joinQuantish/kalshi-mcp)
+- **DFlow Docs**: [docs.dflow.net](https://docs.dflow.net)
+
+See the [Self-Hosting Guide](https://docs.quantish.live/self-hosting.html) for full deployment instructions.
+
 ## Platform Support
 
 | Platform | Support |
@@ -279,19 +360,26 @@ export MCP_SERVER_URL=https://your-server.com/mcp
 ## Examples
 
 ```bash
-# Search for markets
+# Search for markets (both Polymarket and Kalshi)
 quantish -p "find markets about bitcoin"
 
-# Check positions
-quantish -p "show my positions with P&L"
+# Check Polymarket positions
+quantish -p "show my Polymarket positions with P&L"
 
-# Build a trading bot
+# Check Kalshi positions
+quantish -p "show my Kalshi positions"
+
+# Create a Kalshi account
 quantish
-> Create a bot that monitors Trump markets and alerts me when prices change more than 5%
+> Create a Kalshi account for me
 
-# Start a dev server
+# Trade on Kalshi
 quantish
-> Start my React app on port 3001
+> Buy $10 of YES on the next Fed rate decision market on Kalshi
+
+# Build a trading bot
+quantish
+> Create a bot that monitors Trump markets and alerts me when prices change more than 5%
 
 # Code review
 quantish
@@ -336,10 +424,13 @@ npm link  # Install locally
 
 ## License
 
-MIT
+This project is licensed under the [PolyForm Noncommercial License 1.0.0](https://polyformproject.org/licenses/noncommercial/1.0.0/).
+
+**Free for personal use, research, and non-commercial purposes.** Commercial use requires explicit permission from Quantish Inc. Contact hello@quantish.live for commercial licensing.
 
 ## Links
 
+- [Agent Website](https://agent.quantish.live)
 - [GitHub](https://github.com/joinQuantish/quantish-agent)
 - [NPM](https://www.npmjs.com/package/@quantish/agent)
 - [Documentation](https://docs.quantish.live)

package/dist/index.js

@@ -13,6 +13,7 @@ import { join } from "path";
 var DEFAULT_TRADING_MCP_URL = "https://quantish-sdk-production.up.railway.app/mcp";
 var DISCOVERY_MCP_URL = "https://quantish.live/mcp";
 var DISCOVERY_MCP_PUBLIC_KEY = "qm_ueQeqrmvZyHtR1zuVbLYkhx0fKyVAuV8";
+var KALSHI_MCP_URL = "https://kalshi-mcp-production-7c2c.up.railway.app/mcp";
 var DEFAULT_MCP_URL = DEFAULT_TRADING_MCP_URL;
 var DEFAULT_ANTHROPIC_MODEL = "claude-sonnet-4-5-20250929";
 var DEFAULT_OPENROUTER_MODEL = "z-ai/glm-4.7";
@@ -26,6 +27,9 @@ var schema = {
   quantishApiKey: {
     type: "string"
   },
+  kalshiApiKey: {
+    type: "string"
+  },
   mcpServerUrl: {
     type: "string",
     default: DEFAULT_MCP_URL
@@ -91,6 +95,20 @@ var ConfigManager = class {
   setQuantishApiKey(key) {
     this.conf.set("quantishApiKey", key);
   }
+  /**
+   * Get the Kalshi API key
+   */
+  getKalshiApiKey() {
+    const envKey = process.env.KALSHI_API_KEY;
+    if (envKey) return envKey;
+    return this.conf.get("kalshiApiKey");
+  }
+  /**
+   * Set the Kalshi API key
+   */
+  setKalshiApiKey(key) {
+    this.conf.set("kalshiApiKey", key);
+  }
   /**
    * Get the current LLM provider
    */
@@ -382,18 +400,26 @@ function createMCPClient(baseUrl, apiKey, source = "trading") {
 var MCPClientManager = class {
   discoveryClient;
   tradingClient;
+  kalshiClient;
   toolSourceMap = /* @__PURE__ */ new Map();
   allToolsCache = null;
-  constructor(discoveryUrl, discoveryApiKey, tradingUrl, tradingApiKey) {
+  constructor(discoveryUrl, discoveryApiKey, tradingUrl, tradingApiKey, kalshiUrl, kalshiApiKey) {
     this.discoveryClient = new MCPClient(discoveryUrl, discoveryApiKey, "discovery");
     this.tradingClient = tradingUrl && tradingApiKey ? new MCPClient(tradingUrl, tradingApiKey, "trading") : null;
+    this.kalshiClient = kalshiUrl && kalshiApiKey ? new MCPClient(kalshiUrl, kalshiApiKey, "kalshi") : null;
   }
   /**
-   * Check if trading is enabled
+   * Check if trading is enabled (Polymarket)
    */
   isTradingEnabled() {
     return this.tradingClient !== null;
   }
+  /**
+   * Check if Kalshi trading is enabled
+   */
+  isKalshiEnabled() {
+    return this.kalshiClient !== null;
+  }
   /**
    * Get the discovery client
    */
@@ -406,6 +432,12 @@ var MCPClientManager = class {
   getTradingClient() {
     return this.tradingClient;
   }
+  /**
+   * Get the Kalshi client (may be null)
+   */
+  getKalshiClient() {
+    return this.kalshiClient;
+  }
   /**
    * List all tools from both servers
    */
@@ -435,6 +467,17 @@ var MCPClientManager = class {
         console.warn("Failed to fetch Trading MCP tools:", error2);
       }
     }
+    if (this.kalshiClient) {
+      try {
+        const kalshiTools = await this.kalshiClient.listTools();
+        for (const tool of kalshiTools) {
+          allTools.push({ ...tool, source: "kalshi" });
+          this.toolSourceMap.set(tool.name, "kalshi");
+        }
+      } catch (error2) {
+        console.warn("Failed to fetch Kalshi MCP tools:", error2);
+      }
+    }
     this.allToolsCache = allTools;
     return allTools;
   }
@@ -466,12 +509,22 @@ var MCPClientManager = class {
       if (!this.tradingClient) {
         return {
           success: false,
-          error: `Trading not enabled. Run 'quantish init' to set up trading.`
+          error: `Polymarket trading not enabled. Run 'quantish init' to set up trading.`
         };
       }
       const result = await this.tradingClient.callTool(name, args);
       return { ...result, source: "trading" };
     }
+    if (source === "kalshi") {
+      if (!this.kalshiClient) {
+        return {
+          success: false,
+          error: `Kalshi trading not enabled. Run 'quantish init' to set up your Kalshi API key.`
+        };
+      }
+      const result = await this.kalshiClient.callTool(name, args);
+      return { ...result, source: "kalshi" };
+    }
     return {
       success: false,
       error: `Unknown tool source: ${source}`
@@ -495,8 +548,8 @@ var MCPClientManager = class {
     return { discovery, trading };
   }
 };
-function createMCPClientManager(discoveryUrl, discoveryApiKey, tradingUrl, tradingApiKey) {
-  return new MCPClientManager(discoveryUrl, discoveryApiKey, tradingUrl, tradingApiKey);
+function createMCPClientManager(discoveryUrl, discoveryApiKey, tradingUrl, tradingApiKey, kalshiUrl, kalshiApiKey) {
+  return new MCPClientManager(discoveryUrl, discoveryApiKey, tradingUrl, tradingApiKey, kalshiUrl, kalshiApiKey);
 }
 
 // src/mcp/tools.ts
@@ -528,25 +581,28 @@ function printArchitectureInfo() {
   console.log(chalk.bold.yellow("\n\u{1F4CB} How Quantish Works\n"));
   console.log(chalk.dim("\u2500".repeat(60)));
   console.log();
-  console.log(chalk.bold("Two Capabilities:"));
+  console.log(chalk.bold("Three Capabilities:"));
   console.log();
   console.log(chalk.cyan("\u{1F50D} Market Discovery") + chalk.dim(" (Free, always available)"));
   console.log(chalk.dim("   Search markets across Polymarket, Kalshi, and more"));
   console.log(chalk.dim("   Uses our Discovery MCP with embedded public key"));
   console.log();
   console.log(chalk.magenta("\u{1F4B0} Polymarket Trading") + chalk.dim(" (Optional, your own wallet)"));
-  console.log(chalk.dim("   Trade on Polymarket with a managed wallet"));
+  console.log(chalk.dim("   Trade on Polymarket with a managed Polygon wallet"));
   console.log(chalk.dim("   Uses the Quantish Signing Server"));
   console.log();
+  console.log(chalk.blue("\u{1F5F3}\uFE0F  Kalshi Trading") + chalk.dim(" (Optional, via DFlow on Solana)"));
+  console.log(chalk.dim("   Trade on Kalshi markets via DFlow protocol"));
+  console.log(chalk.dim("   Uses a Solana wallet managed by the Kalshi MCP"));
+  console.log();
   console.log(chalk.bold("How Trading Works:"));
-  console.log(chalk.dim("  1. We create a wallet for you on the Quantish Signing Server"));
-  console.log(chalk.dim("  2. Orders are signed and relayed through Polymarket's system"));
-  console.log(chalk.dim("  3. Gas fees are covered by Polymarket's relayer - FREE!"));
-  console.log(chalk.dim("  4. You control your wallet via your personal API key\n"));
+  console.log(chalk.dim("  Polymarket: Gasless transactions on Polygon, fees covered"));
+  console.log(chalk.dim("  Kalshi: Trade on Solana via DFlow, small SOL fees"));
+  console.log(chalk.dim("  Both: Non-custodial wallets, export keys anytime\n"));
   console.log(chalk.bold("Security:"));
-  console.log(chalk.dim("  \u2022 Your wallet is non-custodial - only you can authorize trades"));
+  console.log(chalk.dim("  \u2022 Your wallets are non-custodial - only you can authorize trades"));
   console.log(chalk.dim("  \u2022 Export your private key anytime with: ") + chalk.cyan("export_private_key"));
-  console.log(chalk.dim("  \u2022 Discovery is read-only - it can't access your wallet"));
+  console.log(chalk.dim("  \u2022 Discovery is read-only - it can't access your wallets"));
   console.log();
   console.log(chalk.dim("\u2500".repeat(60)));
   console.log();
@@ -693,7 +749,48 @@ async function runSetup() {
   } else {
     console.log(chalk.dim("\u2713 No trading key - you can still search markets via Discovery\n"));
   }
-  console.log(chalk.bold("Step 3: Exa API Key (Optional)"));
+  console.log(chalk.bold("Step 3: Kalshi Trading (Optional)"));
+  console.log(chalk.dim("Trade on Kalshi markets via DFlow on Solana."));
+  console.log(chalk.dim("Skip this if you only want Polymarket or market discovery.\n"));
+  let kalshiKey = config.getKalshiApiKey();
+  let skipKalshi = false;
+  if (kalshiKey) {
+    console.log(chalk.dim(`Current Kalshi key: ${kalshiKey.slice(0, 12)}...`));
+    const action = await prompt("Keep current key (Enter), enter new key (n), or disable Kalshi (d): ");
+    if (action.toLowerCase() === "n") {
+      kalshiKey = await prompt("Enter your Kalshi API key: ", true);
+    } else if (action.toLowerCase() === "d") {
+      kalshiKey = void 0;
+      skipKalshi = true;
+    }
+  } else {
+    console.log("Options:");
+    console.log(chalk.dim("  1. Create a new Kalshi account (via agent)"));
+    console.log(chalk.dim("  2. Enter an existing Kalshi API key"));
+    console.log(chalk.dim("  3. Skip Kalshi for now\n"));
+    const choice = await prompt("Choose (1/2/3): ");
+    if (choice === "1") {
+      console.log();
+      console.log(chalk.green("To create a Kalshi account, start the agent and ask:"));
+      console.log(chalk.cyan('  "Create a Kalshi account for me"'));
+      console.log(chalk.dim("\nThe agent will generate a Solana wallet and provide your API key."));
+      console.log(chalk.dim('You can then run "quantish init" again to save the key.\n'));
+      skipKalshi = true;
+    } else if (choice === "2") {
+      kalshiKey = await prompt("Enter your Kalshi API key: ", true);
+    } else {
+      skipKalshi = true;
+    }
+  }
+  if (kalshiKey) {
+    config.setKalshiApiKey(kalshiKey);
+    console.log(chalk.green("\u2713 Kalshi API key saved\n"));
+  } else if (skipKalshi) {
+    console.log(chalk.dim("\u2713 Kalshi disabled - you can set it up later via the agent\n"));
+  } else {
+    console.log(chalk.dim("\u2713 No Kalshi key - you can set it up later\n"));
+  }
+  console.log(chalk.bold("Step 4: Exa API Key (Optional)"));
   console.log(chalk.dim("Powers web search. Get one free at https://dashboard.exa.ai"));
   console.log(chalk.dim("Without this, web search will use DuckDuckGo as fallback.\n"));
   const exaKey = await prompt("Enter your Exa API key (or press Enter to skip): ", true);
@@ -704,7 +801,7 @@ async function runSetup() {
   } else {
     console.log(chalk.dim("Skipped. Web search will use DuckDuckGo.\n"));
   }
-  console.log(chalk.bold("Step 4: Verifying connections..."));
+  console.log(chalk.bold("Step 5: Verifying connections..."));
   try {
     const discoveryClient = createMCPClient(DISCOVERY_MCP_URL, DISCOVERY_MCP_PUBLIC_KEY, "discovery");
     const discoveryResult = await discoveryClient.callTool("get_market_stats", {});
@@ -723,19 +820,37 @@ async function runSetup() {
       const result = await tradingClient.callTool("get_wallet_status", {});
       if (result.success && typeof result.data === "object" && result.data !== null) {
         const data = result.data;
-        console.log(chalk.green("\u2713 Trading MCP connected"));
+        console.log(chalk.green("\u2713 Polymarket MCP connected"));
         console.log(chalk.dim(`  Safe Address: ${data.safeAddress || "Not yet deployed"}`));
         console.log(chalk.dim(`  Status: ${data.status}`));
         console.log(chalk.dim(`  Ready to trade: ${data.isReady ? "Yes" : "Run setup_wallet first"}`));
       } else {
-        console.log(chalk.yellow("\u26A0 Trading MCP: " + (result.error || "Unknown error")));
+        console.log(chalk.yellow("\u26A0 Polymarket MCP: " + (result.error || "Unknown error")));
+      }
+    } catch (error2) {
+      console.log(chalk.yellow("\u26A0 Could not verify Polymarket MCP connection."));
+      console.log(chalk.dim(String(error2)));
+    }
+  } else {
+    console.log(chalk.dim("\u23ED Polymarket MCP skipped (no API key)"));
+  }
+  if (kalshiKey) {
+    try {
+      const kalshiClient = createMCPClient(KALSHI_MCP_URL, kalshiKey, "kalshi");
+      const result = await kalshiClient.callTool("kalshi_get_wallet_info", {});
+      if (result.success && typeof result.data === "object" && result.data !== null) {
+        const data = result.data;
+        console.log(chalk.green("\u2713 Kalshi MCP connected"));
+        console.log(chalk.dim(`  Solana Address: ${data.publicKey || "Unknown"}`));
+      } else {
+        console.log(chalk.yellow("\u26A0 Kalshi MCP: " + (result.error || "Unknown error")));
       }
     } catch (error2) {
-      console.log(chalk.yellow("\u26A0 Could not verify Trading MCP connection."));
+      console.log(chalk.yellow("\u26A0 Could not verify Kalshi MCP connection."));
       console.log(chalk.dim(String(error2)));
     }
   } else {
-    console.log(chalk.dim("\u23ED Trading MCP skipped (no API key)"));
+    console.log(chalk.dim("\u23ED Kalshi MCP skipped (no API key)"));
   }
   console.log();
   console.log(chalk.bold.green("\u{1F389} Setup complete!"));
@@ -5071,8 +5186,11 @@ Use /load <id> to load a session.`
       abortController.current = null;
     }
   }, [agent, isProcessing, isInterrupted, exit, onExit, handleSlashCommand]);
+  const wasProcessing = useRef(false);
   useEffect(() => {
-    if (!isProcessing && hasQueuedMessage && queuedInput) {
+    const justFinished = wasProcessing.current && !isProcessing;
+    wasProcessing.current = isProcessing;
+    if (justFinished && hasQueuedMessage && queuedInput) {
       const nextMessage = queuedInput;
       setQueuedInput("");
       setHasQueuedMessage(false);
@@ -5151,10 +5269,22 @@ Stopped ${count} background process${count > 1 ? "es" : ""}.`);
       setIsInterrupted(true);
       abortController.current?.abort();
       if (hasQueuedMessage && queuedInput) {
-        setMessages((prev) => [...prev, {
-          role: "system",
-          content: "\u26A1 Interrupting and sending queued message..."
-        }]);
+        const messageToSend = queuedInput;
+        setQueuedInput("");
+        setHasQueuedMessage(false);
+        setIsProcessing(false);
+        setMessages((prev) => {
+          const filtered = prev.filter(
+            (m) => !(m.role === "system" && m.content.startsWith("\u{1F4E5} Queued:"))
+          );
+          return [...filtered, {
+            role: "system",
+            content: "\u26A1 Interrupted. Sending queued message..."
+          }];
+        });
+        setTimeout(() => {
+          handleSubmit(messageToSend);
+        }, 200);
       } else {
         setMessages((prev) => [...prev, {
           role: "system",
@@ -5377,9 +5507,9 @@ program.command("config").description("View or edit configuration").option("-s,
   }
   console.log();
 });
-program.command("tools").description("List available tools").option("-l, --local", "Show only local tools").option("-d, --discovery", "Show only Discovery MCP tools").option("-t, --trading", "Show only Trading MCP tools").action(async (options) => {
+program.command("tools").description("List available tools").option("-l, --local", "Show only local tools").option("-d, --discovery", "Show only Discovery MCP tools").option("-t, --trading", "Show only Trading MCP tools").option("-k, --kalshi", "Show only Kalshi MCP tools").action(async (options) => {
   console.log();
-  const showAll = !options.local && !options.discovery && !options.trading;
+  const showAll = !options.local && !options.discovery && !options.trading && !options.kalshi;
   if (showAll || options.local) {
     console.log(chalk3.bold.blue("\u{1F4C1} Local Tools (coding)"));
     printDivider();
@@ -5413,7 +5543,7 @@ program.command("tools").description("List available tools").option("-l, --local
   if (showAll || options.trading) {
     const config = getConfigManager();
     if (config.isTradingEnabled()) {
-      console.log(chalk3.bold.magenta("\u{1F4B0} Trading MCP Tools (wallet & orders)"));
+      console.log(chalk3.bold.magenta("\u{1F4B0} Polymarket Trading MCP Tools (wallet & orders)"));
       printDivider();
       try {
         const tradingClient = createMCPClient(
@@ -5432,7 +5562,34 @@ program.command("tools").description("List available tools").option("-l, --local
       }
       console.log();
     } else {
-      console.log(chalk3.dim('\u{1F4B0} Trading MCP: Not configured. Run "quantish init" to enable trading.'));
+      console.log(chalk3.dim('\u{1F4B0} Polymarket Trading MCP: Not configured. Run "quantish init" to enable trading.'));
+      console.log();
+    }
+  }
+  if (showAll || options.kalshi) {
+    const config = getConfigManager();
+    const kalshiKey = config.getKalshiApiKey();
+    if (kalshiKey) {
+      console.log(chalk3.bold.yellow("\u{1F3AF} Kalshi MCP Tools (DFlow on Solana)"));
+      printDivider();
+      try {
+        const kalshiClient = createMCPClient(
+          KALSHI_MCP_URL,
+          kalshiKey,
+          "kalshi"
+        );
+        const kalshiTools = await kalshiClient.listTools();
+        for (const tool of kalshiTools) {
+          console.log(chalk3.yellow(`  ${tool.name}`));
+          const desc = tool.description || "";
+          console.log(chalk3.dim(`    ${desc.slice(0, 80)}${desc.length > 80 ? "..." : ""}`));
+        }
+      } catch (error2) {
+        warn("Could not fetch Kalshi tools. Check your API key.");
+      }
+      console.log();
+    } else {
+      console.log(chalk3.dim("\u{1F3AF} Kalshi MCP: Not configured. Set your Kalshi API key to enable."));
       console.log();
     }
   }
@@ -5489,7 +5646,9 @@ function createMCPManager(options) {
     DISCOVERY_MCP_URL,
     DISCOVERY_MCP_PUBLIC_KEY,
     config.isTradingEnabled() ? config.getTradingMcpUrl() : void 0,
-    config.getQuantishApiKey()
+    config.getQuantishApiKey(),
+    config.getKalshiApiKey() ? KALSHI_MCP_URL : void 0,
+    config.getKalshiApiKey()
   );
 }
 async function runInteractiveChat(options = {}) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@quantish/agent",
-  "version": "0.1.25",
-  "description": "AI-powered agent for building trading bots on Polymarket",
+  "version": "0.1.26",
+  "description": "AI-powered agent for trading on Polymarket and Kalshi",
   "type": "module",
   "bin": {
     "quantish": "./dist/index.js"
@@ -20,6 +20,7 @@
   },
   "keywords": [
     "polymarket",
+    "kalshi",
     "trading",
     "cli",
     "ai",
@@ -28,11 +29,14 @@
     "mcp",
     "prediction-markets",
     "polymarket-trading",
+    "kalshi-trading",
+    "solana",
+    "dflow",
     "ai-agent",
     "trading-bot"
   ],
   "author": "Quantish <hello@quantish.live>",
-  "license": "MIT",
+  "license": "PolyForm-Noncommercial-1.0.0",
   "publishConfig": {
     "access": "public"
   },