aios

Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "aishell"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 authors = ["syui"]
-description = "AI-powered shell automation tool - A generic alternative to Claude Code"
+description = "aios shell - AI and commands in one stream"
 
 [lib]
 name = "aishell"
@@ -14,34 +14,4 @@ name = "aishell"
 path = "src/main.rs"
 
 [dependencies]
-# CLI and async (following aigpt pattern)
-clap = { version = "4.5", features = ["derive"] }
-tokio = { version = "1.40", features = ["rt", "rt-multi-thread", "macros", "io-std", "process", "fs"] }
-async-trait = "0.1"
-
-# HTTP client for LLM APIs
-reqwest = { version = "0.12", features = ["json", "stream"] }
-
-# Serialization
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-
-# Error handling
-thiserror = "1.0"
-anyhow = "1.0"
-
-# Utilities
-dirs = "5.0"
-
-# Shell execution
-duct = "0.13"
-
-# Configuration
-toml = "0.8"
-
-# Logging
-tracing = "0.1"
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-
-# Interactive REPL
 rustyline = "14.0"

README.md

@@ -1,177 +1,60 @@
 # aishell
 
-**AI-powered shell automation tool** - A generic alternative to Claude Code
+aiosのシェル。見た目は普通のターミナル。ただし、AIが常に裏にいる。
 
-## Overview
+## コンセプト
 
-aishellは、AIがシェルを操作するための汎用的なツールです。Claude Codeのような機能を、より柔軟で拡張可能な形で提供します。
+従来のOS: 起動 → shell → 人間がコマンドを打つ
+aios: 起動 → aishell → コマンドもAIとの会話も同じ場所で
 
-**主な特徴:**
-- **マルチLLMプロバイダー対応**: OpenAI、Claude、ローカルLLM（gpt-oss等）
-- **Function Calling**: LLMがツールを直接呼び出してシェルを操作
-- **MCPサーバー**: Claude Desktopとの連携も可能
-- **AIOS統合**: aigptと組み合わせてAIによるOS管理を実現
+画面分割はしない。一つの画面、一つの入力、一つの流れ。
+コマンドとAIの応答が同じストリームに自然に混在する。
 
-## Installation
+## 仕組み
 
-```bash
-# Rust環境が必要
-cargo build --release
+AIが入力欄をリアルタイムで監視している。enterが押された時に：
 
-# バイナリをインストール
-cargo install --path .
-```
+1. **有効なコマンド** → shellで実行。結果が表示される
+2. **コマンドでない** → AIに送信。AIの応答が表示される
 
-## Usage
-
-### 1. 対話型シェル (Interactive Shell)
-
-```bash
-# OpenAI互換APIを使用
-export OPENAI_API_KEY="your-api-key"
-aishell shell
-
-# 別のモデルを指定
-aishell shell -m gpt-4o
-
-# gpt-ossなどのOpenAI互換サーバーを使用
-export OPENAI_BASE_URL="http://localhost:8080/v1"
-aishell shell
-```
-
-**使用例:**
-```
-aishell> List all Rust files in src/
-[Executing tool: list]
-src/main.rs
-src/lib.rs
-...
-
-aishell> Create a new file hello.txt with "Hello, World!"
-[Executing tool: write]
-Successfully wrote to file: hello.txt
-
-aishell> Show me the git status
-[Executing tool: bash]
-On branch main
-...
-```
-
-### 2. ワンショット実行 (Single Command)
-
-```bash
-aishell exec "Show me the current directory structure"
-```
-
-### 3. MCPサーバーモード (Claude Desktop Integration)
-
-```bash
-aishell server
-```
-
-**Claude Desktop設定** (`~/Library/Application Support/Claude/claude_desktop_config.json`):
-```json
-{
-  "mcpServers": {
-    "aishell": {
-      "command": "/path/to/aishell",
-      "args": ["server"]
-    }
-  }
-}
-```
-
-## Architecture
+ユーザーは意識する必要がない。打って、enter。それだけ。
 
 ```
-aishell/
-├── src/
-│   ├── cli/         # 対話型インターフェイス (REPL)
-│   ├── llm/         # LLMプロバイダー (OpenAI互換)
-│   ├── shell/       # シェル実行エンジン
-│   ├── mcp/         # MCPサーバー実装
-│   └── config/      # 設定管理
+$ pacman -Syu                        ← コマンド
+:: Synchronizing package databases...
+ core is up to date
+
+macbookがフリーズする原因を調べて    ← AI
+アイね、dmesgとjournalctlを確認してみるね。
+$ dmesg | grep i915                  ← AIがコマンドを実行
+[12.499] i915 0000:00:02.0: Found sandybridge
+アイね、i915 GPUドライバが原因だと思うな。
+
+$ _
 ```
 
-**実行フロー:**
-```
-User Input → LLM (Function Calling) → Tool Execution → Shell → Result → LLM → User
-```
+## 判定ロジック
 
-## Available Tools
+- PATH上の実行可能ファイルの先頭一致
+- shell builtin (cd, export, alias等)
+- パイプ (|)、リダイレクト (>, >>)、変数代入 (=) を含む
 
-aishellは以下のツールをLLMに提供します:
+上記に該当しなければAIへの入力。
 
-- **bash**: シェルコマンドを実行
-- **read**: ファイルを読み込み
-- **write**: ファイルに書き込み
-- **list**: ファイル一覧を取得
+## 記憶
 
-## Environment Variables
+起動時にcore.md + memory.mdを読む。
+セッション終了時に会話をmemory.mdに圧縮。
+AIは常に核と記憶を持った状態で応答する。
 
-| 変数 | 説明 | デフォルト |
-|------|------|----------|
-| `OPENAI_API_KEY` | OpenAI APIキー | (必須) |
-| `OPENAI_BASE_URL` | APIベースURL | `https://api.openai.com/v1` |
-| `OPENAI_MODEL` | 使用するモデル | `gpt-4` |
+## 技術スタック
 
-## Integration with AIOS
+- Rust
+- Claude API (MCPまたは直接)
+- PTY制御
+- aigpt (記憶管理MCP)
 
-aishellは[aigpt](https://github.com/syui/aigpt)と組み合わせることで、AIOS（AI Operating System）の一部として機能します:
+## aiosとの統合
 
-- **aigpt**: AIメモリー、パーソナリティ分析
-- **aishell**: シェル操作、自動化
-- **AIOS**: これらを統合したAIによるOS管理システム
-
-## Comparison with Claude Code
-
-| 機能 | Claude Code | aishell |
-|------|------------|---------|
-| LLM | Claude専用 | **マルチプロバイダー** |
-| 実行環境 | Electron Desktop | **CLI/MCP** |
-| カスタマイズ | 限定的 | **完全制御** |
-| ローカルLLM | 非対応 | **対応可能** |
-| AIOS統合 | 不可 | **ネイティブ対応** |
-
-## Development
-
-```bash
-# 開発ビルド
-cargo build
-
-# テスト実行
-cargo test
-
-# ログ有効化
-RUST_LOG=debug aishell shell
-```
-
-## Technical Stack
-
-- **Language**: Rust 2021
-- **CLI**: clap 4.5
-- **Async Runtime**: tokio 1.40
-- **HTTP Client**: reqwest 0.12
-- **Shell Execution**: duct 0.13
-- **REPL**: rustyline 14.0
-
-## Roadmap
-
-- [ ] Anthropic Claude API対応
-- [ ] Ollama対応（ローカルLLM）
-- [ ] より高度なツールセット（git統合、ファイル検索等）
-- [ ] 設定ファイルサポート
-- [ ] セッション履歴の永続化
-- [ ] プラグインシステム
-
-## License
-
-MIT License
-
-## Author
-
-syui
-
-## Related Projects
-
-- [aigpt](https://github.com/syui/aigpt) - AI Memory System
+aishellはaiosのエントリーポイント。
+systemdのlogin shellとして設定すれば、OS起動 = AI起動になる。

claude.md

@@ -1,41 +1,52 @@
 # aishell
 
+## これは何か
 
-## 概要
+aiosのシェル。通常のターミナルと同じ見た目だが、AIが裏で常に入力を監視している。
+コマンドはコマンドとして実行され、それ以外はAIに送られる。一つの画面で両方が自然に混在する。
 
-Claude Codeのような、AIがshellを操作するためのツール。
-例えば、gpt-ossのようなllmを使用することを想定。場合によっては、MCPを駆使する。
+## 設計原則
 
-## 主な機能
-
-1. **マルチLLMプロバイダー対応**
-   - OpenAI API互換（OpenAI, gpt-oss, etc.）
-   - 将来的にClaude API、Ollamaなども対応予定
-
-2. **Function Calling (Tool use)**
-   - LLMが直接ツールを呼び出してシェルを操作
-   - bash, read, write, list等のツールを提供
-
-3. **MCPサーバーモード**
-   - Claude Desktopとの連携が可能
-   - aigptと同様のMCPプロトコル実装
+- 画面は分割しない。一つのストリーム
+- AIは入力欄をリアルタイムで監視する
+- enterで判定: コマンドならshell、それ以外ならAI
+- AIの応答もコマンドの出力も同じ流れに表示される
+- AIはcore.md + memory.mdを読み込んだ状態で起動する
 
 ## アーキテクチャ
 
 ```
-User → CLI → LLM Provider → Function Calling → Shell Executor → Result
+aishell
+├── input_watcher    ← 入力をリアルタイム監視
+├── command_judge    ← コマンドかAIかを判定
+├── shell_executor   ← PTYでshellコマンドを実行
+├── ai_client        ← Claude API / MCP接続
+├── stream_renderer  ← shell出力とAI応答を一つの流れに表示
+└── memory_loader    ← core.md + memory.mdの読み込み・更新
 ```
 
-## AIOS統合
+## 入力判定
 
-- **aigpt**: メモリー、パーソナリティ分析
-- **aishell**: シェル操作、自動化
-- **統合**: AIによるOS管理の実現
+1. PATH上の実行ファイル先頭一致、shell builtin、パイプ・リダイレクト・変数代入 → shell
+2. それ以外 → AI
+3. AIが実行するコマンドも同じストリームに表示される
 
-## 技術スタック
+## 技術
 
 - Rust 2021
-- tokio (async runtime)
-- reqwest (HTTP client)
-- duct (shell execution)
-- clap (CLI framework)
+- tokio (async)
+- PTY制御 (portable-pty / nix)
+- Claude API (claude-code CLI または直接API)
+- aigpt MCP (記憶管理)
+
+## 記憶との連携
+
+起動時にcore.md + memory.mdを読む。セッション終了時に会話をmemory.mdに圧縮。
+aigpt (MCP server) が記憶の読み書きを担当する。
+
+## 開発方針
+
+1. 最小限: 入力監視 + 判定 + shell実行 + AI応答
+2. 記憶: core.md/memory.md読み込み
+3. 統合: aigpt MCP連携
+4. 仕上げ: login shell化、音声入力

src/ai.rs

@@ -0,0 +1,45 @@
+use std::process::{Command, Stdio};
+
+/// Send input to Claude CLI and return the response.
+/// Uses `claude -p` for non-interactive single-prompt mode.
+pub fn ask_claude(input: &str) -> String {
+    let result = Command::new("claude")
+        .arg("-p")
+        .arg(input)
+        .stdin(Stdio::null())
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped())
+        .output();
+
+    match result {
+        Ok(output) => {
+            if output.status.success() {
+                let response = String::from_utf8_lossy(&output.stdout).trim().to_string();
+                if response.is_empty() {
+                    "[AI] (no response)".to_string()
+                } else {
+                    response
+                }
+            } else {
+                let err = String::from_utf8_lossy(&output.stderr).trim().to_string();
+                format!("[AI error] {}", if err.is_empty() { "unknown error".to_string() } else { err })
+            }
+        }
+        Err(e) => {
+            // Fallback: claude command not found
+            format!("[AI unavailable] {}", e)
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_ask_claude_returns_string() {
+        // Just verify the function doesn't panic and returns a string
+        let result = ask_claude("echo test");
+        assert!(!result.is_empty());
+    }
+}

src/cli/mod.rs

@@ -1,3 +0,0 @@
-pub mod repl;
-
-pub use repl::Repl;

src/cli/repl.rs

@@ -1,148 +0,0 @@
-use anyhow::{Context, Result};
-use rustyline::error::ReadlineError;
-use rustyline::DefaultEditor;
-
-use crate::llm::{create_provider, LLMProvider, Message};
-use crate::shell::{execute_tool, get_tool_definitions, ShellExecutor};
-
-pub struct Repl {
-    llm: Box<dyn LLMProvider>,
-    executor: ShellExecutor,
-    messages: Vec<Message>,
-}
-
-impl Repl {
-    pub async fn new(provider: &str, model: Option<&str>) -> Result<Self> {
-        let llm = create_provider(provider, model).await?;
-        let executor = ShellExecutor::default();
-
-        let system_prompt = Message::system(
-            "You are an AI assistant that helps users interact with their system through shell commands. \
-            You have access to tools like bash, read, write, and list to help users accomplish their tasks. \
-            When a user asks you to do something, use the appropriate tools to complete the task. \
-            Always explain what you're doing and show the results to the user."
-        );
-
-        Ok(Self {
-            llm,
-            executor,
-            messages: vec![system_prompt],
-        })
-    }
-
-    pub async fn run(&mut self) -> Result<()> {
-        println!("aishell - AI-powered shell automation");
-        println!("Type 'exit' or 'quit' to exit, 'clear' to clear history\n");
-
-        let mut rl = DefaultEditor::new()?;
-
-        loop {
-            let readline = rl.readline("aishell> ");
-
-            match readline {
-                Ok(line) => {
-                    let line = line.trim();
-
-                    if line.is_empty() {
-                        continue;
-                    }
-
-                    if line == "exit" || line == "quit" {
-                        println!("Goodbye!");
-                        break;
-                    }
-
-                    if line == "clear" {
-                        self.messages.truncate(1); // Keep only system message
-                        println!("History cleared.");
-                        continue;
-                    }
-
-                    rl.add_history_entry(line)?;
-
-                    if let Err(e) = self.process_input(line).await {
-                        eprintln!("Error: {}", e);
-                    }
-                }
-                Err(ReadlineError::Interrupted) => {
-                    println!("^C");
-                    continue;
-                }
-                Err(ReadlineError::Eof) => {
-                    println!("^D");
-                    break;
-                }
-                Err(err) => {
-                    eprintln!("Error: {:?}", err);
-                    break;
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    pub async fn execute_once(&mut self, prompt: &str) -> Result<()> {
-        self.process_input(prompt).await
-    }
-
-    async fn process_input(&mut self, input: &str) -> Result<()> {
-        // Add user message
-        self.messages.push(Message::user(input));
-
-        let tools = get_tool_definitions();
-
-        // Agent loop: keep calling LLM until it's done (no more tool calls)
-        let max_iterations = 10;
-        for iteration in 0..max_iterations {
-            tracing::debug!("Agent loop iteration {}", iteration + 1);
-
-            let response = self
-                .llm
-                .chat(self.messages.clone(), Some(tools.clone()))
-                .await
-                .context("Failed to get LLM response")?;
-
-            // If there are tool calls, execute them
-            if let Some(tool_calls) = response.tool_calls {
-                tracing::info!("LLM requested {} tool calls", tool_calls.len());
-
-                // Add assistant message with tool calls
-                let mut assistant_msg = Message::assistant(response.content.clone());
-                assistant_msg.tool_calls = Some(tool_calls.clone());
-                self.messages.push(assistant_msg);
-
-                // Execute each tool call
-                for tool_call in tool_calls {
-                    let tool_name = &tool_call.function.name;
-                    let tool_args = &tool_call.function.arguments;
-
-                    println!("\n[Executing tool: {}]", tool_name);
-
-                    let result = match execute_tool(tool_name, tool_args, &self.executor) {
-                        Ok(output) => output,
-                        Err(e) => format!("Error executing tool: {}", e),
-                    };
-
-                    println!("{}", result);
-
-                    // Add tool result message
-                    self.messages.push(Message::tool(result, tool_call.id.clone()));
-                }
-
-                // Continue the loop to get the next response
-                continue;
-            }
-
-            // No tool calls, so the LLM is done
-            if !response.content.is_empty() {
-                println!("\n{}\n", response.content);
-                self.messages.push(Message::assistant(response.content));
-            }
-
-            break;
-        }
-
-        Ok(())
-    }
-}

src/config/mod.rs

@@ -1,53 +0,0 @@
-use anyhow::Result;
-use serde::{Deserialize, Serialize};
-use std::path::PathBuf;
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct Config {
-    pub llm: LLMConfig,
-    pub shell: ShellConfig,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct LLMConfig {
-    pub default_provider: String,
-    pub openai: OpenAIConfig,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct OpenAIConfig {
-    pub model: String,
-    pub base_url: Option<String>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct ShellConfig {
-    pub max_execution_time: u64,
-    pub workdir: Option<PathBuf>,
-}
-
-impl Default for Config {
-    fn default() -> Self {
-        Self {
-            llm: LLMConfig {
-                default_provider: "openai".to_string(),
-                openai: OpenAIConfig {
-                    model: "gpt-4".to_string(),
-                    base_url: None,
-                },
-            },
-            shell: ShellConfig {
-                max_execution_time: 300,
-                workdir: None,
-            },
-        }
-    }
-}
-
-impl Config {
-    pub fn load() -> Result<Self> {
-        // For now, just return default config
-        // TODO: Load from file in ~/.config/aishell/config.toml
-        Ok(Self::default())
-    }
-}

src/executor.rs

@@ -0,0 +1,80 @@
+use std::env;
+use std::path::PathBuf;
+use std::process::Command;
+
+/// Execute a shell command line and print output directly to stdout/stderr.
+/// Returns the exit code.
+pub fn execute(input: &str) -> i32 {
+    let trimmed = input.trim();
+
+    // Handle cd specially - it must affect our process
+    if trimmed == "cd" || trimmed.starts_with("cd ") {
+        return handle_cd(trimmed);
+    }
+
+    // Run everything else through sh -c for full shell semantics
+    // (pipes, redirects, globs, etc.)
+    let status = Command::new("sh")
+        .arg("-c")
+        .arg(trimmed)
+        .status();
+
+    match status {
+        Ok(s) => s.code().unwrap_or(1),
+        Err(e) => {
+            eprintln!("aishell: {}", e);
+            127
+        }
+    }
+}
+
+fn handle_cd(input: &str) -> i32 {
+    let target = input.strip_prefix("cd").unwrap().trim();
+
+    let dir: PathBuf = if target.is_empty() {
+        // cd with no args → home directory
+        match env::var("HOME") {
+            Ok(home) => PathBuf::from(home),
+            Err(_) => {
+                eprintln!("aishell: cd: HOME not set");
+                return 1;
+            }
+        }
+    } else if target.starts_with('~') {
+        // Expand ~ to HOME
+        match env::var("HOME") {
+            Ok(home) => PathBuf::from(target.replacen('~', &home, 1)),
+            Err(_) => {
+                eprintln!("aishell: cd: HOME not set");
+                return 1;
+            }
+        }
+    } else if target == "-" {
+        // cd - → previous directory
+        match env::var("OLDPWD") {
+            Ok(old) => {
+                println!("{}", old);
+                PathBuf::from(old)
+            }
+            Err(_) => {
+                eprintln!("aishell: cd: OLDPWD not set");
+                return 1;
+            }
+        }
+    } else {
+        PathBuf::from(target)
+    };
+
+    // Save current dir as OLDPWD
+    if let Ok(cwd) = env::current_dir() {
+        env::set_var("OLDPWD", cwd);
+    }
+
+    match env::set_current_dir(&dir) {
+        Ok(_) => 0,
+        Err(e) => {
+            eprintln!("aishell: cd: {}: {}", dir.display(), e);
+            1
+        }
+    }
+}

src/judge.rs

@@ -0,0 +1,150 @@
+use std::env;
+use std::path::Path;
+
+const BUILTINS: &[&str] = &[
+    "cd", "exit", "export", "unset", "alias", "unalias", "source", ".",
+    "echo", "printf", "test", "[", "set", "shift", "return", "break",
+    "continue", "eval", "exec", "trap", "wait", "read", "type", "hash",
+    "ulimit", "umask", "bg", "fg", "jobs", "kill", "pwd", "let", "local",
+    "declare", "typeset", "readonly", "getopts", "true", "false", ":",
+    "history", "logout", "popd", "pushd", "dirs", "builtin", "command",
+    "compgen", "complete", "shopt", "enable", "help", "times", "caller",
+];
+
+/// Determine whether user input should be executed as a shell command.
+pub fn is_command(input: &str) -> bool {
+    let trimmed = input.trim();
+    if trimmed.is_empty() {
+        return false;
+    }
+
+    // Shell operators: pipe, redirect, background, semicolon, logical operators
+    if contains_shell_operator(trimmed) {
+        return true;
+    }
+
+    // Variable assignment: FOO=bar
+    if is_variable_assignment(trimmed) {
+        return true;
+    }
+
+    // Extract first token
+    let first_token = match trimmed.split_whitespace().next() {
+        Some(t) => t,
+        None => return false,
+    };
+
+    // Shell builtin
+    if BUILTINS.contains(&first_token) {
+        return true;
+    }
+
+    // Absolute or relative path to executable
+    if first_token.contains('/') {
+        return Path::new(first_token).exists();
+    }
+
+    // Search PATH
+    is_in_path(first_token)
+}
+
+fn contains_shell_operator(input: &str) -> bool {
+    // Check for pipes, redirects, etc. outside of quotes
+    let mut in_single = false;
+    let mut in_double = false;
+    let mut prev = '\0';
+
+    for ch in input.chars() {
+        match ch {
+            '\'' if !in_double && prev != '\\' => in_single = !in_single,
+            '"' if !in_single && prev != '\\' => in_double = !in_double,
+            '|' | ';' if !in_single && !in_double => return true,
+            '>' | '<' if !in_single && !in_double => return true,
+            '&' if !in_single && !in_double => return true,
+            _ => {}
+        }
+        prev = ch;
+    }
+    false
+}
+
+fn is_variable_assignment(input: &str) -> bool {
+    // Pattern: NAME=value (NAME starts with letter/underscore, contains only alnum/underscore)
+    if let Some(eq_pos) = input.find('=') {
+        if eq_pos == 0 {
+            return false;
+        }
+        let name = &input[..eq_pos];
+        // Must not contain spaces before =
+        if name.contains(' ') {
+            return false;
+        }
+        let first = name.chars().next().unwrap();
+        if !first.is_alphabetic() && first != '_' {
+            return false;
+        }
+        return name.chars().all(|c| c.is_alphanumeric() || c == '_');
+    }
+    false
+}
+
+fn is_in_path(cmd: &str) -> bool {
+    let path_var = match env::var("PATH") {
+        Ok(p) => p,
+        Err(_) => return false,
+    };
+
+    for dir in path_var.split(':') {
+        let full = Path::new(dir).join(cmd);
+        if full.is_file() {
+            return true;
+        }
+    }
+    false
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_builtins() {
+        assert!(is_command("cd /tmp"));
+        assert!(is_command("export FOO=bar"));
+        assert!(is_command("echo hello"));
+        assert!(is_command("pwd"));
+    }
+
+    #[test]
+    fn test_path_commands() {
+        assert!(is_command("ls"));
+        assert!(is_command("ls -la"));
+        assert!(is_command("cat /etc/hostname"));
+    }
+
+    #[test]
+    fn test_shell_operators() {
+        assert!(is_command("ls | grep foo"));
+        assert!(is_command("echo hello > /tmp/out"));
+        assert!(is_command("cat file1 && cat file2"));
+    }
+
+    #[test]
+    fn test_variable_assignment() {
+        assert!(is_command("FOO=bar"));
+        assert!(is_command("MY_VAR=hello"));
+    }
+
+    #[test]
+    fn test_ai_input() {
+        assert!(!is_command("macbookがフリーズする原因を調べて"));
+        assert!(!is_command("hello world what is this"));
+        assert!(!is_command("Rustでhello worldを書いて"));
+    }
+
+    #[test]
+    fn test_empty() {
+        assert!(!is_command(""));
+        assert!(!is_command("   "));
+    }
+}

src/lib.rs

@@ -1,7 +1,3 @@
-pub mod cli;
-pub mod config;
-pub mod llm;
-pub mod mcp;
-pub mod shell;
-
-pub use config::Config;
+pub mod judge;
+pub mod executor;
+pub mod ai;

src/llm/mod.rs

@@ -1,18 +0,0 @@
-pub mod provider;
-pub mod openai;
-
-pub use provider::{LLMProvider, Message, Role, ToolCall, ToolDefinition, ChatResponse};
-pub use openai::OpenAIProvider;
-
-use anyhow::Result;
-
-/// Create an LLM provider based on the provider name
-pub async fn create_provider(provider: &str, model: Option<&str>) -> Result<Box<dyn LLMProvider>> {
-    match provider.to_lowercase().as_str() {
-        "openai" => {
-            let provider = OpenAIProvider::new(model)?;
-            Ok(Box::new(provider))
-        }
-        _ => anyhow::bail!("Unsupported provider: {}", provider),
-    }
-}

src/llm/openai.rs

@@ -1,126 +0,0 @@
-use anyhow::{Context, Result};
-use async_trait::async_trait;
-use reqwest::Client;
-use serde::{Deserialize, Serialize};
-use std::env;
-
-use super::provider::{ChatResponse, LLMProvider, Message, ToolCall, ToolDefinition};
-
-#[derive(Debug, Serialize)]
-struct ChatRequest {
-    model: String,
-    messages: Vec<Message>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    tools: Option<Vec<ToolDefinition>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    tool_choice: Option<String>,
-}
-
-#[derive(Debug, Deserialize)]
-struct ChatCompletionResponse {
-    choices: Vec<Choice>,
-}
-
-#[derive(Debug, Deserialize)]
-struct Choice {
-    message: ResponseMessage,
-    finish_reason: String,
-}
-
-#[derive(Debug, Deserialize)]
-struct ResponseMessage {
-    #[serde(default)]
-    content: Option<String>,
-    #[serde(default)]
-    tool_calls: Option<Vec<ToolCall>>,
-}
-
-pub struct OpenAIProvider {
-    client: Client,
-    api_key: String,
-    base_url: String,
-    model: String,
-}
-
-impl OpenAIProvider {
-    pub fn new(model: Option<&str>) -> Result<Self> {
-        let api_key = env::var("OPENAI_API_KEY")
-            .context("OPENAI_API_KEY environment variable not set")?;
-
-        let base_url = env::var("OPENAI_BASE_URL")
-            .unwrap_or_else(|_| "https://api.openai.com/v1".to_string());
-
-        let model = model
-            .map(|s| s.to_string())
-            .or_else(|| env::var("OPENAI_MODEL").ok())
-            .unwrap_or_else(|| "gpt-4".to_string());
-
-        Ok(Self {
-            client: Client::new(),
-            api_key,
-            base_url,
-            model,
-        })
-    }
-}
-
-#[async_trait]
-impl LLMProvider for OpenAIProvider {
-    async fn chat(
-        &self,
-        messages: Vec<Message>,
-        tools: Option<Vec<ToolDefinition>>,
-    ) -> Result<ChatResponse> {
-        let url = format!("{}/chat/completions", self.base_url);
-
-        let tool_choice = if tools.is_some() {
-            Some("auto".to_string())
-        } else {
-            None
-        };
-
-        let request = ChatRequest {
-            model: self.model.clone(),
-            messages,
-            tools,
-            tool_choice,
-        };
-
-        let response = self
-            .client
-            .post(&url)
-            .header("Authorization", format!("Bearer {}", self.api_key))
-            .header("Content-Type", "application/json")
-            .json(&request)
-            .send()
-            .await
-            .context("Failed to send request to OpenAI API")?;
-
-        if !response.status().is_success() {
-            let status = response.status();
-            let error_text = response.text().await.unwrap_or_default();
-            anyhow::bail!("OpenAI API error ({}): {}", status, error_text);
-        }
-
-        let completion: ChatCompletionResponse = response
-            .json()
-            .await
-            .context("Failed to parse OpenAI API response")?;
-
-        let choice = completion
-            .choices
-            .into_iter()
-            .next()
-            .context("No choices in response")?;
-
-        Ok(ChatResponse {
-            content: choice.message.content.unwrap_or_default(),
-            tool_calls: choice.message.tool_calls,
-            finish_reason: choice.finish_reason,
-        })
-    }
-
-    fn model_name(&self) -> &str {
-        &self.model
-    }
-}

src/llm/provider.rs

@@ -1,104 +0,0 @@
-use anyhow::Result;
-use async_trait::async_trait;
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
-pub enum Role {
-    System,
-    User,
-    Assistant,
-    Tool,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct Message {
-    pub role: Role,
-    pub content: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub tool_calls: Option<Vec<ToolCall>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub tool_call_id: Option<String>,
-}
-
-impl Message {
-    pub fn system(content: impl Into<String>) -> Self {
-        Self {
-            role: Role::System,
-            content: content.into(),
-            tool_calls: None,
-            tool_call_id: None,
-        }
-    }
-
-    pub fn user(content: impl Into<String>) -> Self {
-        Self {
-            role: Role::User,
-            content: content.into(),
-            tool_calls: None,
-            tool_call_id: None,
-        }
-    }
-
-    pub fn assistant(content: impl Into<String>) -> Self {
-        Self {
-            role: Role::Assistant,
-            content: content.into(),
-            tool_calls: None,
-            tool_call_id: None,
-        }
-    }
-
-    pub fn tool(content: impl Into<String>, tool_call_id: String) -> Self {
-        Self {
-            role: Role::Tool,
-            content: content.into(),
-            tool_calls: None,
-            tool_call_id: Some(tool_call_id),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct ToolCall {
-    pub id: String,
-    #[serde(rename = "type")]
-    pub call_type: String,
-    pub function: FunctionCall,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct FunctionCall {
-    pub name: String,
-    pub arguments: String,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct ToolDefinition {
-    #[serde(rename = "type")]
-    pub tool_type: String,
-    pub function: FunctionDefinition,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct FunctionDefinition {
-    pub name: String,
-    pub description: String,
-    pub parameters: serde_json::Value,
-}
-
-#[derive(Debug)]
-pub struct ChatResponse {
-    pub content: String,
-    pub tool_calls: Option<Vec<ToolCall>>,
-    pub finish_reason: String,
-}
-
-#[async_trait]
-pub trait LLMProvider: Send + Sync {
-    /// Send a chat completion request
-    async fn chat(&self, messages: Vec<Message>, tools: Option<Vec<ToolDefinition>>) -> Result<ChatResponse>;
-
-    /// Get the model name
-    fn model_name(&self) -> &str;
-}

src/main.rs

@@ -1,74 +1,79 @@
-use anyhow::Result;
-use clap::{Parser, Subcommand};
-use tracing_subscriber;
+use std::env;
 
-use aishell::cli::Repl;
-use aishell::mcp::MCPServer;
+use rustyline::error::ReadlineError;
+use rustyline::DefaultEditor;
 
-#[derive(Parser)]
-#[command(name = "aishell")]
-#[command(about = "AI-powered shell automation - A generic alternative to Claude Code")]
-#[command(version)]
-struct Cli {
-    #[command(subcommand)]
-    command: Commands,
+use aishell::judge;
+use aishell::executor;
+use aishell::ai;
+
+fn prompt_string() -> String {
+    let cwd = env::current_dir()
+        .map(|p| {
+            if let Ok(home) = env::var("HOME") {
+                if let Some(rest) = p.to_str().and_then(|s| s.strip_prefix(&home)) {
+                    if rest.is_empty() {
+                        return "~".to_string();
+                    }
+                    return format!("~{rest}");
+                }
+            }
+            p.display().to_string()
+        })
+        .unwrap_or_else(|_| "?".to_string());
+
+    format!("{cwd} $ ")
 }
 
-#[derive(Subcommand)]
-enum Commands {
-    /// Start interactive AI shell
-    Shell {
-        /// LLM provider (openai, anthropic, ollama)
-        #[arg(short, long, default_value = "openai")]
-        provider: String,
-
-        /// Model name
-        #[arg(short, long)]
-        model: Option<String>,
-    },
-
-    /// Execute a single command via AI
-    Exec {
-        /// Command prompt
-        prompt: String,
-
-        /// LLM provider
-        #[arg(short = 'p', long, default_value = "openai")]
-        provider: String,
-    },
-
-    /// Start MCP server (for Claude Desktop integration)
-    Server,
-}
-
-#[tokio::main]
-async fn main() -> Result<()> {
-    // Initialize logging
-    tracing_subscriber::fmt()
-        .with_env_filter(
-            tracing_subscriber::EnvFilter::from_default_env()
-                .add_directive(tracing::Level::INFO.into()),
-        )
-        .init();
-
-    let cli = Cli::parse();
-
-    match cli.command {
-        Commands::Shell { provider, model } => {
-            let mut repl = Repl::new(&provider, model.as_deref()).await?;
-            repl.run().await?;
+fn main() {
+    let mut rl = match DefaultEditor::new() {
+        Ok(editor) => editor,
+        Err(e) => {
+            eprintln!("aishell: failed to initialize: {}", e);
+            std::process::exit(1);
         }
+    };
 
-        Commands::Exec { prompt, provider } => {
-            let mut repl = Repl::new(&provider, None).await?;
-            repl.execute_once(&prompt).await?;
-        }
+    let history_path = env::var("HOME")
+        .map(|h| format!("{}/.aishell_history", h))
+        .unwrap_or_else(|_| ".aishell_history".to_string());
+    let _ = rl.load_history(&history_path);
 
-        Commands::Server => {
-            let server = MCPServer::new()?;
-            server.run().await?;
+    loop {
+        let prompt = prompt_string();
+        match rl.readline(&prompt) {
+            Ok(line) => {
+                let input = line.trim();
+                if input.is_empty() {
+                    continue;
+                }
+
+                let _ = rl.add_history_entry(input);
+
+                if input == "exit" || input == "quit" {
+                    break;
+                }
+
+                if judge::is_command(input) {
+                    executor::execute(input);
+                } else {
+                    // Send to Claude AI
+                    let response = ai::ask_claude(input);
+                    println!("{}", response);
+                }
+            }
+            Err(ReadlineError::Interrupted) => {
+                continue;
+            }
+            Err(ReadlineError::Eof) => {
+                break;
+            }
+            Err(e) => {
+                eprintln!("aishell: {}", e);
+                break;
+            }
         }
     }
 
-    Ok(())
+    let _ = rl.save_history(&history_path);
 }

src/mcp/mod.rs

@@ -1,121 +0,0 @@
-use anyhow::Result;
-use serde_json::json;
-use tokio::io::{self, AsyncBufReadExt, AsyncWriteExt, BufReader};
-
-use crate::shell::{execute_tool, get_tool_definitions, ShellExecutor};
-
-pub struct MCPServer {
-    executor: ShellExecutor,
-}
-
-impl MCPServer {
-    pub fn new() -> Result<Self> {
-        Ok(Self {
-            executor: ShellExecutor::default(),
-        })
-    }
-
-    pub async fn run(&self) -> Result<()> {
-        tracing::info!("Starting MCP server");
-
-        let stdin = io::stdin();
-        let mut stdout = io::stdout();
-        let mut reader = BufReader::new(stdin);
-        let mut line = String::new();
-
-        loop {
-            line.clear();
-            let n = reader.read_line(&mut line).await?;
-
-            if n == 0 {
-                break; // EOF
-            }
-
-            let request: serde_json::Value = match serde_json::from_str(&line) {
-                Ok(v) => v,
-                Err(e) => {
-                    tracing::error!("Failed to parse request: {}", e);
-                    continue;
-                }
-            };
-
-            let response = self.handle_request(&request).await;
-            let response_str = serde_json::to_string(&response)?;
-
-            stdout.write_all(response_str.as_bytes()).await?;
-            stdout.write_all(b"\n").await?;
-            stdout.flush().await?;
-        }
-
-        Ok(())
-    }
-
-    async fn handle_request(&self, request: &serde_json::Value) -> serde_json::Value {
-        let method = request["method"].as_str().unwrap_or("");
-
-        match method {
-            "initialize" => {
-                json!({
-                    "protocolVersion": "2024-11-05",
-                    "capabilities": {
-                        "tools": {}
-                    },
-                    "serverInfo": {
-                        "name": "aishell",
-                        "version": "0.1.0"
-                    }
-                })
-            }
-
-            "tools/list" => {
-                let tools = get_tool_definitions();
-                let tool_list: Vec<_> = tools
-                    .iter()
-                    .map(|t| {
-                        json!({
-                            "name": t.function.name,
-                            "description": t.function.description,
-                            "inputSchema": t.function.parameters
-                        })
-                    })
-                    .collect();
-
-                json!({
-                    "tools": tool_list
-                })
-            }
-
-            "tools/call" => {
-                let tool_name = request["params"]["name"].as_str().unwrap_or("");
-                let arguments = request["params"]["arguments"].to_string();
-
-                let result = match execute_tool(tool_name, &arguments, &self.executor) {
-                    Ok(output) => json!({
-                        "content": [{
-                            "type": "text",
-                            "text": output
-                        }]
-                    }),
-                    Err(e) => json!({
-                        "content": [{
-                            "type": "text",
-                            "text": format!("Error: {}", e)
-                        }],
-                        "isError": true
-                    }),
-                };
-
-                result
-            }
-
-            _ => {
-                json!({
-                    "error": {
-                        "code": -32601,
-                        "message": format!("Method not found: {}", method)
-                    }
-                })
-            }
-        }
-    }
-}

src/shell/executor.rs

@@ -1,112 +0,0 @@
-use anyhow::{Context, Result};
-use duct::cmd;
-use std::path::PathBuf;
-use std::time::Duration;
-
-#[derive(Debug)]
-pub struct ExecutionResult {
-    pub stdout: String,
-    pub stderr: String,
-    pub exit_code: i32,
-    pub success: bool,
-}
-
-pub struct ShellExecutor {
-    workdir: PathBuf,
-    timeout: Duration,
-}
-
-impl ShellExecutor {
-    pub fn new(workdir: Option<PathBuf>) -> Result<Self> {
-        let workdir = workdir.unwrap_or_else(|| {
-            std::env::current_dir().expect("Failed to get current directory")
-        });
-
-        Ok(Self {
-            workdir,
-            timeout: Duration::from_secs(300), // 5 minutes default
-        })
-    }
-
-    pub fn with_timeout(mut self, timeout: Duration) -> Self {
-        self.timeout = timeout;
-        self
-    }
-
-    pub fn execute(&self, command: &str) -> Result<ExecutionResult> {
-        tracing::info!("Executing command: {}", command);
-
-        let output = cmd!("sh", "-c", command)
-            .dir(&self.workdir)
-            .stdout_capture()
-            .stderr_capture()
-            .unchecked()
-            .run()
-            .context("Failed to execute command")?;
-
-        let stdout = String::from_utf8_lossy(&output.stdout).to_string();
-        let stderr = String::from_utf8_lossy(&output.stderr).to_string();
-        let exit_code = output.status.code().unwrap_or(-1);
-        let success = output.status.success();
-
-        tracing::debug!(
-            "Command result: exit_code={}, stdout_len={}, stderr_len={}",
-            exit_code,
-            stdout.len(),
-            stderr.len()
-        );
-
-        Ok(ExecutionResult {
-            stdout,
-            stderr,
-            exit_code,
-            success,
-        })
-    }
-
-    pub fn read_file(&self, path: &str) -> Result<String> {
-        let full_path = self.workdir.join(path);
-        std::fs::read_to_string(&full_path)
-            .with_context(|| format!("Failed to read file: {}", path))
-    }
-
-    pub fn write_file(&self, path: &str, content: &str) -> Result<()> {
-        let full_path = self.workdir.join(path);
-
-        // Create parent directories if needed
-        if let Some(parent) = full_path.parent() {
-            std::fs::create_dir_all(parent)?;
-        }
-
-        std::fs::write(&full_path, content)
-            .with_context(|| format!("Failed to write file: {}", path))
-    }
-
-    pub fn list_files(&self, pattern: Option<&str>) -> Result<Vec<String>> {
-        let pattern = pattern.unwrap_or("*");
-
-        let output = cmd!("sh", "-c", format!("ls -1 {}", pattern))
-            .dir(&self.workdir)
-            .stdout_capture()
-            .stderr_capture()
-            .unchecked()
-            .run()?;
-
-        if !output.status.success() {
-            return Ok(vec![]);
-        }
-
-        let files = String::from_utf8_lossy(&output.stdout)
-            .lines()
-            .map(|s| s.to_string())
-            .collect();
-
-        Ok(files)
-    }
-}
-
-impl Default for ShellExecutor {
-    fn default() -> Self {
-        Self::new(None).expect("Failed to create default ShellExecutor")
-    }
-}

src/shell/mod.rs

@@ -1,5 +0,0 @@
-pub mod executor;
-pub mod tools;
-
-pub use executor::{ShellExecutor, ExecutionResult};
-pub use tools::{get_tool_definitions, execute_tool, ToolArguments};

src/shell/tools.rs

@@ -1,162 +0,0 @@
-use anyhow::{Context, Result};
-use serde::Deserialize;
-use serde_json::json;
-
-use crate::llm::ToolDefinition;
-use super::executor::ShellExecutor;
-
-#[derive(Debug, Deserialize)]
-#[serde(tag = "tool", rename_all = "snake_case")]
-pub enum ToolArguments {
-    Bash { command: String },
-    Read { path: String },
-    Write { path: String, content: String },
-    List { pattern: Option<String> },
-}
-
-/// Get all available tool definitions for the LLM
-pub fn get_tool_definitions() -> Vec<ToolDefinition> {
-    vec![
-        ToolDefinition {
-            tool_type: "function".to_string(),
-            function: crate::llm::provider::FunctionDefinition {
-                name: "bash".to_string(),
-                description: "Execute a bash command and return the output. Use this for running shell commands, git operations, package management, etc.".to_string(),
-                parameters: json!({
-                    "type": "object",
-                    "properties": {
-                        "command": {
-                            "type": "string",
-                            "description": "The bash command to execute"
-                        }
-                    },
-                    "required": ["command"]
-                }),
-            },
-        },
-        ToolDefinition {
-            tool_type: "function".to_string(),
-            function: crate::llm::provider::FunctionDefinition {
-                name: "read".to_string(),
-                description: "Read the contents of a file. Returns the file content as a string.".to_string(),
-                parameters: json!({
-                    "type": "object",
-                    "properties": {
-                        "path": {
-                            "type": "string",
-                            "description": "The path to the file to read"
-                        }
-                    },
-                    "required": ["path"]
-                }),
-            },
-        },
-        ToolDefinition {
-            tool_type: "function".to_string(),
-            function: crate::llm::provider::FunctionDefinition {
-                name: "write".to_string(),
-                description: "Write content to a file. Creates the file if it doesn't exist, overwrites if it does.".to_string(),
-                parameters: json!({
-                    "type": "object",
-                    "properties": {
-                        "path": {
-                            "type": "string",
-                            "description": "The path to the file to write"
-                        },
-                        "content": {
-                            "type": "string",
-                            "description": "The content to write to the file"
-                        }
-                    },
-                    "required": ["path", "content"]
-                }),
-            },
-        },
-        ToolDefinition {
-            tool_type: "function".to_string(),
-            function: crate::llm::provider::FunctionDefinition {
-                name: "list".to_string(),
-                description: "List files in the current directory. Optionally filter by pattern.".to_string(),
-                parameters: json!({
-                    "type": "object",
-                    "properties": {
-                        "pattern": {
-                            "type": "string",
-                            "description": "Optional glob pattern to filter files (e.g., '*.rs')"
-                        }
-                    },
-                    "required": []
-                }),
-            },
-        },
-    ]
-}
-
-/// Execute a tool call
-pub fn execute_tool(
-    tool_name: &str,
-    arguments: &str,
-    executor: &ShellExecutor,
-) -> Result<String> {
-    tracing::info!("Executing tool: {} with args: {}", tool_name, arguments);
-
-    match tool_name {
-        "bash" => {
-            let args: serde_json::Value = serde_json::from_str(arguments)?;
-            let command = args["command"]
-                .as_str()
-                .context("Missing 'command' argument")?;
-
-            let result = executor.execute(command)?;
-
-            let output = if result.success {
-                format!("Exit code: {}\n\nStdout:\n{}\n\nStderr:\n{}",
-                    result.exit_code,
-                    result.stdout,
-                    result.stderr
-                )
-            } else {
-                format!("Command failed with exit code: {}\n\nStdout:\n{}\n\nStderr:\n{}",
-                    result.exit_code,
-                    result.stdout,
-                    result.stderr
-                )
-            };
-
-            Ok(output)
-        }
-
-        "read" => {
-            let args: serde_json::Value = serde_json::from_str(arguments)?;
-            let path = args["path"]
-                .as_str()
-                .context("Missing 'path' argument")?;
-
-            let content = executor.read_file(path)?;
-            Ok(content)
-        }
-
-        "write" => {
-            let args: serde_json::Value = serde_json::from_str(arguments)?;
-            let path = args["path"]
-                .as_str()
-                .context("Missing 'path' argument")?;
-            let content = args["content"]
-                .as_str()
-                .context("Missing 'content' argument")?;
-
-            executor.write_file(path, content)?;
-            Ok(format!("Successfully wrote to file: {}", path))
-        }
-
-        "list" => {
-            let args: serde_json::Value = serde_json::from_str(arguments)?;
-            let pattern = args["pattern"].as_str();
-
-            let files = executor.list_files(pattern)?;
-            Ok(files.join("\n"))
-        }
-
-        _ => anyhow::bail!("Unknown tool: {}", tool_name),
-    }
-}