feat: add notification sounds (#44)

### Explanation

_No response_

### Issue

_No response_

### Attestations

- [ ] I have read and agree to the [Code of Conduct](https://docs.nhcarrigan.com/community/coc/)
- [ ] I have read and agree to the [Community Guidelines](https://docs.nhcarrigan.com/community/guide/).
- [ ] My contribution complies with the [Contributor Covenant](https://docs.nhcarrigan.com/dev/covenant/).

### Dependencies

- [ ] I have pinned the dependencies to a specific patch version.

### Style

- [ ] I have run the linter and resolved any errors.
- [ ] My pull request uses an appropriate title, matching the conventional commit standards.
- [ ] My scope of feat/fix/chore/etc. correctly matches the nature of changes in my pull request.

### Tests

- [ ] My contribution adds new code, and I have added tests to cover it.
- [ ] My contribution modifies existing code, and I have updated the tests to reflect these changes.
- [ ] All new and existing tests pass locally with my changes.
- [ ] Code coverage remains at or above the configured threshold.

### Documentation

_No response_

### Versioning

_No response_

Reviewed-on: #44
Co-authored-by: Naomi Carrigan <commits@nhcarrigan.com>
Co-committed-by: Naomi Carrigan <commits@nhcarrigan.com>

.gitattributes

@@ -8,3 +8,4 @@
 *.jpg binary
 *.icons binary
 *.ico binary
+*.icns binary

.gitea/issue_template/bug_report.yaml

@@ -1,6 +1,6 @@
 name: 🐛 Bug Report
 description: Something isn't working as expected? Let us know!
-title: '[BUG] - '
+title: "[BUG] - "
 labels:
   - "status/awaiting triage"
 body:
@@ -50,7 +50,7 @@ body:
       description: The operating system you are using, including the version/build number.
     validations:
       required: true
-# Remove this section for non-web apps.
+  # Remove this section for non-web apps.
   - type: input
     id: browser
     attributes:
@@ -66,4 +66,3 @@ body:
         - No
     validations:
       required: true
-

.gitea/issue_template/feature_proposal.yml

@@ -1,6 +1,6 @@
 name: 💭 Feature Proposal
 description: Have an idea for how we can improve? Share it here!
-title: '[FEAT] - '
+title: "[FEAT] - "
 labels:
   - "status/awaiting triage"
 body:

.gitea/issue_template/other.yml

@@ -1,6 +1,6 @@
 name: ❓ Other Issue
 description: I have something that is neither a bug nor a feature request.
-title: '[OTHER] - '
+title: "[OTHER] - "
 labels:
   - "status/awaiting triage"
 body:

.gitea/workflows/ci.yml

@@ -0,0 +1,189 @@
+name: CI
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+  workflow_dispatch:
+
+jobs:
+  lint-and-test:
+    name: Lint & Test
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install Linux dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            libwebkit2gtk-4.1-dev \
+            librsvg2-dev \
+            patchelf \
+            libgtk-3-dev \
+            libayatana-appindicator3-dev
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: pnpm
+
+      - name: Install frontend dependencies
+        run: pnpm install
+
+      - name: Run ESLint
+        run: pnpm lint
+
+      - name: Run Prettier check
+        run: pnpm format:check
+
+      - name: Run Svelte Check
+        run: pnpm check
+
+      - name: Run frontend tests
+        run: pnpm test
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          components: clippy
+
+      - name: Cache Rust dependencies
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            src-tauri/target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Run Clippy
+        working-directory: src-tauri
+        run: cargo clippy --all-targets --all-features -- -D warnings
+
+      - name: Run Rust tests
+        working-directory: src-tauri
+        run: cargo test
+
+  build-linux:
+    name: Build Linux
+    runs-on: ubuntu-latest
+    needs: lint-and-test
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install Linux dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            libwebkit2gtk-4.1-dev \
+            librsvg2-dev \
+            patchelf \
+            libgtk-3-dev \
+            libayatana-appindicator3-dev \
+            xdg-utils
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: pnpm
+
+      - name: Install frontend dependencies
+        run: pnpm install
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Cache Rust dependencies
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            src-tauri/target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Build Linux
+        run: pnpm build:linux
+
+  build-windows:
+    name: Build Windows (cross-compile)
+    runs-on: ubuntu-latest
+    needs: lint-and-test
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install Linux dependencies for cross-compilation
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            libwebkit2gtk-4.1-dev \
+            librsvg2-dev \
+            patchelf \
+            libgtk-3-dev \
+            libayatana-appindicator3-dev \
+            clang \
+            lld \
+            llvm \
+            nsis
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: pnpm
+
+      - name: Install frontend dependencies
+        run: pnpm install
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: x86_64-pc-windows-msvc
+
+      - name: Install cargo-xwin
+        run: |
+          curl -fsSL https://github.com/rust-cross/cargo-xwin/releases/download/v0.20.2/cargo-xwin-v0.20.2.x86_64-unknown-linux-musl.tar.gz | tar xz
+          sudo mv cargo-xwin /usr/local/bin/
+
+      - name: Cache Rust dependencies
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            src-tauri/target/
+          key: ${{ runner.os }}-cargo-windows-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Build Windows
+        run: pnpm build:windows

.gitea/workflows/security.yml

@@ -2,11 +2,11 @@ name: Security Scan and Upload
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
   schedule:
-    - cron: '0 0 * * 1'
+    - cron: "0 0 * * 1"
   workflow_dispatch:
 
 jobs:

.prettierignore

@@ -0,0 +1,7 @@
+build/
+.svelte-kit/
+dist/
+src-tauri/target/
+node_modules/
+.pnpm-store/
+pnpm-lock.yaml

.prettierrc

@@ -0,0 +1,16 @@
+{
+  "semi": true,
+  "singleQuote": false,
+  "tabWidth": 2,
+  "trailingComma": "es5",
+  "printWidth": 100,
+  "plugins": ["prettier-plugin-svelte"],
+  "overrides": [
+    {
+      "files": "*.svelte",
+      "options": {
+        "parser": "svelte"
+      }
+    }
+  ]
+}

.vscode/extensions.json

@@ -1,7 +1,3 @@
 {
-  "recommendations": [
+  "recommendations": ["svelte.svelte-vscode", "tauri-apps.tauri-vscode", "rust-lang.rust-analyzer"]
-    "svelte.svelte-vscode",
-    "tauri-apps.tauri-vscode",
-    "rust-lang.rust-analyzer"
-  ]
 }

README.md

@@ -1,146 +1 @@
-# Hikari Desktop
+tem
-
-A Linux desktop application that wraps Claude Code with an anime girl character that reacts to Claude's activities in real-time.
-
-## Features
-
-- Visual character that reflects Claude's current state (thinking, typing, searching, coding, etc.)
-- Terminal-style output display
-- Permission prompts with approve/deny interface
-- Real-time state detection from Claude Code's NDJSON stream
-
-## Installation
-
-### 1. Install Claude Code
-
-Hikari Desktop requires Claude Code to be installed and authenticated:
-
-```bash
-npm install -g @anthropic-ai/claude-code
-claude  # Follow the prompts to authenticate
-```
-
-### 2. Install Runtime Dependencies
-
-**Debian/Ubuntu:**
-```bash
-sudo apt install libwebkit2gtk-4.1-0 libgtk-3-0 libayatana-appindicator3-1 xdg-utils
-```
-
-**Fedora:**
-```bash
-sudo dnf install webkit2gtk4.1 gtk3 libappindicator-gtk3 xdg-utils
-```
-
-**Arch Linux:**
-```bash
-sudo pacman -S webkit2gtk-4.1 gtk3 libappindicator-gtk3 xdg-utils
-```
-
-| Package | Purpose |
-|---------|---------|
-| webkit2gtk-4.1 | WebView rendering (app UI) |
-| gtk3 | Window management and native widgets |
-| libappindicator | System tray support |
-| xdg-utils | Opening URLs/files with default applications |
-
-### 3. Install Hikari Desktop
-
-Download the latest release for your distribution:
-
-**AppImage** (any distro):
-```bash
-chmod +x hikari-desktop_*.AppImage
-./hikari-desktop_*.AppImage
-```
-
-**Debian/Ubuntu:**
-```bash
-sudo dpkg -i hikari-desktop_*.deb
-```
-
-**Fedora:**
-```bash
-sudo rpm -i hikari-desktop-*.rpm
-```
-
-## Character States
-
-| State | Trigger |
-|-------|---------|
-| Idle | Waiting for user input |
-| Thinking | Processing/API call in progress |
-| Typing | Streaming text output |
-| Searching | Using Read/Glob/Grep tools |
-| Coding | Using Edit/Write tools |
-| MCP | Running MCP tool calls |
-| Permission | Permission prompt needed |
-| Success | Task completed |
-| Error | Error occurred |
-
-## Building from Source
-
-### Prerequisites
-
-- Node.js and pnpm
-- Rust toolchain
-
-### Build
-
-```bash
-# Install dependencies
-pnpm install
-
-# Development mode
-pnpm run dev
-
-# Build for Linux
-pnpm tauri build
-```
-
-## Architecture
-
-```
-Linux (Tauri App)
-├── Svelte Frontend
-│   ├── AnimeGirl (sprites + animations)
-│   ├── Terminal (output display)
-│   ├── InputBar (user input)
-│   └── PermissionModal (approve/deny)
-└── Rust Backend
-    ├── Process Manager (spawn & communicate)
-    └── State Parser (NDJSON → character state)
-                │
-                │ stdin/stdout (NDJSON stream)
-                ▼
-claude -p --output-format stream-json --input-format stream-json
-```
-
-## Tech Stack
-
-- **Tauri 2.x** - Desktop framework with Rust backend
-- **Svelte 5** - Reactive frontend with runes
-- **Tailwind CSS** - Styling
-- **Tokio** - Async runtime for process management
-
-## Feedback and Bugs
-
-If you have feedback or a bug report, please feel free to open a ticket request in our [Discord](https://chat.nhcarrigan.com)!
-
-## Contributing
-
-If you would like to contribute to the project, you may create a Pull Request containing your proposed changes and we will review it as soon as we are able! Please review our [contributing guidelines](CONTRIBUTING.md) first.
-
-## Code of Conduct
-
-Before interacting with our community, please read our [Code of Conduct](CODE_OF_CONDUCT.md).
-
-## License
-
-This software is licensed under our [global software license](https://docs.nhcarrigan.com/#/license).
-
-Copyright held by Naomi Carrigan.
-
-## Contact
-
-We may be contacted through our [Chat Server](http://chat.nhcarrigan.com) or via email at `contact@nhcarrigan.com`.

eslint.config.js

@@ -0,0 +1,32 @@
+import js from "@eslint/js";
+import tseslint from "typescript-eslint";
+import svelte from "eslint-plugin-svelte";
+import prettier from "eslint-config-prettier";
+import globals from "globals";
+
+export default tseslint.config(
+  js.configs.recommended,
+  ...tseslint.configs.recommended,
+  ...svelte.configs["flat/recommended"],
+  prettier,
+  ...svelte.configs["flat/prettier"],
+  {
+    languageOptions: {
+      globals: {
+        ...globals.browser,
+        ...globals.node,
+      },
+    },
+  },
+  {
+    files: ["**/*.svelte", "**/*.svelte.ts", "**/*.svelte.js"],
+    languageOptions: {
+      parserOptions: {
+        parser: tseslint.parser,
+      },
+    },
+  },
+  {
+    ignores: ["build/", ".svelte-kit/", "dist/", "src-tauri/target/", "node_modules/"],
+  }
+);

package.json

@@ -9,25 +9,50 @@
     "preview": "vite preview",
     "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
     "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
-    "tauri": "tauri"
+    "tauri": "tauri",
+    "build:linux": "tauri build",
+    "build:windows": "tauri build --runner cargo-xwin --target x86_64-pc-windows-msvc",
+    "build:all": "pnpm build:linux && pnpm build:windows",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:coverage": "vitest run --coverage",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "format": "prettier --write .",
+    "format:check": "prettier --check ."
   },
   "license": "MIT",
   "dependencies": {
     "@tauri-apps/api": "^2",
     "@tauri-apps/plugin-dialog": "^2",
     "@tauri-apps/plugin-opener": "^2",
-    "@tauri-apps/plugin-shell": "^2.3.4"
+    "@tauri-apps/plugin-shell": "^2.3.4",
+    "@tauri-apps/plugin-store": "^2",
+    "@tauri-apps/plugin-notification": "^2",
+    "@tauri-apps/plugin-os": "^2"
   },
   "devDependencies": {
+    "@eslint/js": "^9.39.2",
     "@sveltejs/adapter-static": "^3.0.6",
     "@sveltejs/kit": "^2.9.0",
     "@sveltejs/vite-plugin-svelte": "^5.0.0",
     "@tailwindcss/vite": "^4.1.18",
     "@tauri-apps/cli": "^2",
+    "@testing-library/jest-dom": "^6.9.1",
+    "@testing-library/svelte": "^5.3.1",
+    "eslint": "^9.39.2",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-svelte": "^3.14.0",
+    "globals": "^17.0.0",
+    "jsdom": "^27.4.0",
+    "prettier": "^3.8.0",
+    "prettier-plugin-svelte": "^3.4.1",
     "svelte": "^5.0.0",
     "svelte-check": "^4.0.0",
     "tailwindcss": "^4.1.18",
     "typescript": "~5.6.2",
-    "vite": "^6.0.3"
+    "typescript-eslint": "^8.53.0",
+    "vite": "^6.0.3",
+    "vitest": "^4.0.17"
   }
 }

src-tauri/Cargo.lock

@@ -429,6 +429,12 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "chrono"
 version = "0.4.43"
@@ -1173,6 +1179,16 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "gethostname"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
+dependencies = [
+ "rustix",
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.1.16"
@@ -1401,10 +1417,15 @@ dependencies = [
  "tauri",
  "tauri-build",
  "tauri-plugin-dialog",
+ "tauri-plugin-notification",
  "tauri-plugin-opener",
+ "tauri-plugin-os",
  "tauri-plugin-shell",
+ "tauri-plugin-store",
+ "tempfile",
  "tokio",
  "uuid",
+ "windows 0.62.2",
 ]
 
 [[package]]
@@ -1907,6 +1928,18 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
 
+[[package]]
+name = "mac-notification-sys"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65fd3f75411f4725061682ed91f131946e912859d0044d39c4ec0aac818d7621"
+dependencies = [
+ "cc",
+ "objc2",
+ "objc2-foundation",
+ "time",
+]
+
 [[package]]
 name = "markup5ever"
 version = "0.14.1"
@@ -2037,12 +2070,38 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
+[[package]]
+name = "nix"
+version = "0.30.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
+dependencies = [
+ "bitflags 2.10.0",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
 [[package]]
 name = "nodrop"
 version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
 
+[[package]]
+name = "notify-rust"
+version = "4.11.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6442248665a5aa2514e794af3b39661a8e73033b1cc5e59899e1276117ee4400"
+dependencies = [
+ "futures-lite",
+ "log",
+ "mac-notification-sys",
+ "serde",
+ "tauri-winrt-notification",
+ "zbus",
+]
+
 [[package]]
 name = "num-conv"
 version = "0.1.0"
@@ -2167,6 +2226,16 @@ dependencies = [
  "objc2-foundation",
 ]
 
+[[package]]
+name = "objc2-core-location"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca347214e24bc973fc025fd0d36ebb179ff30536ed1f80252706db19ee452009"
+dependencies = [
+ "objc2",
+ "objc2-foundation",
+]
+
 [[package]]
 name = "objc2-core-text"
 version = "0.3.2"
@@ -2271,8 +2340,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
 dependencies = [
  "bitflags 2.10.0",
+ "block2",
  "objc2",
+ "objc2-cloud-kit",
+ "objc2-core-data",
  "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-core-image",
+ "objc2-core-location",
+ "objc2-core-text",
+ "objc2-foundation",
+ "objc2-quartz-core",
+ "objc2-user-notifications",
+]
+
+[[package]]
+name = "objc2-user-notifications"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9df9128cbbfef73cda168416ccf7f837b62737d748333bfe9ab71c245d76613e"
+dependencies = [
+ "objc2",
  "objc2-foundation",
 ]
 
@@ -2326,6 +2414,22 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "os_info"
+version = "3.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4022a17595a00d6a369236fdae483f0de7f0a339960a53118b818238e132224"
+dependencies = [
+ "android_system_properties",
+ "log",
+ "nix",
+ "objc2",
+ "objc2-foundation",
+ "objc2-ui-kit",
+ "serde",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "os_pipe"
 version = "1.2.3"
@@ -2573,7 +2677,7 @@ checksum = "740ebea15c5d1428f910cd1a5f52cebf8d25006245ed8ade92702f4943d91e07"
 dependencies = [
  "base64 0.22.1",
  "indexmap 2.13.0",
- "quick-xml",
+ "quick-xml 0.38.4",
  "serde",
  "time",
 ]
@@ -2703,6 +2807,15 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "quick-xml"
+version = "0.37.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "quick-xml"
 version = "0.38.4"
@@ -2752,6 +2865,16 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "rand"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+dependencies = [
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.5",
+]
+
 [[package]]
 name = "rand_chacha"
 version = "0.2.2"
@@ -2772,6 +2895,16 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.9.5",
+]
+
 [[package]]
 name = "rand_core"
 version = "0.5.1"
@@ -2790,6 +2923,15 @@ dependencies = [
  "getrandom 0.2.17",
 ]
 
+[[package]]
+name = "rand_core"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
+dependencies = [
+ "getrandom 0.3.4",
+]
+
 [[package]]
 name = "rand_hc"
 version = "0.2.0"
@@ -3477,6 +3619,15 @@ dependencies = [
  "syn 2.0.114",
 ]
 
+[[package]]
+name = "sys-locale"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8eab9a99a024a169fe8a903cf9d4a3b3601109bcc13bd9e3c6fff259138626c4"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "system-deps"
 version = "6.2.2"
@@ -3524,7 +3675,7 @@ dependencies = [
  "tao-macros",
  "unicode-segmentation",
  "url",
- "windows",
+ "windows 0.61.3",
  "windows-core 0.61.2",
  "windows-version",
  "x11-dl",
@@ -3595,7 +3746,7 @@ dependencies = [
  "webkit2gtk",
  "webview2-com",
  "window-vibrancy",
- "windows",
+ "windows 0.61.3",
 ]
 
 [[package]]
@@ -3718,6 +3869,25 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "tauri-plugin-notification"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01fc2c5ff41105bd1f7242d8201fdf3efd70749b82fa013a17f2126357d194cc"
+dependencies = [
+ "log",
+ "notify-rust",
+ "rand 0.9.2",
+ "serde",
+ "serde_json",
+ "serde_repr",
+ "tauri",
+ "tauri-plugin",
+ "thiserror 2.0.17",
+ "time",
+ "url",
+]
+
 [[package]]
 name = "tauri-plugin-opener"
 version = "2.5.3"
@@ -3736,10 +3906,28 @@ dependencies = [
  "tauri-plugin",
  "thiserror 2.0.17",
  "url",
- "windows",
+ "windows 0.61.3",
  "zbus",
 ]
 
+[[package]]
+name = "tauri-plugin-os"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8f08346c8deb39e96f86973da0e2d76cbb933d7ac9b750f6dc4daf955a6f997"
+dependencies = [
+ "gethostname",
+ "log",
+ "os_info",
+ "serde",
+ "serde_json",
+ "serialize-to-javascript",
+ "sys-locale",
+ "tauri",
+ "tauri-plugin",
+ "thiserror 2.0.17",
+]
+
 [[package]]
 name = "tauri-plugin-shell"
 version = "2.3.4"
@@ -3761,6 +3949,22 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tauri-plugin-store"
+version = "2.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca1a8ff83c269b115e98726ffc13f9e548a10161544a92ad121d6d0a96e16ea"
+dependencies = [
+ "dunce",
+ "serde",
+ "serde_json",
+ "tauri",
+ "tauri-plugin",
+ "thiserror 2.0.17",
+ "tokio",
+ "tracing",
+]
+
 [[package]]
 name = "tauri-runtime"
 version = "2.9.2"
@@ -3783,7 +3987,7 @@ dependencies = [
  "url",
  "webkit2gtk",
  "webview2-com",
- "windows",
+ "windows 0.61.3",
 ]
 
 [[package]]
@@ -3809,7 +4013,7 @@ dependencies = [
  "url",
  "webkit2gtk",
  "webview2-com",
- "windows",
+ "windows 0.61.3",
  "wry",
 ]
 
@@ -3862,6 +4066,18 @@ dependencies = [
  "toml 0.9.11+spec-1.1.0",
 ]
 
+[[package]]
+name = "tauri-winrt-notification"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b1e66e07de489fe43a46678dd0b8df65e0c973909df1b60ba33874e297ba9b9"
+dependencies = [
+ "quick-xml 0.37.5",
+ "thiserror 2.0.17",
+ "windows 0.61.3",
+ "windows-version",
+]
+
 [[package]]
 name = "tempfile"
 version = "3.24.0"
@@ -4539,7 +4755,7 @@ checksum = "7130243a7a5b33c54a444e54842e6a9e133de08b5ad7b5861cd8ed9a6a5bc96a"
 dependencies = [
  "webview2-com-macros",
  "webview2-com-sys",
- "windows",
+ "windows 0.61.3",
  "windows-core 0.61.2",
  "windows-implement",
  "windows-interface",
@@ -4563,7 +4779,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "381336cfffd772377d291702245447a5251a2ffa5bad679c99e61bc48bacbf9c"
 dependencies = [
  "thiserror 2.0.17",
- "windows",
+ "windows 0.61.3",
  "windows-core 0.61.2",
 ]
 
@@ -4619,11 +4835,23 @@ version = "0.61.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
 dependencies = [
- "windows-collections",
+ "windows-collections 0.2.0",
  "windows-core 0.61.2",
- "windows-future",
+ "windows-future 0.2.1",
  "windows-link 0.1.3",
- "windows-numerics",
+ "windows-numerics 0.2.0",
+]
+
+[[package]]
+name = "windows"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580"
+dependencies = [
+ "windows-collections 0.3.2",
+ "windows-core 0.62.2",
+ "windows-future 0.3.2",
+ "windows-numerics 0.3.1",
 ]
 
 [[package]]
@@ -4635,6 +4863,15 @@ dependencies = [
  "windows-core 0.61.2",
 ]
 
+[[package]]
+name = "windows-collections"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610"
+dependencies = [
+ "windows-core 0.62.2",
+]
+
 [[package]]
 name = "windows-core"
 version = "0.61.2"
@@ -4669,7 +4906,18 @@ checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
 dependencies = [
  "windows-core 0.61.2",
  "windows-link 0.1.3",
- "windows-threading",
+ "windows-threading 0.1.0",
+]
+
+[[package]]
+name = "windows-future"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb"
+dependencies = [
+ "windows-core 0.62.2",
+ "windows-link 0.2.1",
+ "windows-threading 0.2.1",
 ]
 
 [[package]]
@@ -4716,6 +4964,16 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
+[[package]]
+name = "windows-numerics"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26"
+dependencies = [
+ "windows-core 0.62.2",
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "windows-result"
 version = "0.3.4"
@@ -4845,6 +5103,15 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
+[[package]]
+name = "windows-threading"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "windows-version"
 version = "0.1.7"
@@ -5071,7 +5338,7 @@ dependencies = [
  "webkit2gtk",
  "webkit2gtk-sys",
  "webview2-com",
- "windows",
+ "windows 0.61.3",
  "windows-core 0.61.2",
  "windows-version",
  "x11-dl",

src-tauri/Cargo.toml

@@ -22,4 +22,16 @@ serde_json = "1"
 tokio = { version = "1", features = ["full"] }
 parking_lot = "0.12"
 uuid = { version = "1", features = ["v4"] }
+tauri-plugin-store = "2.4.2"
+tauri-plugin-notification = "2"
+tauri-plugin-os = "2"
+tempfile = "3"
+
+[target.'cfg(windows)'.dependencies]
+windows = { version = "0.62", features = [
+    "Data_Xml_Dom",
+    "UI_Notifications",
+    "Win32_System_Com",
+    "Win32_Foundation",
+] }
 

src-tauri/icons/android/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <background android:drawable="@color/ic_launcher_background"/>
+</adaptive-icon>

src-tauri/icons/android/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="ic_launcher_background">#fff</color>
+</resources>

src-tauri/src/commands.rs

@@ -1,16 +1,19 @@
 use tauri::{AppHandle, State};
+use tauri_plugin_store::StoreExt;
 
+use crate::config::{ClaudeStartOptions, HikariConfig};
 use crate::wsl_bridge::SharedBridge;
 
+const CONFIG_STORE_KEY: &str = "config";
+
 #[tauri::command]
 pub async fn start_claude(
     app: AppHandle,
     bridge: State<'_, SharedBridge>,
-    working_dir: String,
+    options: ClaudeStartOptions,
-    allowed_tools: Option<Vec<String>>,
 ) -> Result<(), String> {
     let mut bridge = bridge.lock();
-    bridge.start(app, &working_dir, allowed_tools.unwrap_or_default())
+    bridge.start(app, options)
 }
 
 #[tauri::command]
@@ -42,3 +45,30 @@ pub async fn get_working_directory(bridge: State<'_, SharedBridge>) -> Result<St
 pub async fn select_wsl_directory() -> Result<String, String> {
     Ok("/home".to_string())
 }
+
+#[tauri::command]
+pub async fn get_config(app: AppHandle) -> Result<HikariConfig, String> {
+    let store = app
+        .store("hikari-config.json")
+        .map_err(|e| e.to_string())?;
+
+    match store.get(CONFIG_STORE_KEY) {
+        Some(value) => {
+            serde_json::from_value(value.clone()).map_err(|e| e.to_string())
+        }
+        None => Ok(HikariConfig::default()),
+    }
+}
+
+#[tauri::command]
+pub async fn save_config(app: AppHandle, config: HikariConfig) -> Result<(), String> {
+    let store = app
+        .store("hikari-config.json")
+        .map_err(|e| e.to_string())?;
+
+    let value = serde_json::to_value(&config).map_err(|e| e.to_string())?;
+    store.set(CONFIG_STORE_KEY, value);
+    store.save().map_err(|e| e.to_string())?;
+
+    Ok(())
+}

src-tauri/src/config.rs

@@ -0,0 +1,145 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+pub struct ClaudeStartOptions {
+    #[serde(default)]
+    pub working_dir: String,
+
+    #[serde(default)]
+    pub model: Option<String>,
+
+    #[serde(default)]
+    pub api_key: Option<String>,
+
+    #[serde(default)]
+    pub custom_instructions: Option<String>,
+
+    #[serde(default)]
+    pub mcp_servers_json: Option<String>,
+
+    #[serde(default)]
+    pub allowed_tools: Vec<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct HikariConfig {
+    #[serde(default)]
+    pub model: Option<String>,
+
+    #[serde(default)]
+    pub api_key: Option<String>,
+
+    #[serde(default)]
+    pub custom_instructions: Option<String>,
+
+    #[serde(default)]
+    pub mcp_servers_json: Option<String>,
+
+    #[serde(default)]
+    pub auto_granted_tools: Vec<String>,
+
+    #[serde(default)]
+    pub theme: Theme,
+
+    #[serde(default = "default_greeting_enabled")]
+    pub greeting_enabled: bool,
+
+    #[serde(default)]
+    pub greeting_custom_prompt: Option<String>,
+
+    #[serde(default = "default_notifications_enabled")]
+    pub notifications_enabled: bool,
+
+    #[serde(default = "default_notification_volume")]
+    pub notification_volume: f32,
+}
+
+impl Default for HikariConfig {
+    fn default() -> Self {
+        Self {
+            model: None,
+            api_key: None,
+            custom_instructions: None,
+            mcp_servers_json: None,
+            auto_granted_tools: Vec::new(),
+            theme: Theme::default(),
+            greeting_enabled: true,
+            greeting_custom_prompt: None,
+            notifications_enabled: true,
+            notification_volume: 0.7,
+        }
+    }
+}
+
+fn default_greeting_enabled() -> bool {
+    true
+}
+
+fn default_notifications_enabled() -> bool {
+    true
+}
+
+fn default_notification_volume() -> f32 {
+    0.7
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default, PartialEq)]
+#[serde(rename_all = "lowercase")]
+pub enum Theme {
+    #[default]
+    Dark,
+    Light,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_default_config() {
+        let config = HikariConfig::default();
+        assert!(config.model.is_none());
+        assert!(config.api_key.is_none());
+        assert!(config.custom_instructions.is_none());
+        assert!(config.mcp_servers_json.is_none());
+        assert!(config.auto_granted_tools.is_empty());
+        assert_eq!(config.theme, Theme::Dark);
+        assert!(config.greeting_enabled);
+        assert!(config.greeting_custom_prompt.is_none());
+    }
+
+    #[test]
+    fn test_config_serialization() {
+        let config = HikariConfig {
+            model: Some("claude-sonnet-4-20250514".to_string()),
+            api_key: None,
+            custom_instructions: Some("Be helpful".to_string()),
+            mcp_servers_json: None,
+            auto_granted_tools: vec!["Read".to_string(), "Glob".to_string()],
+            theme: Theme::Light,
+            greeting_enabled: true,
+            greeting_custom_prompt: Some("Hello!".to_string()),
+            notifications_enabled: true,
+            notification_volume: 0.7,
+        };
+
+        let json = serde_json::to_string(&config).unwrap();
+        let deserialized: HikariConfig = serde_json::from_str(&json).unwrap();
+
+        assert_eq!(deserialized.model, config.model);
+        assert_eq!(deserialized.custom_instructions, config.custom_instructions);
+        assert_eq!(deserialized.auto_granted_tools, config.auto_granted_tools);
+        assert_eq!(deserialized.theme, Theme::Light);
+        assert!(deserialized.greeting_enabled);
+        assert_eq!(deserialized.greeting_custom_prompt, Some("Hello!".to_string()));
+    }
+
+    #[test]
+    fn test_theme_serialization() {
+        let dark = Theme::Dark;
+        let light = Theme::Light;
+
+        assert_eq!(serde_json::to_string(&dark).unwrap(), "\"dark\"");
+        assert_eq!(serde_json::to_string(&light).unwrap(), "\"light\"");
+    }
+}

src-tauri/src/lib.rs

@@ -1,9 +1,18 @@
 mod commands;
+mod config;
+mod notifications;
 mod types;
 mod wsl_bridge;
+mod wsl_notifications;
+mod vbs_notification;
+mod windows_toast;
 
 use commands::*;
+use notifications::*;
 use wsl_bridge::create_shared_bridge;
+use wsl_notifications::*;
+use vbs_notification::*;
+use windows_toast::*;
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
@@ -13,6 +22,9 @@ pub fn run() {
         .plugin(tauri_plugin_dialog::init())
         .plugin(tauri_plugin_opener::init())
         .plugin(tauri_plugin_shell::init())
+        .plugin(tauri_plugin_store::Builder::new().build())
+        .plugin(tauri_plugin_notification::init())
+        .plugin(tauri_plugin_os::init())
         .manage(bridge)
         .invoke_handler(tauri::generate_handler![
             start_claude,
@@ -21,6 +33,14 @@ pub fn run() {
             is_claude_running,
             get_working_directory,
             select_wsl_directory,
+            get_config,
+            save_config,
+            send_windows_notification,
+            send_simple_notification,
+            send_windows_toast,
+            send_notify_send,
+            send_wsl_notification,
+            send_vbs_notification,
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");

src-tauri/src/notifications.rs

@@ -0,0 +1,96 @@
+use tauri::command;
+use std::process::Command;
+
+#[command]
+pub async fn send_notify_send(title: String, body: String) -> Result<(), String> {
+    // Use notify-send for Linux/WSL
+    let output = Command::new("notify-send")
+        .arg(&title)
+        .arg(&body)
+        .arg("--urgency=normal")
+        .arg("--app-name=Hikari Desktop")
+        .output()
+        .map_err(|e| format!("Failed to execute notify-send: {}. Make sure libnotify-bin is installed.", e))?;
+
+    if !output.status.success() {
+        let error = String::from_utf8_lossy(&output.stderr);
+        return Err(format!("notify-send failed: {}", error));
+    }
+
+    Ok(())
+}
+
+#[command]
+pub async fn send_windows_notification(title: String, body: String) -> Result<(), String> {
+    // Create PowerShell script for Windows Toast Notification
+    let ps_script = format!(
+        r#"
+[Windows.UI.Notifications.ToastNotificationManager, Windows.UI.Notifications, ContentType = WindowsRuntime] > $null
+[Windows.Data.Xml.Dom.XmlDocument, Windows.Data.Xml.Dom.XmlDocument, ContentType = WindowsRuntime] > $null
+
+$APP_ID = 'Hikari Desktop'
+
+$template = @"
+<toast>
+    <visual>
+        <binding template="ToastText02">
+            <text id="1">{}</text>
+            <text id="2">{}</text>
+        </binding>
+    </visual>
+    <audio src="ms-winsoundevent:Notification.Default" />
+</toast>
+"@
+
+$xml = New-Object Windows.Data.Xml.Dom.XmlDocument
+$xml.LoadXml($template)
+
+$toast = New-Object Windows.UI.Notifications.ToastNotification $xml
+[Windows.UI.Notifications.ToastNotificationManager]::CreateToastNotifier($APP_ID).Show($toast)
+"#,
+        title.replace("\"", "`\""),
+        body.replace("\"", "`\"")
+    );
+
+    // Try PowerShell Core first (pwsh), then fall back to Windows PowerShell
+    let output = Command::new("pwsh.exe")
+        .arg("-NoProfile")
+        .arg("-WindowStyle")
+        .arg("Hidden")
+        .arg("-Command")
+        .arg(&ps_script)
+        .output()
+        .or_else(|_| {
+            Command::new("powershell.exe")
+                .arg("-NoProfile")
+                .arg("-WindowStyle")
+                .arg("Hidden")
+                .arg("-Command")
+                .arg(&ps_script)
+                .output()
+        })
+        .map_err(|e| format!("Failed to execute PowerShell: {}", e))?;
+
+    if !output.status.success() {
+        let error = String::from_utf8_lossy(&output.stderr);
+        return Err(format!("PowerShell script failed: {}", error));
+    }
+
+    Ok(())
+}
+
+// Alternative: Use Windows built-in MSG command for simple notifications
+#[command]
+pub async fn send_simple_notification(title: String, body: String) -> Result<(), String> {
+    let message = format!("{}\n\n{}", title, body);
+
+    Command::new("cmd.exe")
+        .arg("/c")
+        .arg("msg")
+        .arg("*")
+        .arg(&message)
+        .output()
+        .map_err(|e| format!("Failed to send message: {}", e))?;
+
+    Ok(())
+}

src-tauri/src/types.rs

@@ -1,8 +1,9 @@
 use serde::{Deserialize, Serialize};
 
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
 #[serde(rename_all = "snake_case")]
 pub enum CharacterState {
+    #[default]
     Idle,
     Thinking,
     Typing,
@@ -14,27 +15,17 @@ pub enum CharacterState {
     Error,
 }
 
-impl Default for CharacterState {
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
-    fn default() -> Self {
-        CharacterState::Idle
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
 pub enum ConnectionStatus {
+    #[default]
     Disconnected,
     Connecting,
     Connected,
     Error,
 }
 
-impl Default for ConnectionStatus {
+#[allow(dead_code)]
-    fn default() -> Self {
-        ConnectionStatus::Disconnected
-    }
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct TerminalLine {
     pub id: String,
@@ -46,6 +37,7 @@ pub struct TerminalLine {
     pub tool_name: Option<String>,
 }
 
+#[allow(dead_code)]
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct PermissionRequest {
     pub id: String,
@@ -186,3 +178,129 @@ pub struct PermissionPromptEvent {
     pub tool_input: serde_json::Value,
     pub description: String,
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_character_state_default() {
+        let state = CharacterState::default();
+        assert_eq!(state, CharacterState::Idle);
+    }
+
+    #[test]
+    fn test_connection_status_default() {
+        let status = ConnectionStatus::default();
+        matches!(status, ConnectionStatus::Disconnected);
+    }
+
+    #[test]
+    fn test_character_state_serialization() {
+        let state = CharacterState::Thinking;
+        let serialized = serde_json::to_string(&state).unwrap();
+        assert_eq!(serialized, "\"thinking\"");
+
+        let deserialized: CharacterState = serde_json::from_str(&serialized).unwrap();
+        assert_eq!(deserialized, CharacterState::Thinking);
+    }
+
+    #[test]
+    fn test_all_character_states_serialize() {
+        let states = vec![
+            (CharacterState::Idle, "\"idle\""),
+            (CharacterState::Thinking, "\"thinking\""),
+            (CharacterState::Typing, "\"typing\""),
+            (CharacterState::Searching, "\"searching\""),
+            (CharacterState::Coding, "\"coding\""),
+            (CharacterState::Mcp, "\"mcp\""),
+            (CharacterState::Permission, "\"permission\""),
+            (CharacterState::Success, "\"success\""),
+            (CharacterState::Error, "\"error\""),
+        ];
+
+        for (state, expected) in states {
+            let serialized = serde_json::to_string(&state).unwrap();
+            assert_eq!(serialized, expected, "Failed for state: {:?}", state);
+        }
+    }
+
+    #[test]
+    fn test_terminal_line_serialization() {
+        let line = TerminalLine {
+            id: "test-123".to_string(),
+            line_type: "assistant".to_string(),
+            content: "Hello, world!".to_string(),
+            timestamp: "2024-01-01T00:00:00Z".to_string(),
+            tool_name: None,
+        };
+
+        let serialized = serde_json::to_string(&line).unwrap();
+        assert!(serialized.contains("\"type\":\"assistant\""));
+        assert!(serialized.contains("\"content\":\"Hello, world!\""));
+        assert!(!serialized.contains("tool_name"));
+    }
+
+    #[test]
+    fn test_terminal_line_with_tool_name() {
+        let line = TerminalLine {
+            id: "test-456".to_string(),
+            line_type: "tool".to_string(),
+            content: "Reading file...".to_string(),
+            timestamp: "2024-01-01T00:00:00Z".to_string(),
+            tool_name: Some("Read".to_string()),
+        };
+
+        let serialized = serde_json::to_string(&line).unwrap();
+        assert!(serialized.contains("\"tool_name\":\"Read\""));
+    }
+
+    #[test]
+    fn test_content_block_text() {
+        let block = ContentBlock::Text {
+            text: "Hello!".to_string(),
+        };
+
+        let serialized = serde_json::to_string(&block).unwrap();
+        assert!(serialized.contains("\"type\":\"text\""));
+        assert!(serialized.contains("\"text\":\"Hello!\""));
+    }
+
+    #[test]
+    fn test_content_block_tool_use() {
+        let block = ContentBlock::ToolUse {
+            id: "tool-123".to_string(),
+            name: "Read".to_string(),
+            input: serde_json::json!({"file_path": "/test.txt"}),
+        };
+
+        let serialized = serde_json::to_string(&block).unwrap();
+        assert!(serialized.contains("\"type\":\"tool_use\""));
+        assert!(serialized.contains("\"name\":\"Read\""));
+    }
+
+    #[test]
+    fn test_state_change_event() {
+        let event = StateChangeEvent {
+            state: CharacterState::Coding,
+            tool_name: Some("Edit".to_string()),
+        };
+
+        let serialized = serde_json::to_string(&event).unwrap();
+        assert!(serialized.contains("\"state\":\"coding\""));
+        assert!(serialized.contains("\"tool_name\":\"Edit\""));
+    }
+
+    #[test]
+    fn test_output_event() {
+        let event = OutputEvent {
+            line_type: "assistant".to_string(),
+            content: "Test output".to_string(),
+            tool_name: None,
+        };
+
+        let serialized = serde_json::to_string(&event).unwrap();
+        assert!(serialized.contains("\"line_type\":\"assistant\""));
+        assert!(serialized.contains("\"content\":\"Test output\""));
+    }
+}

src-tauri/src/vbs_notification.rs

@@ -0,0 +1,74 @@
+use std::process::Command;
+use std::io::Write;
+use tempfile::NamedTempFile;
+use tauri::command;
+
+#[command]
+pub async fn send_vbs_notification(title: String, body: String) -> Result<(), String> {
+    // Create a VBScript that shows a Windows notification
+    let vbs_content = format!(
+        r#"
+Set objShell = CreateObject("WScript.Shell")
+objShell.Popup "{}" & vbCrLf & vbCrLf & "{}", 5, "{}", 64
+"#,
+        body.replace("\"", "\"\"").replace("\n", "\" & vbCrLf & \""),
+        title.replace("\"", "\"\""),
+        title.replace("\"", "\"\"")
+    );
+
+    // Create a temporary VBS file
+    let mut temp_file = NamedTempFile::new()
+        .map_err(|e| format!("Failed to create temp file: {}", e))?;
+
+    temp_file
+        .write_all(vbs_content.as_bytes())
+        .map_err(|e| format!("Failed to write VBS content: {}", e))?;
+
+    let temp_path = temp_file.path().to_string_lossy().to_string();
+
+    // Convert WSL path to Windows path
+    let windows_path = if temp_path.starts_with("/mnt/") {
+        // Convert /mnt/c/... to C:\...
+        let path_parts: Vec<&str> = temp_path.split('/').collect();
+        if path_parts.len() > 2 {
+            let drive_letter = path_parts[2].to_uppercase();
+            let rest_of_path = path_parts[3..].join("\\");
+            format!("{}:\\{}", drive_letter, rest_of_path)
+        } else {
+            temp_path.clone()
+        }
+    } else if temp_path.starts_with("/tmp/") {
+        // WSL temp files might be in a different location
+        // Try to use wslpath to convert
+        let output = Command::new("wslpath")
+            .arg("-w")
+            .arg(&temp_path)
+            .output();
+
+        if let Ok(result) = output {
+            if result.status.success() {
+                String::from_utf8_lossy(&result.stdout).trim().to_string()
+            } else {
+                temp_path.clone()
+            }
+        } else {
+            temp_path.clone()
+        }
+    } else {
+        temp_path.clone()
+    };
+
+    // Execute the VBScript using wscript.exe
+    let output = Command::new("/mnt/c/Windows/System32/wscript.exe")
+        .arg("//NoLogo")
+        .arg(&windows_path)
+        .output()
+        .map_err(|e| format!("Failed to execute VBScript: {}", e))?;
+
+    if !output.status.success() {
+        let error = String::from_utf8_lossy(&output.stderr);
+        return Err(format!("VBScript execution failed: {}", error));
+    }
+
+    Ok(())
+}

src-tauri/src/windows_toast.rs

@@ -0,0 +1,63 @@
+use tauri::command;
+
+#[cfg(target_os = "windows")]
+use windows::{
+    core::{HSTRING, Result as WindowsResult},
+    Data::Xml::Dom::*,
+    UI::Notifications::*,
+};
+
+#[cfg(target_os = "windows")]
+#[command]
+pub async fn send_windows_toast(title: String, body: String) -> Result<(), String> {
+    show_toast_notification(&title, &body)
+        .map_err(|e| format!("Failed to show toast notification: {}", e))
+}
+
+#[cfg(target_os = "windows")]
+fn show_toast_notification(title: &str, body: &str) -> WindowsResult<()> {
+    // Create the XML for the toast notification
+    let toast_xml = format!(
+        r#"<toast>
+            <visual>
+                <binding template="ToastGeneric">
+                    <text>{}</text>
+                    <text>{}</text>
+                </binding>
+            </visual>
+            <audio src="ms-winsoundevent:Notification.Default" />
+        </toast>"#,
+        escape_xml(title),
+        escape_xml(body)
+    );
+
+    let xml_doc = XmlDocument::new()?;
+    xml_doc.LoadXml(&HSTRING::from(toast_xml))?;
+
+    // Create the toast notification
+    let toast = ToastNotification::CreateToastNotification(&xml_doc)?;
+
+    // Create a toast notifier with an application ID
+    let notifier = ToastNotificationManager::CreateToastNotifierWithId(&HSTRING::from("Hikari Desktop"))?;
+
+    // Show the notification
+    notifier.Show(&toast)?;
+
+    Ok(())
+}
+
+#[cfg(target_os = "windows")]
+fn escape_xml(text: &str) -> String {
+    text.replace('&', "&amp;")
+        .replace('<', "&lt;")
+        .replace('>', "&gt;")
+        .replace('"', "&quot;")
+        .replace('\'', "&apos;")
+}
+
+// Stub for non-Windows platforms
+#[cfg(not(target_os = "windows"))]
+#[command]
+pub async fn send_windows_toast(_title: String, _body: String) -> Result<(), String> {
+    Err("Windows toast notifications are only available on Windows".to_string())
+}

src-tauri/src/wsl_bridge.rs

@@ -4,7 +4,12 @@ use std::process::{Child, ChildStdin, Command, Stdio};
 use std::sync::Arc;
 use std::thread;
 use tauri::{AppHandle, Emitter};
+use tempfile::NamedTempFile;
 
+#[cfg(target_os = "windows")]
+use std::os::windows::process::CommandExt;
+
+use crate::config::ClaudeStartOptions;
 use crate::types::{CharacterState, ClaudeMessage, ConnectionStatus, ContentBlock, StateChangeEvent, OutputEvent, PermissionPromptEvent};
 
 const SEARCH_TOOLS: [&str; 5] = ["Read", "Glob", "Grep", "WebSearch", "WebFetch"];
@@ -66,6 +71,7 @@ pub struct WslBridge {
     stdin: Option<ChildStdin>,
     working_directory: String,
     session_id: Option<String>,
+    mcp_config_file: Option<NamedTempFile>,
 }
 
 impl WslBridge {
@@ -75,22 +81,50 @@ impl WslBridge {
             stdin: None,
             working_directory: String::new(),
             session_id: None,
+            mcp_config_file: None,
         }
     }
 
-    pub fn start(&mut self, app: AppHandle, working_dir: &str, allowed_tools: Vec<String>) -> Result<(), String> {
+    pub fn start(&mut self, app: AppHandle, options: ClaudeStartOptions) -> Result<(), String> {
         if self.process.is_some() {
             return Err("Process already running".to_string());
         }
 
-        self.working_directory = working_dir.to_string();
+        let working_dir = &options.working_dir;
+        self.working_directory = working_dir.clone();
 
         emit_connection_status(&app, ConnectionStatus::Connecting);
 
+        // Create temp file for MCP config if provided
+        let mcp_config_path = if let Some(ref mcp_json) = options.mcp_servers_json {
+            if !mcp_json.trim().is_empty() {
+                // Validate JSON before writing
+                serde_json::from_str::<serde_json::Value>(mcp_json)
+                    .map_err(|e| format!("Invalid MCP servers JSON: {}", e))?;
+
+                let mut temp_file = NamedTempFile::new()
+                    .map_err(|e| format!("Failed to create temp file for MCP config: {}", e))?;
+                temp_file
+                    .write_all(mcp_json.as_bytes())
+                    .map_err(|e| format!("Failed to write MCP config: {}", e))?;
+                temp_file
+                    .flush()
+                    .map_err(|e| format!("Failed to flush MCP config: {}", e))?;
+
+                let path = temp_file.path().to_string_lossy().to_string();
+                self.mcp_config_file = Some(temp_file);
+                Some(path)
+            } else {
+                None
+            }
+        } else {
+            None
+        };
+
         // Detect if we're running inside WSL or on Windows
         let is_wsl = detect_wsl();
         eprintln!("[DEBUG] is_wsl: {}", is_wsl);
-        eprintln!("[DEBUG] allowed_tools: {:?}", allowed_tools);
+        eprintln!("[DEBUG] options: {:?}", options);
 
         let mut command = if is_wsl {
             // Running inside WSL - call claude directly
@@ -108,32 +142,93 @@ impl WslBridge {
                 "--verbose",
             ]);
 
+            // Add model if specified
+            if let Some(ref model) = options.model {
+                if !model.is_empty() {
+                    cmd.args(["--model", model]);
+                }
+            }
+
             // Add allowed tools if any
-            for tool in &allowed_tools {
+            for tool in &options.allowed_tools {
                 cmd.args(["--allowedTools", tool]);
             }
 
-            cmd.current_dir(working_dir);
+            // Add custom instructions as system prompt if specified
-            cmd
+            if let Some(ref instructions) = options.custom_instructions {
-        } else {
+                if !instructions.is_empty() {
-            // Running on Windows - use wsl to call claude
+                    cmd.args(["--system-prompt", instructions]);
-            eprintln!("[DEBUG] Windows path - using wsl");
+                }
-            let mut cmd = Command::new("wsl");
-            let mut args = vec![
-                "--cd".to_string(), working_dir.to_string(),
-                "--".to_string(), "claude".to_string(),
-                "--output-format".to_string(), "stream-json".to_string(),
-                "--input-format".to_string(), "stream-json".to_string(),
-                "--verbose".to_string(),
-            ];
-
-            // Add allowed tools if any
-            for tool in &allowed_tools {
-                args.push("--allowedTools".to_string());
-                args.push(tool.clone());
             }
 
-            cmd.args(&args);
+            // Add MCP config if provided
+            if let Some(ref mcp_path) = mcp_config_path {
+                cmd.args(["--mcp-config", mcp_path]);
+            }
+
+            cmd.current_dir(working_dir);
+
+            // Set API key as environment variable if specified
+            if let Some(ref api_key) = options.api_key {
+                if !api_key.is_empty() {
+                    cmd.env("ANTHROPIC_API_KEY", api_key);
+                }
+            }
+
+            cmd
+        } else {
+            // Running on Windows - use wsl with bash login shell to ensure PATH is loaded
+            eprintln!("[DEBUG] Windows path - using wsl");
+            let mut cmd = Command::new("wsl");
+
+            // Build the claude command with all arguments
+            let mut claude_cmd = format!(
+                "cd '{}' && ",
+                working_dir
+            );
+
+            // Set API key as environment variable if specified
+            if let Some(ref api_key) = options.api_key {
+                if !api_key.is_empty() {
+                    claude_cmd.push_str(&format!("ANTHROPIC_API_KEY='{}' ", api_key));
+                }
+            }
+
+            claude_cmd.push_str("claude --output-format stream-json --input-format stream-json --verbose");
+
+            // Add model if specified
+            if let Some(ref model) = options.model {
+                if !model.is_empty() {
+                    claude_cmd.push_str(&format!(" --model '{}'", model));
+                }
+            }
+
+            // Add allowed tools if any
+            for tool in &options.allowed_tools {
+                claude_cmd.push_str(&format!(" --allowedTools '{}'", tool));
+            }
+
+            // Add custom instructions as system prompt if specified
+            if let Some(ref instructions) = options.custom_instructions {
+                if !instructions.is_empty() {
+                    // Escape single quotes in instructions
+                    let escaped = instructions.replace('\'', "'\\''");
+                    claude_cmd.push_str(&format!(" --system-prompt '{}'", escaped));
+                }
+            }
+
+            // Add MCP config if provided
+            if let Some(ref mcp_path) = mcp_config_path {
+                claude_cmd.push_str(&format!(" --mcp-config '{}'", mcp_path));
+            }
+
+            // Use bash -lc to load login profile (ensures PATH includes claude)
+            cmd.args(["-e", "bash", "-lc", &claude_cmd]);
+
+            // Hide the console window on Windows
+            #[cfg(target_os = "windows")]
+            cmd.creation_flags(0x08000000); // CREATE_NO_WINDOW
+
             cmd
         };
 
@@ -205,6 +300,7 @@ impl WslBridge {
         }
         self.stdin = None;
         self.session_id = None;
+        self.mcp_config_file = None; // Temp file is automatically deleted when dropped
         emit_connection_status(app, ConnectionStatus::Disconnected);
     }
 
@@ -465,3 +561,127 @@ pub type SharedBridge = Arc<Mutex<WslBridge>>;
 pub fn create_shared_bridge() -> SharedBridge {
     Arc::new(Mutex::new(WslBridge::new()))
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_get_tool_state_search_tools() {
+        assert!(matches!(get_tool_state("Read"), CharacterState::Searching));
+        assert!(matches!(get_tool_state("Glob"), CharacterState::Searching));
+        assert!(matches!(get_tool_state("Grep"), CharacterState::Searching));
+        assert!(matches!(get_tool_state("WebSearch"), CharacterState::Searching));
+        assert!(matches!(get_tool_state("WebFetch"), CharacterState::Searching));
+    }
+
+    #[test]
+    fn test_get_tool_state_coding_tools() {
+        assert!(matches!(get_tool_state("Edit"), CharacterState::Coding));
+        assert!(matches!(get_tool_state("Write"), CharacterState::Coding));
+        assert!(matches!(get_tool_state("NotebookEdit"), CharacterState::Coding));
+    }
+
+    #[test]
+    fn test_get_tool_state_mcp_tools() {
+        assert!(matches!(get_tool_state("mcp__github__create_issue"), CharacterState::Mcp));
+        assert!(matches!(get_tool_state("mcp__notion__search"), CharacterState::Mcp));
+    }
+
+    #[test]
+    fn test_get_tool_state_task() {
+        assert!(matches!(get_tool_state("Task"), CharacterState::Thinking));
+    }
+
+    #[test]
+    fn test_get_tool_state_unknown() {
+        assert!(matches!(get_tool_state("SomeUnknownTool"), CharacterState::Typing));
+        assert!(matches!(get_tool_state("Bash"), CharacterState::Typing));
+    }
+
+    #[test]
+    fn test_format_tool_description_read() {
+        let input = serde_json::json!({"file_path": "/home/test/file.txt"});
+        let desc = format_tool_description("Read", &input);
+        assert_eq!(desc, "Reading file: /home/test/file.txt");
+    }
+
+    #[test]
+    fn test_format_tool_description_read_no_path() {
+        let input = serde_json::json!({});
+        let desc = format_tool_description("Read", &input);
+        assert_eq!(desc, "Reading file...");
+    }
+
+    #[test]
+    fn test_format_tool_description_glob() {
+        let input = serde_json::json!({"pattern": "**/*.rs"});
+        let desc = format_tool_description("Glob", &input);
+        assert_eq!(desc, "Searching for files: **/*.rs");
+    }
+
+    #[test]
+    fn test_format_tool_description_grep() {
+        let input = serde_json::json!({"pattern": "TODO"});
+        let desc = format_tool_description("Grep", &input);
+        assert_eq!(desc, "Searching for: TODO");
+    }
+
+    #[test]
+    fn test_format_tool_description_edit() {
+        let input = serde_json::json!({"file_path": "/home/test/main.rs"});
+        let desc = format_tool_description("Edit", &input);
+        assert_eq!(desc, "Editing: /home/test/main.rs");
+    }
+
+    #[test]
+    fn test_format_tool_description_write() {
+        let input = serde_json::json!({"file_path": "/home/test/new.txt"});
+        let desc = format_tool_description("Write", &input);
+        assert_eq!(desc, "Editing: /home/test/new.txt");
+    }
+
+    #[test]
+    fn test_format_tool_description_bash_short() {
+        let input = serde_json::json!({"command": "ls -la"});
+        let desc = format_tool_description("Bash", &input);
+        assert_eq!(desc, "Running: ls -la");
+    }
+
+    #[test]
+    fn test_format_tool_description_bash_long() {
+        let long_cmd = "a".repeat(100);
+        let input = serde_json::json!({"command": long_cmd});
+        let desc = format_tool_description("Bash", &input);
+        assert!(desc.starts_with("Running: "));
+        assert!(desc.ends_with("..."));
+        assert!(desc.len() < 70);
+    }
+
+    #[test]
+    fn test_format_tool_description_unknown() {
+        let input = serde_json::json!({"some": "data"});
+        let desc = format_tool_description("CustomTool", &input);
+        assert_eq!(desc, "Using tool: CustomTool");
+    }
+
+    #[test]
+    fn test_wsl_bridge_new() {
+        let bridge = WslBridge::new();
+        assert!(!bridge.is_running());
+        assert_eq!(bridge.get_working_directory(), "");
+    }
+
+    #[test]
+    fn test_wsl_bridge_default() {
+        let bridge = WslBridge::default();
+        assert!(!bridge.is_running());
+    }
+
+    #[test]
+    fn test_create_shared_bridge() {
+        let shared = create_shared_bridge();
+        let bridge = shared.lock();
+        assert!(!bridge.is_running());
+    }
+}

src-tauri/src/wsl_notifications.rs

@@ -0,0 +1,84 @@
+use std::process::Command;
+use tauri::command;
+
+#[command]
+pub async fn send_wsl_notification(title: String, body: String) -> Result<(), String> {
+    // Method 1: Try Windows 10/11 toast notification using PowerShell
+    let toast_command = format!(
+        r#"
+Add-Type -AssemblyName System.Runtime.WindowsRuntime
+$null = [Windows.UI.Notifications.ToastNotificationManager, Windows.UI.Notifications, ContentType = WindowsRuntime]
+$null = [Windows.Data.Xml.Dom.XmlDocument, Windows.Data.Xml.Dom.XmlDocument, ContentType = WindowsRuntime]
+
+$APP_ID = 'Hikari Desktop'
+
+$template = @"
+<toast>
+    <visual>
+        <binding template="ToastGeneric">
+            <text>{0}</text>
+            <text>{1}</text>
+        </binding>
+    </visual>
+</toast>
+"@
+
+$xml = New-Object Windows.Data.Xml.Dom.XmlDocument
+$xml.LoadXml($template -f ('{0}' -replace "'", "''"), ('{1}' -replace "'", "''"))
+
+$toast = New-Object Windows.UI.Notifications.ToastNotification $xml
+$notifier = [Windows.UI.Notifications.ToastNotificationManager]::CreateToastNotifier($APP_ID)
+$notifier.Show($toast)
+"#,
+        title.replace("'", "''").replace("\"", "\\\""),
+        body.replace("'", "''").replace("\"", "\\\"")
+    );
+
+    // Try PowerShell.exe through WSL
+    let output = Command::new("/mnt/c/Windows/System32/WindowsPowerShell/v1.0/powershell.exe")
+        .arg("-NoProfile")
+        .arg("-ExecutionPolicy")
+        .arg("Bypass")
+        .arg("-WindowStyle")
+        .arg("Hidden")
+        .arg("-Command")
+        .arg(&toast_command)
+        .output();
+
+    match output {
+        Ok(result) => {
+            if result.status.success() {
+                println!("WSL notification sent successfully");
+                return Ok(());
+            } else {
+                let stderr = String::from_utf8_lossy(&result.stderr);
+                println!("PowerShell toast failed: {}", stderr);
+            }
+        }
+        Err(e) => {
+            println!("Failed to run PowerShell: {}", e);
+        }
+    }
+
+    // Skip msg.exe as it creates alert boxes
+    // Method 2 removed
+
+    // Method 3: Try wsl-notify-send if available
+    let notify_result = Command::new("wsl-notify-send")
+        .arg("--appId")
+        .arg("HikariDesktop")
+        .arg("--category")
+        .arg(&title)
+        .arg(&body)
+        .output();
+
+    if let Ok(result) = notify_result {
+        if result.status.success() {
+            println!("Notification sent via wsl-notify-send");
+            return Ok(());
+        }
+    }
+
+    // If all methods fail, return an error
+    Err("All WSL notification methods failed".to_string())
+}

src/app.css

@@ -1,9 +1,11 @@
 @import "tailwindcss";
 
-:root {
+:root,
+[data-theme="dark"] {
   --bg-primary: #1a1a2e;
   --bg-secondary: #16213e;
   --bg-terminal: #0f0f1a;
+  --bg-hover: #2a2a4a;
   --accent-primary: #e94560;
   --accent-secondary: #ff6b9d;
   --text-primary: #ffffff;
@@ -11,6 +13,18 @@
   --border-color: #2a2a4a;
 }
 
+[data-theme="light"] {
+  --bg-primary: #f8f9fa;
+  --bg-secondary: #ffffff;
+  --bg-terminal: #f1f3f4;
+  --bg-hover: #e8e8e8;
+  --accent-primary: #e94560;
+  --accent-secondary: #ff6b9d;
+  --text-primary: #1a1a2e;
+  --text-secondary: #5a5a7a;
+  --border-color: #d0d0e0;
+}
+
 html,
 body {
   margin: 0;

src/lib/components/AnimeGirl.svelte

@@ -81,8 +81,12 @@
   </div>
 
   <div class="speech-bubble mt-4 max-w-xs">
-    <div class="relative bg-[var(--bg-secondary)] rounded-lg px-4 py-2 border border-[var(--border-color)]">
+    <div
-      <div class="absolute -top-2 left-1/2 transform -translate-x-1/2 w-0 h-0 border-l-8 border-r-8 border-b-8 border-transparent border-b-[var(--bg-secondary)]"></div>
+      class="relative bg-[var(--bg-secondary)] rounded-lg px-4 py-2 border border-[var(--border-color)]"
+    >
+      <div
+        class="absolute -top-2 left-1/2 transform -translate-x-1/2 w-0 h-0 border-l-8 border-r-8 border-b-8 border-transparent border-b-[var(--bg-secondary)]"
+      ></div>
       <p class="text-sm text-gray-300 text-center italic">{info.description}</p>
     </div>
   </div>
@@ -123,7 +127,8 @@
   }
 
   @keyframes idle-bob {
-    0%, 100% {
+    0%,
+    100% {
       transform: translateY(0);
     }
     50% {
@@ -132,7 +137,8 @@
   }
 
   @keyframes thinking-sway {
-    0%, 100% {
+    0%,
+    100% {
       transform: rotate(-2deg);
     }
     50% {
@@ -141,7 +147,8 @@
   }
 
   @keyframes typing-bounce {
-    0%, 100% {
+    0%,
+    100% {
       transform: translateY(0) scale(1);
     }
     50% {
@@ -150,7 +157,8 @@
   }
 
   @keyframes searching-look {
-    0%, 100% {
+    0%,
+    100% {
       transform: translateX(0);
     }
     25% {
@@ -162,7 +170,8 @@
   }
 
   @keyframes celebrate {
-    0%, 100% {
+    0%,
+    100% {
       transform: scale(1) rotate(0deg);
     }
     25% {
@@ -177,13 +186,21 @@
   }
 
   @keyframes shake {
-    0%, 100% {
+    0%,
+    100% {
       transform: translateX(0);
     }
-    10%, 30%, 50%, 70%, 90% {
+    10%,
+    30%,
+    50%,
+    70%,
+    90% {
       transform: translateX(-5px);
     }
-    20%, 40%, 60%, 80% {
+    20%,
+    40%,
+    60%,
+    80% {
       transform: translateX(5px);
     }
   }

src/lib/components/ConfigSidebar.svelte

@@ -0,0 +1,486 @@
+<script lang="ts">
+  import { configStore, type HikariConfig, type Theme } from "$lib/stores/config";
+  import { claudeStore } from "$lib/stores/claude";
+
+  let config: HikariConfig = $state({
+    model: null,
+    api_key: null,
+    custom_instructions: null,
+    mcp_servers_json: null,
+    auto_granted_tools: [],
+    theme: "dark",
+    greeting_enabled: true,
+    greeting_custom_prompt: null,
+    notifications_enabled: true,
+    notification_volume: 0.7,
+  });
+
+  let isOpen = $state(false);
+  let isSaving = $state(false);
+  let saveError: string | null = $state(null);
+  let newToolName = $state("");
+  let showApiKey = $state(false);
+  let grantedTools: string[] = $state([]);
+
+  configStore.config.subscribe((c) => {
+    config = { ...c };
+  });
+
+  configStore.isSidebarOpen.subscribe((open) => {
+    isOpen = open;
+  });
+
+  configStore.saveError.subscribe((error) => {
+    saveError = error;
+  });
+
+  claudeStore.grantedTools.subscribe((tools) => {
+    grantedTools = Array.from(tools);
+  });
+
+  const availableModels = [
+    { value: "", label: "Default (from ~/.claude)" },
+    { value: "claude-sonnet-4-20250514", label: "Claude Sonnet 4" },
+    { value: "claude-opus-4-20250514", label: "Claude Opus 4" },
+  ];
+
+  const commonTools = [
+    "Read",
+    "Write",
+    "Edit",
+    "Bash",
+    "Glob",
+    "Grep",
+    "WebFetch",
+    "WebSearch",
+    "Task",
+  ];
+
+  async function handleSave() {
+    isSaving = true;
+    saveError = null;
+    try {
+      await configStore.saveConfig(config);
+    } catch {
+      // Error is handled by the store
+    } finally {
+      isSaving = false;
+    }
+  }
+
+  async function handleThemeChange(theme: Theme) {
+    config.theme = theme;
+    await configStore.setTheme(theme);
+  }
+
+  function toggleTool(tool: string) {
+    if (config.auto_granted_tools.includes(tool)) {
+      config.auto_granted_tools = config.auto_granted_tools.filter((t) => t !== tool);
+    } else {
+      config.auto_granted_tools = [...config.auto_granted_tools, tool];
+    }
+  }
+
+  function addCustomTool() {
+    if (newToolName.trim() && !config.auto_granted_tools.includes(newToolName.trim())) {
+      config.auto_granted_tools = [...config.auto_granted_tools, newToolName.trim()];
+      newToolName = "";
+    }
+  }
+
+  function removeTool(tool: string) {
+    config.auto_granted_tools = config.auto_granted_tools.filter((t) => t !== tool);
+  }
+
+  function importFromSession() {
+    config.auto_granted_tools = [...new Set([...config.auto_granted_tools, ...grantedTools])];
+  }
+</script>
+
+<!-- Backdrop -->
+{#if isOpen}
+  <div
+    class="fixed inset-0 bg-black/50 z-40 transition-opacity"
+    onclick={configStore.closeSidebar}
+    onkeydown={(e) => e.key === "Escape" && configStore.closeSidebar()}
+    role="button"
+    tabindex="-1"
+    aria-label="Close sidebar"
+  ></div>
+{/if}
+
+<!-- Sidebar -->
+<aside
+  class="fixed right-0 top-0 h-full w-96 bg-[var(--bg-secondary)] border-l border-[var(--border-color)] z-50 transform transition-transform duration-300 ease-in-out overflow-y-auto {isOpen
+    ? 'translate-x-0'
+    : 'translate-x-full'}"
+>
+  <div class="p-4">
+    <!-- Header -->
+    <div class="flex items-center justify-between mb-6">
+      <h2 class="text-lg font-semibold text-[var(--text-primary)]">Settings</h2>
+      <button
+        onclick={configStore.closeSidebar}
+        class="p-1 text-gray-400 hover:text-white transition-colors"
+        aria-label="Close settings"
+      >
+        <svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+          <path
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            stroke-width="2"
+            d="M6 18L18 6M6 6l12 12"
+          />
+        </svg>
+      </button>
+    </div>
+
+    {#if saveError}
+      <div class="mb-4 p-3 bg-red-500/20 border border-red-500/50 rounded-lg text-red-400 text-sm">
+        {saveError}
+      </div>
+    {/if}
+
+    <!-- Agent Settings Section -->
+    <section class="mb-6">
+      <h3 class="text-sm font-medium text-[var(--accent-primary)] uppercase tracking-wider mb-3">
+        Agent Settings
+      </h3>
+
+      <!-- Model Selection -->
+      <div class="mb-4">
+        <label for="model" class="block text-sm text-gray-400 mb-1">Model</label>
+        <select
+          id="model"
+          bind:value={config.model}
+          class="w-full px-3 py-2 bg-[var(--bg-primary)] border border-[var(--border-color)] rounded-lg text-[var(--text-primary)] focus:outline-none focus:border-[var(--accent-primary)]"
+        >
+          {#each availableModels as model (model.value)}
+            <option value={model.value}>{model.label}</option>
+          {/each}
+        </select>
+      </div>
+
+      <!-- API Key -->
+      <div class="mb-4">
+        <label for="api-key" class="block text-sm text-gray-400 mb-1">
+          API Key <span class="text-gray-600">(optional override)</span>
+        </label>
+        <div class="relative">
+          <input
+            id="api-key"
+            type={showApiKey ? "text" : "password"}
+            bind:value={config.api_key}
+            placeholder="Falls back to ~/.claude settings"
+            class="w-full px-3 py-2 pr-10 bg-[var(--bg-primary)] border border-[var(--border-color)] rounded-lg text-[var(--text-primary)] focus:outline-none focus:border-[var(--accent-primary)]"
+          />
+          <button
+            type="button"
+            onclick={() => (showApiKey = !showApiKey)}
+            class="absolute right-2 top-1/2 -translate-y-1/2 text-gray-500 hover:text-gray-300"
+            aria-label={showApiKey ? "Hide API key" : "Show API key"}
+          >
+            {#if showApiKey}
+              <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path
+                  stroke-linecap="round"
+                  stroke-linejoin="round"
+                  stroke-width="2"
+                  d="M13.875 18.825A10.05 10.05 0 0112 19c-4.478 0-8.268-2.943-9.543-7a9.97 9.97 0 011.563-3.029m5.858.908a3 3 0 114.243 4.243M9.878 9.878l4.242 4.242M9.88 9.88l-3.29-3.29m7.532 7.532l3.29 3.29M3 3l3.59 3.59m0 0A9.953 9.953 0 0112 5c4.478 0 8.268 2.943 9.543 7a10.025 10.025 0 01-4.132 5.411m0 0L21 21"
+                />
+              </svg>
+            {:else}
+              <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path
+                  stroke-linecap="round"
+                  stroke-linejoin="round"
+                  stroke-width="2"
+                  d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"
+                />
+                <path
+                  stroke-linecap="round"
+                  stroke-linejoin="round"
+                  stroke-width="2"
+                  d="M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z"
+                />
+              </svg>
+            {/if}
+          </button>
+        </div>
+      </div>
+
+      <!-- Custom Instructions -->
+      <div class="mb-4">
+        <label for="instructions" class="block text-sm text-gray-400 mb-1"
+          >Custom Instructions</label
+        >
+        <textarea
+          id="instructions"
+          bind:value={config.custom_instructions}
+          rows="4"
+          placeholder="Additional instructions for the agent..."
+          class="w-full px-3 py-2 bg-[var(--bg-primary)] border border-[var(--border-color)] rounded-lg text-[var(--text-primary)] focus:outline-none focus:border-[var(--accent-primary)] resize-none"
+        ></textarea>
+      </div>
+    </section>
+
+    <!-- Greeting Section -->
+    <section class="mb-6">
+      <h3 class="text-sm font-medium text-[var(--accent-primary)] uppercase tracking-wider mb-3">
+        Greeting
+      </h3>
+
+      <!-- Enable/Disable Toggle -->
+      <div class="mb-4">
+        <label class="flex items-center gap-3 cursor-pointer">
+          <input
+            type="checkbox"
+            bind:checked={config.greeting_enabled}
+            class="w-4 h-4 rounded border-[var(--border-color)] bg-[var(--bg-primary)] text-[var(--accent-primary)] focus:ring-[var(--accent-primary)]"
+          />
+          <span class="text-sm text-gray-300">Send greeting on connect</span>
+        </label>
+        <p class="text-xs text-gray-500 mt-1 ml-7">
+          Automatically greet you when a session starts with time-based messages
+        </p>
+      </div>
+
+      <!-- Custom Greeting Prompt -->
+      {#if config.greeting_enabled}
+        <div class="mb-4">
+          <label for="greeting-prompt" class="block text-sm text-gray-400 mb-1">
+            Custom Greeting Prompt <span class="text-gray-600">(optional)</span>
+          </label>
+          <textarea
+            id="greeting-prompt"
+            bind:value={config.greeting_custom_prompt}
+            rows="3"
+            placeholder="Leave empty for time-based greetings, or customize how you'd like to be greeted..."
+            class="w-full px-3 py-2 bg-[var(--bg-primary)] border border-[var(--border-color)] rounded-lg text-[var(--text-primary)] focus:outline-none focus:border-[var(--accent-primary)] resize-none"
+          ></textarea>
+        </div>
+      {/if}
+    </section>
+
+    <!-- MCP Servers Section -->
+    <section class="mb-6">
+      <h3 class="text-sm font-medium text-[var(--accent-primary)] uppercase tracking-wider mb-3">
+        MCP Servers
+      </h3>
+      <div class="mb-2">
+        <label for="mcp-config" class="block text-sm text-gray-400 mb-1">
+          Server Configuration <span class="text-gray-600">(JSON)</span>
+        </label>
+        <textarea
+          id="mcp-config"
+          bind:value={config.mcp_servers_json}
+          rows="6"
+          placeholder={`{\n  "servers": {\n    "example": {\n      "command": "npx",\n      "args": ["-y", "@example/mcp-server"]\n    }\n  }\n}`}
+          class="w-full px-3 py-2 bg-[var(--bg-primary)] border border-[var(--border-color)] rounded-lg text-[var(--text-primary)] font-mono text-sm focus:outline-none focus:border-[var(--accent-primary)] resize-none"
+        ></textarea>
+      </div>
+    </section>
+
+    <!-- Auto-Granted Tools Section -->
+    <section class="mb-6">
+      <h3 class="text-sm font-medium text-[var(--accent-primary)] uppercase tracking-wider mb-3">
+        Auto-Granted Tools
+      </h3>
+      <p class="text-xs text-gray-500 mb-3">
+        These tools will be pre-approved for every session (no permission prompts).
+      </p>
+
+      <!-- Common tools checkboxes -->
+      <div class="grid grid-cols-2 gap-2 mb-3">
+        {#each commonTools as tool (tool)}
+          <label class="flex items-center gap-2 text-sm text-gray-300 cursor-pointer">
+            <input
+              type="checkbox"
+              checked={config.auto_granted_tools.includes(tool)}
+              onchange={() => toggleTool(tool)}
+              class="w-4 h-4 rounded border-[var(--border-color)] bg-[var(--bg-primary)] text-[var(--accent-primary)] focus:ring-[var(--accent-primary)]"
+            />
+            {tool}
+          </label>
+        {/each}
+      </div>
+
+      <!-- Currently granted tools (with import) -->
+      {#if grantedTools.length > 0}
+        <div class="mb-3">
+          <div class="flex items-center justify-between mb-2">
+            <span class="text-xs text-gray-500">Session-granted tools:</span>
+            <button
+              onclick={importFromSession}
+              class="text-xs text-[var(--accent-primary)] hover:text-[var(--accent-secondary)] transition-colors"
+            >
+              Import all
+            </button>
+          </div>
+          <div class="flex flex-wrap gap-1">
+            {#each grantedTools as tool (tool)}
+              <span
+                class="px-2 py-0.5 text-xs bg-[var(--accent-primary)]/20 text-[var(--accent-primary)] rounded"
+              >
+                {tool}
+              </span>
+            {/each}
+          </div>
+        </div>
+      {/if}
+
+      <!-- Custom tools list -->
+      {#if config.auto_granted_tools.filter((t) => !commonTools.includes(t)).length > 0}
+        <div class="mb-3">
+          <span class="text-xs text-gray-500 block mb-2">Custom tools:</span>
+          <div class="flex flex-wrap gap-1">
+            {#each config.auto_granted_tools.filter((t) => !commonTools.includes(t)) as tool (tool)}
+              <span
+                class="px-2 py-0.5 text-xs bg-[var(--bg-primary)] border border-[var(--border-color)] rounded flex items-center gap-1"
+              >
+                {tool}
+                <button
+                  onclick={() => removeTool(tool)}
+                  class="text-gray-500 hover:text-red-400"
+                  aria-label="Remove {tool}"
+                >
+                  ×
+                </button>
+              </span>
+            {/each}
+          </div>
+        </div>
+      {/if}
+
+      <!-- Add custom tool -->
+      <div class="flex gap-2">
+        <input
+          type="text"
+          bind:value={newToolName}
+          placeholder="Add custom tool..."
+          onkeydown={(e) => e.key === "Enter" && addCustomTool()}
+          class="flex-1 px-3 py-1.5 text-sm bg-[var(--bg-primary)] border border-[var(--border-color)] rounded-lg text-[var(--text-primary)] focus:outline-none focus:border-[var(--accent-primary)]"
+        />
+        <button
+          onclick={addCustomTool}
+          disabled={!newToolName.trim()}
+          class="px-3 py-1.5 text-sm bg-[var(--accent-primary)] hover:bg-[var(--accent-secondary)] text-white rounded-lg transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
+        >
+          Add
+        </button>
+      </div>
+    </section>
+
+    <!-- Appearance Section -->
+    <section class="mb-6">
+      <h3 class="text-sm font-medium text-[var(--accent-primary)] uppercase tracking-wider mb-3">
+        Appearance
+      </h3>
+      <div class="flex gap-2">
+        <button
+          onclick={() => handleThemeChange("dark")}
+          class="flex-1 px-4 py-2 rounded-lg border transition-colors {config.theme === 'dark'
+            ? 'bg-[var(--accent-primary)] border-[var(--accent-primary)] text-white'
+            : 'bg-[var(--bg-primary)] border-[var(--border-color)] text-gray-400 hover:border-[var(--accent-primary)]'}"
+        >
+          Dark
+        </button>
+        <button
+          onclick={() => handleThemeChange("light")}
+          class="flex-1 px-4 py-2 rounded-lg border transition-colors {config.theme === 'light'
+            ? 'bg-[var(--accent-primary)] border-[var(--accent-primary)] text-white'
+            : 'bg-[var(--bg-primary)] border-[var(--border-color)] text-gray-400 hover:border-[var(--accent-primary)]'}"
+        >
+          Light
+        </button>
+      </div>
+    </section>
+
+    <!-- Notifications Section -->
+    <section class="mb-6">
+      <h3 class="text-sm font-medium text-[var(--accent-primary)] uppercase tracking-wider mb-3">
+        Notifications
+      </h3>
+
+      <!-- Enable/Disable Notifications -->
+      <div class="mb-4">
+        <label class="flex items-center gap-3 cursor-pointer">
+          <input
+            type="checkbox"
+            bind:checked={config.notifications_enabled}
+            class="w-4 h-4 text-[var(--accent-primary)] bg-[var(--bg-primary)] border-[var(--border-color)] rounded focus:ring-[var(--accent-primary)] focus:ring-2"
+          />
+          <span class="text-sm text-gray-300">Enable sound notifications</span>
+        </label>
+      </div>
+
+      <!-- Volume Control -->
+      <div class="mb-4">
+        <label for="notification-volume" class="block text-sm text-gray-400 mb-2">
+          Notification Volume
+        </label>
+        <div class="flex items-center gap-3">
+          <input
+            id="notification-volume"
+            type="range"
+            bind:value={config.notification_volume}
+            min="0"
+            max="1"
+            step="0.1"
+            disabled={!config.notifications_enabled}
+            class="flex-1 h-2 bg-[var(--bg-primary)] rounded-lg appearance-none cursor-pointer disabled:opacity-50"
+          />
+          <span class="text-sm text-gray-300 w-12 text-right">
+            {Math.round(config.notification_volume * 100)}%
+          </span>
+        </div>
+      </div>
+
+      <div class="text-xs text-gray-500">
+        Sound notifications will play when I complete tasks, encounter errors, or need permissions.
+      </div>
+    </section>
+
+    <!-- Save Button -->
+    <div class="sticky bottom-0 pt-4 pb-2 bg-[var(--bg-secondary)]">
+      <button
+        onclick={handleSave}
+        disabled={isSaving}
+        class="w-full py-3 bg-[var(--accent-primary)] hover:bg-[var(--accent-secondary)] text-white font-medium rounded-lg transition-colors disabled:opacity-50"
+      >
+        {isSaving ? "Saving..." : "Save Settings"}
+      </button>
+    </div>
+  </div>
+</aside>
+
+<style>
+  /* Custom range input styling */
+  input[type="range"]::-webkit-slider-thumb {
+    appearance: none;
+    width: 16px;
+    height: 16px;
+    background: var(--accent-primary);
+    border-radius: 50%;
+    cursor: pointer;
+  }
+
+  input[type="range"]::-moz-range-thumb {
+    width: 16px;
+    height: 16px;
+    background: var(--accent-primary);
+    border-radius: 50%;
+    cursor: pointer;
+    border: none;
+  }
+
+  input[type="range"]:disabled::-webkit-slider-thumb {
+    background: var(--text-tertiary);
+    cursor: not-allowed;
+  }
+
+  input[type="range"]:disabled::-moz-range-thumb {
+    background: var(--text-tertiary);
+    cursor: not-allowed;
+  }
+</style>

src/lib/components/InputBar.svelte

@@ -2,6 +2,7 @@
   import { invoke } from "@tauri-apps/api/core";
   import { claudeStore } from "$lib/stores/claude";
   import { characterState } from "$lib/stores/character";
+  import { handleNewUserMessage } from "$lib/notifications/rules";
 
   let inputValue = $state("");
   let isSubmitting = $state(false);
@@ -20,6 +21,9 @@
     isSubmitting = true;
     inputValue = "";
 
+    // Reset notification state for new user message
+    handleNewUserMessage();
+
     claudeStore.addLine("user", message);
     characterState.setState("thinking");
 

src/lib/components/NotificationDebugger.svelte

@@ -0,0 +1,153 @@
+<script lang="ts">
+  import { invoke } from "@tauri-apps/api/core";
+  import { notificationManager } from "$lib/notifications/notificationManager";
+
+  let results: { method: string; success: boolean; error?: string }[] = [];
+  let testing = false;
+
+  async function testNotificationMethod(method: string, invokeCommand: string) {
+    try {
+      await invoke(invokeCommand, {
+        title: "Hikari Test",
+        body: `Testing ${method} notification method`,
+      });
+      return { method, success: true };
+    } catch (error) {
+      return { method, success: false, error: String(error) };
+    }
+  }
+
+  async function testAllMethods() {
+    testing = true;
+    results = [];
+
+    const methods = [
+      { name: "WSL Toast (System Tray)", command: "send_wsl_notification" },
+      { name: "VBScript (Popup Dialog)", command: "send_vbs_notification" },
+      { name: "Notify-send (Linux)", command: "send_notify_send" },
+      { name: "Windows PowerShell", command: "send_windows_notification" },
+      { name: "Simple Message (Dialog)", command: "send_simple_notification" },
+    ];
+
+    for (const method of methods) {
+      const result = await testNotificationMethod(method.name, method.command);
+      results = [...results, result];
+      // Wait a bit between tests
+      await new Promise((resolve) => setTimeout(resolve, 500));
+    }
+
+    testing = false;
+  }
+
+  async function testIntegratedNotification() {
+    await notificationManager.notifySuccess("Integrated notification test!");
+  }
+</script>
+
+<div class="notification-debugger">
+  <h3>Notification Method Debugger</h3>
+
+  <div class="test-buttons">
+    <button on:click={testAllMethods} disabled={testing}>
+      {testing ? "Testing..." : "Test All Methods"}
+    </button>
+
+    <button on:click={testIntegratedNotification}> Test Integrated Notification </button>
+  </div>
+
+  {#if results.length > 0}
+    <div class="results">
+      <h4>Test Results:</h4>
+      {#each results as result (result.method)}
+        <div class="result" class:success={result.success} class:failed={!result.success}>
+          <span class="method">{result.method}:</span>
+          <span class="status">{result.success ? "✓ Success" : "✗ Failed"}</span>
+          {#if result.error}
+            <div class="error">{result.error}</div>
+          {/if}
+        </div>
+      {/each}
+    </div>
+  {/if}
+</div>
+
+<style>
+  .notification-debugger {
+    padding: 1rem;
+    border: 1px solid var(--border-color);
+    border-radius: 0.5rem;
+    margin: 1rem;
+    background: var(--bg-secondary);
+  }
+
+  h3,
+  h4 {
+    margin-top: 0;
+    color: var(--text-primary);
+  }
+
+  .test-buttons {
+    display: flex;
+    gap: 1rem;
+    margin: 1rem 0;
+  }
+
+  button {
+    padding: 0.5rem 1rem;
+    background: var(--accent-color);
+    color: white;
+    border: none;
+    border-radius: 0.25rem;
+    cursor: pointer;
+    transition: opacity 0.2s;
+  }
+
+  button:hover:not(:disabled) {
+    opacity: 0.8;
+  }
+
+  button:disabled {
+    opacity: 0.5;
+    cursor: not-allowed;
+  }
+
+  .results {
+    margin-top: 1rem;
+  }
+
+  .result {
+    padding: 0.5rem;
+    margin: 0.25rem 0;
+    border-radius: 0.25rem;
+    display: flex;
+    align-items: center;
+    gap: 1rem;
+  }
+
+  .result.success {
+    background: rgba(0, 255, 0, 0.1);
+    border: 1px solid rgba(0, 255, 0, 0.3);
+  }
+
+  .result.failed {
+    background: rgba(255, 0, 0, 0.1);
+    border: 1px solid rgba(255, 0, 0, 0.3);
+  }
+
+  .method {
+    font-weight: bold;
+    min-width: 150px;
+  }
+
+  .status {
+    flex: 1;
+  }
+
+  .error {
+    width: 100%;
+    margin-top: 0.25rem;
+    font-size: 0.875rem;
+    color: var(--error-color);
+    word-break: break-word;
+  }
+</style>

src/lib/components/PermissionModal.svelte

@@ -37,7 +37,10 @@
 
       claudeStore.grantTool(approvedTool);
       const newGrantedTools = [...grantedToolsList, approvedTool];
-      claudeStore.addLine("system", `Permission granted for: ${approvedTool}. Reconnecting with context...`);
+      claudeStore.addLine(
+        "system",
+        `Permission granted for: ${approvedTool}. Reconnecting with context...`
+      );
       claudeStore.clearPermission();
 
       // Stop current session and reconnect with new permissions
@@ -48,8 +51,10 @@
         await new Promise((resolve) => setTimeout(resolve, 500));
 
         await invoke("start_claude", {
-          workingDir: workingDirectory || "/home/naomi",
+          options: {
-          allowedTools: newGrantedTools,
+            working_dir: workingDirectory || "/home/naomi",
+            allowed_tools: newGrantedTools,
+          },
         });
 
         // Wait for connection to establish
@@ -97,8 +102,12 @@ Please continue where we left off and retry that action now that you have permis
 </script>
 
 {#if isVisible && permission}
-  <div class="permission-overlay fixed inset-0 bg-black/70 flex items-center justify-center z-50 backdrop-blur-sm">
+  <div
-    <div class="permission-modal bg-[var(--bg-primary)] border border-[var(--border-color)] rounded-xl p-6 max-w-md w-full mx-4 shadow-2xl">
+    class="permission-overlay fixed inset-0 bg-black/70 flex items-center justify-center z-50 backdrop-blur-sm"
+  >
+    <div
+      class="permission-modal bg-[var(--bg-primary)] border border-[var(--border-color)] rounded-xl p-6 max-w-md w-full mx-4 shadow-2xl"
+    >
       <div class="flex items-center gap-3 mb-4">
         <div class="w-10 h-10 rounded-full bg-yellow-500/20 flex items-center justify-center">
           <span class="text-xl">🔐</span>
@@ -117,10 +126,14 @@ Please continue where we left off and retry that action now that you have permis
 
       <div class="mb-4">
         <div class="text-sm text-gray-400 mb-1">Tool</div>
-        <div class="px-3 py-2 bg-[var(--bg-secondary)] rounded-md text-[var(--accent-primary)] font-mono flex items-center justify-between">
+        <div
+          class="px-3 py-2 bg-[var(--bg-secondary)] rounded-md text-[var(--accent-primary)] font-mono flex items-center justify-between"
+        >
           <span>{permission.tool}</span>
           {#if isToolAlreadyGranted(permission.tool)}
-            <span class="text-xs text-green-400 bg-green-500/20 px-2 py-0.5 rounded">Already Granted</span>
+            <span class="text-xs text-green-400 bg-green-500/20 px-2 py-0.5 rounded"
+              >Already Granted</span
+            >
           {/if}
         </div>
       </div>
@@ -135,7 +148,10 @@ Please continue where we left off and retry that action now that you have permis
       {#if Object.keys(permission.input).length > 0}
         <div class="mb-6">
           <div class="text-sm text-gray-400 mb-1">Details</div>
-          <pre class="px-3 py-2 bg-[var(--bg-terminal)] rounded-md text-gray-300 text-xs overflow-x-auto max-h-32">{formatInput(permission.input)}</pre>
+          <pre
+            class="px-3 py-2 bg-[var(--bg-terminal)] rounded-md text-gray-300 text-xs overflow-x-auto max-h-32">{formatInput(
+              permission.input
+            )}</pre>
         </div>
       {/if}
 

src/lib/components/StatusBar.svelte

@@ -4,6 +4,7 @@
   import { open } from "@tauri-apps/plugin-dialog";
   import { openUrl } from "@tauri-apps/plugin-opener";
   import { claudeStore } from "$lib/stores/claude";
+  import { configStore, type HikariConfig } from "$lib/stores/config";
   import type { ConnectionStatus } from "$lib/types/messages";
   import { onMount } from "svelte";
 
@@ -15,6 +16,18 @@
   let isConnecting = $state(false);
   let grantedToolsList: string[] = $state([]);
   let appVersion = $state("");
+  let currentConfig: HikariConfig = $state({
+    model: null,
+    api_key: null,
+    custom_instructions: null,
+    mcp_servers_json: null,
+    auto_granted_tools: [],
+    theme: "dark",
+    greeting_enabled: true,
+    greeting_custom_prompt: null,
+    notifications_enabled: true,
+    notification_volume: 0.5,
+  });
 
   onMount(async () => {
     appVersion = await getVersion();
@@ -33,6 +46,10 @@
     grantedToolsList = Array.from(tools);
   });
 
+  configStore.config.subscribe((config) => {
+    currentConfig = config;
+  });
+
   async function handleBrowse() {
     try {
       const selected = await open({
@@ -54,11 +71,21 @@
 
     const targetDir = selectedDirectory || "/home/naomi";
 
+    // Combine session-granted tools with config auto-granted tools
+    const allAllowedTools = [
+      ...new Set([...grantedToolsList, ...currentConfig.auto_granted_tools]),
+    ];
+
     try {
-      // Pass granted tools to Claude so they're pre-approved
       await invoke("start_claude", {
-        workingDir: targetDir,
+        options: {
-        allowedTools: grantedToolsList.length > 0 ? grantedToolsList : null,
+          working_dir: targetDir,
+          model: currentConfig.model || null,
+          api_key: currentConfig.api_key || null,
+          custom_instructions: currentConfig.custom_instructions || null,
+          mcp_servers_json: currentConfig.mcp_servers_json || null,
+          allowed_tools: allAllowedTools,
+        },
       });
     } catch (error) {
       console.error("Failed to start Claude:", error);
@@ -101,7 +128,9 @@
   }
 </script>
 
-<div class="status-bar flex items-center justify-between px-4 py-2 bg-[var(--bg-secondary)] border-b border-[var(--border-color)]">
+<div
+  class="status-bar flex items-center justify-between px-4 py-2 bg-[var(--bg-secondary)] border-b border-[var(--border-color)]"
+>
   <div class="flex items-center gap-4">
     <div class="flex items-center gap-2">
       <div class="w-2.5 h-2.5 rounded-full {getStatusColor()}"></div>
@@ -111,7 +140,8 @@
     {#if connectionStatus === "connected"}
       {#if workingDirectory}
         <div class="text-sm text-gray-500">
-          <span class="text-gray-600">cwd:</span> {workingDirectory}
+          <span class="text-gray-600">cwd:</span>
+          {workingDirectory}
         </div>
       {/if}
     {:else}
@@ -137,13 +167,35 @@
   </div>
 
   <div class="flex items-center gap-3">
+    <button
+      onclick={configStore.openSidebar}
+      class="p-1 text-gray-500 hover:text-[var(--accent-primary)] transition-colors"
+      title="Settings"
+    >
+      <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z"
+        />
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"
+        />
+      </svg>
+    </button>
     <button
       onclick={() => openUrl(DISCORD_URL)}
       class="p-1 text-gray-500 hover:text-[var(--accent-primary)] transition-colors"
       title="Join our Discord"
     >
       <svg class="w-5 h-5" viewBox="0 0 24 24" fill="currentColor">
-        <path d="M20.317 4.37a19.791 19.791 0 0 0-4.885-1.515.074.074 0 0 0-.079.037c-.21.375-.444.864-.608 1.25a18.27 18.27 0 0 0-5.487 0 12.64 12.64 0 0 0-.617-1.25.077.077 0 0 0-.079-.037A19.736 19.736 0 0 0 3.677 4.37a.07.07 0 0 0-.032.027C.533 9.046-.32 13.58.099 18.057a.082.082 0 0 0 .031.057 19.9 19.9 0 0 0 5.993 3.03.078.078 0 0 0 .084-.028 14.09 14.09 0 0 0 1.226-1.994.076.076 0 0 0-.041-.106 13.107 13.107 0 0 1-1.872-.892.077.077 0 0 1-.008-.128 10.2 10.2 0 0 0 .372-.292.074.074 0 0 1 .077-.01c3.928 1.793 8.18 1.793 12.062 0a.074.074 0 0 1 .078.01c.12.098.246.198.373.292a.077.077 0 0 1-.006.127 12.299 12.299 0 0 1-1.873.892.077.077 0 0 0-.041.107c.36.698.772 1.362 1.225 1.993a.076.076 0 0 0 .084.028 19.839 19.839 0 0 0 6.002-3.03.077.077 0 0 0 .032-.054c.5-5.177-.838-9.674-3.549-13.66a.061.061 0 0 0-.031-.03zM8.02 15.33c-1.183 0-2.157-1.085-2.157-2.419 0-1.333.956-2.419 2.157-2.419 1.21 0 2.176 1.096 2.157 2.42 0 1.333-.956 2.418-2.157 2.418zm7.975 0c-1.183 0-2.157-1.085-2.157-2.419 0-1.333.955-2.419 2.157-2.419 1.21 0 2.176 1.096 2.157 2.42 0 1.333-.946 2.418-2.157 2.418z"/>
+        <path
+          d="M20.317 4.37a19.791 19.791 0 0 0-4.885-1.515.074.074 0 0 0-.079.037c-.21.375-.444.864-.608 1.25a18.27 18.27 0 0 0-5.487 0 12.64 12.64 0 0 0-.617-1.25.077.077 0 0 0-.079-.037A19.736 19.736 0 0 0 3.677 4.37a.07.07 0 0 0-.032.027C.533 9.046-.32 13.58.099 18.057a.082.082 0 0 0 .031.057 19.9 19.9 0 0 0 5.993 3.03.078.078 0 0 0 .084-.028 14.09 14.09 0 0 0 1.226-1.994.076.076 0 0 0-.041-.106 13.107 13.107 0 0 1-1.872-.892.077.077 0 0 1-.008-.128 10.2 10.2 0 0 0 .372-.292.074.074 0 0 1 .077-.01c3.928 1.793 8.18 1.793 12.062 0a.074.074 0 0 1 .078.01c.12.098.246.198.373.292a.077.077 0 0 1-.006.127 12.299 12.299 0 0 1-1.873.892.077.077 0 0 0-.041.107c.36.698.772 1.362 1.225 1.993a.076.076 0 0 0 .084.028 19.839 19.839 0 0 0 6.002-3.03.077.077 0 0 0 .032-.054c.5-5.177-.838-9.674-3.549-13.66a.061.061 0 0 0-.031-.03zM8.02 15.33c-1.183 0-2.157-1.085-2.157-2.419 0-1.333.956-2.419 2.157-2.419 1.21 0 2.176 1.096 2.157 2.42 0 1.333-.956 2.418-2.157 2.418zm7.975 0c-1.183 0-2.157-1.085-2.157-2.419 0-1.333.955-2.419 2.157-2.419 1.21 0 2.176 1.096 2.157 2.42 0 1.333-.946 2.418-2.157 2.418z"
+        />
       </svg>
     </button>
     {#if appVersion}

src/lib/components/Terminal.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import { claudeStore, type TerminalLine } from "$lib/stores/claude";
-  import { onMount, afterUpdate } from "svelte";
+  import { afterUpdate } from "svelte";
 
   let terminalElement: HTMLDivElement;
   let shouldAutoScroll = true;
@@ -67,7 +67,9 @@
 <div
   class="terminal-container flex-1 overflow-hidden rounded-lg bg-[var(--bg-terminal)] border border-[var(--border-color)]"
 >
-  <div class="terminal-header flex items-center gap-2 px-4 py-2 border-b border-[var(--border-color)] bg-[var(--bg-secondary)]">
+  <div
+    class="terminal-header flex items-center gap-2 px-4 py-2 border-b border-[var(--border-color)] bg-[var(--bg-secondary)]"
+  >
     <div class="flex gap-1.5">
       <div class="w-3 h-3 rounded-full bg-red-500"></div>
       <div class="w-3 h-3 rounded-full bg-yellow-500"></div>
@@ -82,9 +84,7 @@
     class="terminal-content h-[calc(100%-40px)] overflow-y-auto p-4 font-mono text-sm"
   >
     {#if lines.length === 0}
-      <div class="text-gray-500 italic">
+      <div class="text-gray-500 italic">Waiting for Claude... Type a message below to start!</div>
-        Waiting for Claude... Type a message below to start!
-      </div>
     {:else}
       {#each lines as line (line.id)}
         <div class="terminal-line mb-2 {getLineClass(line.type)}">

src/lib/notifications/index.ts

@@ -0,0 +1,4 @@
+export * from "./types";
+export { soundPlayer } from "./soundPlayer";
+export { notificationManager } from "./notificationManager";
+export { initializeNotificationRules } from "./rules";

src/lib/notifications/notificationManager.ts

@@ -0,0 +1,121 @@
+import { soundPlayer } from "./soundPlayer";
+import { NotificationType, NOTIFICATION_SOUNDS } from "./types";
+import { invoke } from "@tauri-apps/api/core";
+import { sendTerminalNotification } from "./terminalNotifier";
+
+class NotificationManager {
+  async notify(type: NotificationType, message?: string): Promise<void> {
+    // Always play sound (if enabled)
+    await soundPlayer.play(type);
+
+    const sound = NOTIFICATION_SOUNDS[type];
+    const title = sound.phrase;
+    const body = message || this.getDefaultMessage(type);
+
+    // Try multiple notification methods in order
+    const notificationMethods = [
+      // Method 1: Try Windows PowerShell (best for system tray notifications)
+      async () => {
+        console.log("Trying Windows PowerShell notifications...");
+        await invoke("send_windows_notification", { title, body });
+      },
+
+      // Method 2: Try native Windows toast (for Windows builds)
+      async () => {
+        console.log("Trying native Windows toast...");
+        await invoke("send_windows_toast", { title, body });
+      },
+
+      // Method 3: Try WSL-specific notification (Windows toast via PowerShell - for WSL)
+      async () => {
+        console.log("Trying WSL notification...");
+        await invoke("send_wsl_notification", { title, body });
+      },
+
+      // Method 4: Try native Tauri notifications
+      async () => {
+        console.log("Trying Tauri native notifications...");
+        const { sendNotification, isPermissionGranted, requestPermission } =
+          await import("@tauri-apps/plugin-notification");
+
+        let hasPermission = await isPermissionGranted();
+        if (!hasPermission) {
+          const permission = await requestPermission();
+          hasPermission = permission === "granted";
+        }
+
+        if (hasPermission) {
+          await sendNotification({ title, body });
+        } else {
+          throw new Error("Notification permission denied");
+        }
+      },
+
+      // Method 5: Try notify-send (for native Linux)
+      async () => {
+        console.log("Trying notify-send...");
+        await invoke("send_notify_send", { title, body });
+      },
+
+      // Skip VBScript and simple message as they create popup dialogs
+      // Only use them in the debugger for testing
+    ];
+
+    // Try each method until one succeeds
+    for (const method of notificationMethods) {
+      try {
+        await method();
+        console.log("Notification sent successfully");
+        return; // Success, stop trying other methods
+      } catch (error) {
+        console.warn("Notification method failed:", error);
+        // Continue to next method
+      }
+    }
+
+    console.error("All notification methods failed, using terminal notification");
+    // Final fallback: Show in terminal
+    sendTerminalNotification(type, body);
+  }
+
+  private getDefaultMessage(type: NotificationType): string {
+    switch (type) {
+      case NotificationType.SUCCESS:
+        return "Task completed successfully!";
+      case NotificationType.ERROR:
+        return "Something went wrong...";
+      case NotificationType.PERMISSION:
+        return "Permission needed to continue";
+      case NotificationType.CONNECTION:
+        return "Successfully connected to Claude Code";
+      case NotificationType.TASK_START:
+        return "Starting task...";
+      default:
+        return "Notification";
+    }
+  }
+
+  // Helper methods for common notifications
+  async notifySuccess(message?: string): Promise<void> {
+    await this.notify(NotificationType.SUCCESS, message);
+  }
+
+  async notifyError(message?: string): Promise<void> {
+    await this.notify(NotificationType.ERROR, message);
+  }
+
+  async notifyPermission(message?: string): Promise<void> {
+    await this.notify(NotificationType.PERMISSION, message);
+  }
+
+  async notifyConnection(message?: string): Promise<void> {
+    await this.notify(NotificationType.CONNECTION, message);
+  }
+
+  async notifyTaskStart(message?: string): Promise<void> {
+    await this.notify(NotificationType.TASK_START, message);
+  }
+}
+
+// Export singleton instance
+export const notificationManager = new NotificationManager();

src/lib/notifications/rules.ts

@@ -0,0 +1,103 @@
+import { characterState } from "$lib/stores/character";
+import { notificationManager } from "./notificationManager";
+import type { CharacterState } from "$lib/types/states";
+import type { ConnectionStatus } from "$lib/types/messages";
+
+// Track previous states to detect transitions
+let previousCharacterState: CharacterState | null = null;
+let previousConnectionStatus: ConnectionStatus | null = null;
+let taskStartTime: number | null = null;
+let hasNotifiedTaskStart = false;
+
+export function handleCharacterStateChange(newState: CharacterState): void {
+  // Detect state transitions
+  if (previousCharacterState === newState) return;
+
+  // Task completion: any state -> success
+  if (newState === "success" && previousCharacterState !== null) {
+    const taskDuration = taskStartTime ? Date.now() - taskStartTime : 0;
+    // Only notify for tasks that took more than 2 seconds
+    if (taskDuration > 2000) {
+      notificationManager.notifySuccess();
+    }
+    taskStartTime = null;
+  }
+
+  // Error occurred
+  if (newState === "error" && previousCharacterState !== "error") {
+    notificationManager.notifyError();
+  }
+
+  // Permission needed
+  if (newState === "permission") {
+    notificationManager.notifyPermission();
+  }
+
+  // Starting long tasks - only notify once per response
+  if (
+    (newState === "coding" || newState === "searching") &&
+    previousCharacterState !== "coding" &&
+    previousCharacterState !== "searching" &&
+    !hasNotifiedTaskStart
+  ) {
+    taskStartTime = Date.now();
+    hasNotifiedTaskStart = true;
+    notificationManager.notifyTaskStart();
+  }
+
+  previousCharacterState = newState;
+}
+
+export function handleConnectionStatusChange(newStatus: ConnectionStatus): void {
+  // Only notify on successful connection after being disconnected
+  if (
+    newStatus === "connected" &&
+    previousConnectionStatus &&
+    previousConnectionStatus !== "connected"
+  ) {
+    notificationManager.notifyConnection();
+  }
+
+  previousConnectionStatus = newStatus;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export function handleToolExecution(_toolName: string): void {
+  // For now, we don't notify on every tool execution
+  // But we could add specific rules here if needed
+}
+
+// Reset notification state for a new response
+export function handleNewUserMessage(): void {
+  hasNotifiedTaskStart = false;
+}
+
+// Store unsubscribe functions
+let unsubscribeCharacterState: (() => void) | null = null;
+
+// Initialize listeners
+export function initializeNotificationRules(): void {
+  // Clean up any existing subscriptions first
+  cleanupNotificationRules();
+
+  // Subscribe to character state changes
+  unsubscribeCharacterState = characterState.subscribe((state) => {
+    handleCharacterStateChange(state);
+  });
+
+  // We'll connect to connection status in the next step
+}
+
+// Cleanup function to prevent duplicate listeners
+export function cleanupNotificationRules(): void {
+  if (unsubscribeCharacterState) {
+    unsubscribeCharacterState();
+    unsubscribeCharacterState = null;
+  }
+
+  // Reset state tracking
+  previousCharacterState = null;
+  previousConnectionStatus = null;
+  taskStartTime = null;
+  hasNotifiedTaskStart = false;
+}

src/lib/notifications/soundPlayer.ts

@@ -0,0 +1,61 @@
+import { NOTIFICATION_SOUNDS, type NotificationType } from "./types";
+
+class SoundPlayer {
+  private audioCache: Map<NotificationType, HTMLAudioElement> = new Map();
+  private enabled: boolean = true;
+  private globalVolume: number = 1.0;
+
+  constructor() {
+    // Preload all essential sounds
+    this.preloadSounds();
+  }
+
+  private preloadSounds(): void {
+    Object.entries(NOTIFICATION_SOUNDS).forEach(([type, sound]) => {
+      const audio = new Audio(`/sounds/${sound.filename}`);
+      audio.preload = "auto";
+      audio.volume = (sound.volume || 0.7) * this.globalVolume;
+      this.audioCache.set(type as NotificationType, audio);
+    });
+  }
+
+  async play(type: NotificationType): Promise<void> {
+    if (!this.enabled) return;
+
+    try {
+      const audio = this.audioCache.get(type);
+      if (!audio) {
+        console.warn(`No audio found for notification type: ${type}`);
+        return;
+      }
+
+      // Clone the audio to allow overlapping sounds
+      const audioClone = audio.cloneNode() as HTMLAudioElement;
+      audioClone.volume = audio.volume;
+
+      await audioClone.play();
+    } catch (error) {
+      console.error("Failed to play notification sound:", error);
+    }
+  }
+
+  setEnabled(enabled: boolean): void {
+    this.enabled = enabled;
+  }
+
+  setGlobalVolume(volume: number): void {
+    this.globalVolume = Math.max(0, Math.min(1, volume));
+    // Update all cached audio volumes
+    this.audioCache.forEach((audio, type) => {
+      const sound = NOTIFICATION_SOUNDS[type];
+      audio.volume = (sound.volume || 0.7) * this.globalVolume;
+    });
+  }
+
+  isEnabled(): boolean {
+    return this.enabled;
+  }
+}
+
+// Export singleton instance
+export const soundPlayer = new SoundPlayer();

src/lib/notifications/terminalNotifier.ts

@@ -0,0 +1,50 @@
+import { claudeStore } from "$lib/stores/claude";
+import { NOTIFICATION_SOUNDS, type NotificationType } from "./types";
+
+export function sendTerminalNotification(type: NotificationType, message?: string): void {
+  const sound = NOTIFICATION_SOUNDS[type];
+  const title = sound.phrase;
+
+  // Create a formatted notification message
+  const separator = "═".repeat(50);
+  const timestamp = new Date().toLocaleTimeString();
+
+  let emoji = "";
+  let color = "";
+
+  switch (type) {
+    case "success":
+      emoji = "✨";
+      color = "\x1b[32m"; // Green
+      break;
+    case "error":
+      emoji = "❌";
+      color = "\x1b[31m"; // Red
+      break;
+    case "permission":
+      emoji = "🔐";
+      color = "\x1b[33m"; // Yellow
+      break;
+    case "connection":
+      emoji = "🔗";
+      color = "\x1b[36m"; // Cyan
+      break;
+    case "task_start":
+      emoji = "🚀";
+      color = "\x1b[34m"; // Blue
+      break;
+  }
+
+  const reset = "\x1b[0m";
+
+  // Format the notification
+  const notification = `
+${color}${separator}${reset}
+${emoji} ${color}NOTIFICATION${reset} - ${timestamp}
+${color}${title}${reset}
+${message || ""}
+${color}${separator}${reset}`;
+
+  // Add to terminal as a special system message
+  claudeStore.addLine("system", notification);
+}

src/lib/notifications/testNotifications.ts

@@ -0,0 +1,42 @@
+import { notificationManager } from "./notificationManager";
+
+// Test function to trigger each notification type
+export async function testAllNotifications() {
+  console.log("Testing all notification types...");
+
+  // Test success notification
+  setTimeout(async () => {
+    console.log("Testing SUCCESS notification");
+    await notificationManager.notifySuccess("Test task completed!");
+  }, 1000);
+
+  // Test error notification
+  setTimeout(async () => {
+    console.log("Testing ERROR notification");
+    await notificationManager.notifyError("Test error occurred!");
+  }, 3000);
+
+  // Test permission notification
+  setTimeout(async () => {
+    console.log("Testing PERMISSION notification");
+    await notificationManager.notifyPermission("Test permission request!");
+  }, 5000);
+
+  // Test connection notification
+  setTimeout(async () => {
+    console.log("Testing CONNECTION notification");
+    await notificationManager.notifyConnection("Test connection established!");
+  }, 7000);
+
+  // Test task start notification
+  setTimeout(async () => {
+    console.log("Testing TASK_START notification");
+    await notificationManager.notifyTaskStart("Test task starting!");
+  }, 9000);
+}
+
+// Make it available on window for easy testing
+if (typeof window !== "undefined") {
+  (window as unknown as { testNotifications: typeof testAllNotifications }).testNotifications =
+    testAllNotifications;
+}

src/lib/notifications/types.ts

@@ -0,0 +1,48 @@
+export enum NotificationType {
+  SUCCESS = "success",
+  ERROR = "error",
+  PERMISSION = "permission",
+  CONNECTION = "connection",
+  TASK_START = "task_start",
+}
+
+export interface NotificationSound {
+  type: NotificationType;
+  filename: string;
+  phrase: string;
+  volume?: number;
+}
+
+// Essential notification sounds mapping
+export const NOTIFICATION_SOUNDS: Record<NotificationType, NotificationSound> = {
+  [NotificationType.SUCCESS]: {
+    type: NotificationType.SUCCESS,
+    filename: "im-done.mp3",
+    phrase: "I'm done!",
+    volume: 0.7,
+  },
+  [NotificationType.ERROR]: {
+    type: NotificationType.ERROR,
+    filename: "oh-no.mp3",
+    phrase: "Oh no...",
+    volume: 0.8,
+  },
+  [NotificationType.PERMISSION]: {
+    type: NotificationType.PERMISSION,
+    filename: "access-please.mp3",
+    phrase: "Access please!",
+    volume: 0.9,
+  },
+  [NotificationType.CONNECTION]: {
+    type: NotificationType.CONNECTION,
+    filename: "connected.mp3",
+    phrase: "Connected!",
+    volume: 0.7,
+  },
+  [NotificationType.TASK_START]: {
+    type: NotificationType.TASK_START,
+    filename: "working-on-it.mp3",
+    phrase: "Working on it!",
+    volume: 0.6,
+  },
+};

src/lib/notifications/wslNotificationHelper.ts

@@ -0,0 +1,16 @@
+import { invoke } from "@tauri-apps/api/core";
+import { platform } from "@tauri-apps/plugin-os";
+
+export async function sendWSLNotification(title: string, body: string): Promise<void> {
+  const currentPlatform = await platform();
+
+  // Check if we're on Windows (WSL shows as 'windows')
+  if (currentPlatform === "windows") {
+    try {
+      // Use PowerShell to send Windows native notifications
+      await invoke("send_windows_notification", { title, body });
+    } catch (error) {
+      console.error("Failed to send Windows notification:", error);
+    }
+  }
+}

src/lib/stores/character.ts

@@ -2,7 +2,7 @@ import { writable, derived } from "svelte/store";
 import { CHARACTER_STATES, type CharacterState } from "$lib/types/states";
 
 function createCharacterStore() {
-  const { subscribe, set, update } = writable<CharacterState>("idle");
+  const { subscribe, set } = writable<CharacterState>("idle");
 
   let stateTimeout: ReturnType<typeof setTimeout> | null = null;
 

src/lib/stores/claude.ts

@@ -1,9 +1,5 @@
 import { writable, derived } from "svelte/store";
-import type {
+import type { ConnectionStatus, PermissionRequest } from "$lib/types/messages";
-  ConnectionStatus,
-  PermissionRequest,
-  ClaudeStreamMessage,
-} from "$lib/types/messages";
 
 export interface TerminalLine {
   id: string;

src/lib/stores/config.ts

@@ -0,0 +1,122 @@
+import { writable, derived } from "svelte/store";
+import { invoke } from "@tauri-apps/api/core";
+
+export type Theme = "dark" | "light";
+
+export interface HikariConfig {
+  model: string | null;
+  api_key: string | null;
+  custom_instructions: string | null;
+  mcp_servers_json: string | null;
+  auto_granted_tools: string[];
+  theme: Theme;
+  greeting_enabled: boolean;
+  greeting_custom_prompt: string | null;
+  notifications_enabled: boolean;
+  notification_volume: number;
+}
+
+const defaultConfig: HikariConfig = {
+  model: null,
+  api_key: null,
+  custom_instructions: null,
+  mcp_servers_json: null,
+  auto_granted_tools: [],
+  theme: "dark",
+  greeting_enabled: true,
+  greeting_custom_prompt: null,
+  notifications_enabled: true,
+  notification_volume: 0.7,
+};
+
+function createConfigStore() {
+  const config = writable<HikariConfig>(defaultConfig);
+  const isLoading = writable<boolean>(true);
+  const isSidebarOpen = writable<boolean>(false);
+  const saveError = writable<string | null>(null);
+
+  async function loadConfig() {
+    isLoading.set(true);
+    try {
+      const savedConfig = await invoke<HikariConfig>("get_config");
+      config.set(savedConfig);
+    } catch (error) {
+      console.error("Failed to load config:", error);
+      config.set(defaultConfig);
+    } finally {
+      isLoading.set(false);
+    }
+  }
+
+  async function saveConfig(newConfig: HikariConfig) {
+    saveError.set(null);
+    try {
+      await invoke("save_config", { config: newConfig });
+      config.set(newConfig);
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      saveError.set(errorMessage);
+      console.error("Failed to save config:", error);
+      throw error;
+    }
+  }
+
+  async function updateConfig(updates: Partial<HikariConfig>) {
+    let currentConfig: HikariConfig = defaultConfig;
+    config.subscribe((c) => (currentConfig = c))();
+    const newConfig = { ...currentConfig, ...updates };
+    await saveConfig(newConfig);
+  }
+
+  return {
+    config: { subscribe: config.subscribe },
+    isLoading: { subscribe: isLoading.subscribe },
+    isSidebarOpen: { subscribe: isSidebarOpen.subscribe },
+    saveError: { subscribe: saveError.subscribe },
+
+    loadConfig,
+    saveConfig,
+    updateConfig,
+
+    openSidebar: () => isSidebarOpen.set(true),
+    closeSidebar: () => isSidebarOpen.set(false),
+    toggleSidebar: () => isSidebarOpen.update((open) => !open),
+
+    setTheme: async (theme: Theme) => {
+      await updateConfig({ theme });
+      applyTheme(theme);
+    },
+
+    addAutoGrantedTool: async (tool: string) => {
+      let currentConfig: HikariConfig = defaultConfig;
+      config.subscribe((c) => (currentConfig = c))();
+      if (!currentConfig.auto_granted_tools.includes(tool)) {
+        const newTools = [...currentConfig.auto_granted_tools, tool];
+        await updateConfig({ auto_granted_tools: newTools });
+      }
+    },
+
+    removeAutoGrantedTool: async (tool: string) => {
+      let currentConfig: HikariConfig = defaultConfig;
+      config.subscribe((c) => (currentConfig = c))();
+      const newTools = currentConfig.auto_granted_tools.filter((t) => t !== tool);
+      await updateConfig({ auto_granted_tools: newTools });
+    },
+
+    getConfig: (): HikariConfig => {
+      let currentConfig: HikariConfig = defaultConfig;
+      config.subscribe((c) => (currentConfig = c))();
+      return currentConfig;
+    },
+  };
+}
+
+export function applyTheme(theme: Theme) {
+  if (typeof document !== "undefined") {
+    document.documentElement.setAttribute("data-theme", theme);
+  }
+}
+
+export const configStore = createConfigStore();
+
+export const isDarkTheme = derived(configStore.config, ($config) => $config.theme === "dark");

src/lib/stores/notifications.ts

@@ -0,0 +1,22 @@
+import { derived } from "svelte/store";
+import { configStore } from "./config";
+import { soundPlayer } from "$lib/notifications";
+
+// Sync notification settings with config
+export const notificationSettings = derived(configStore.config, ($config) => {
+  soundPlayer.setEnabled($config.notifications_enabled);
+  soundPlayer.setGlobalVolume($config.notification_volume);
+
+  return {
+    enabled: $config.notifications_enabled,
+    volume: $config.notification_volume,
+  };
+});
+
+// Helper to update notification settings
+export async function updateNotificationSettings(enabled: boolean, volume: number) {
+  await configStore.updateConfig({
+    notifications_enabled: enabled,
+    notification_volume: volume,
+  });
+}

src/lib/tauri.ts

@@ -1,14 +1,68 @@
 import { listen } from "@tauri-apps/api/event";
+import { invoke } from "@tauri-apps/api/core";
 import { claudeStore } from "$lib/stores/claude";
 import { characterState } from "$lib/stores/character";
+import { configStore } from "$lib/stores/config";
 import type { ConnectionStatus, PermissionPromptEvent } from "$lib/types/messages";
 import type { CharacterState } from "$lib/types/states";
+import {
+  initializeNotificationRules,
+  cleanupNotificationRules,
+  handleConnectionStatusChange,
+  handleNewUserMessage,
+} from "$lib/notifications/rules";
 
 interface StateChangePayload {
   state: CharacterState;
   tool_name: string | null;
 }
 
+let hasConnectedThisSession = false;
+let unlisteners: Array<() => void> = [];
+
+function getTimeOfDay(): string {
+  const hour = new Date().getHours();
+
+  if (hour >= 5 && hour < 12) {
+    return "morning";
+  } else if (hour >= 12 && hour < 17) {
+    return "afternoon";
+  } else if (hour >= 17 && hour < 21) {
+    return "evening";
+  } else {
+    return "late night";
+  }
+}
+
+function generateGreetingPrompt(): string {
+  const timeOfDay = getTimeOfDay();
+  return `[System: A new session has started. It's currently ${timeOfDay}. Please greet the user warmly and briefly. Keep it short - just 1-2 sentences.]`;
+}
+
+async function sendGreeting() {
+  const config = configStore.getConfig();
+
+  if (!config.greeting_enabled) {
+    return;
+  }
+
+  const greetingPrompt = config.greeting_custom_prompt?.trim() || generateGreetingPrompt();
+
+  // Don't show the system prompt in the UI - just trigger Claude to respond
+  characterState.setState("thinking");
+
+  // Reset notification state for greeting
+  handleNewUserMessage();
+
+  try {
+    await invoke("send_prompt", { message: greetingPrompt });
+  } catch (error) {
+    console.error("Failed to send greeting:", error);
+    claudeStore.addLine("error", `Failed to send greeting: ${error}`);
+    characterState.setTemporaryState("error", 3000);
+  }
+}
+
 interface OutputPayload {
   line_type: string;
   content: string;
@@ -16,23 +70,39 @@ interface OutputPayload {
 }
 
 export async function initializeTauriListeners() {
-  await listen<string>("claude:connection", (event) => {
+  // Cleanup any existing listeners first
+  cleanupTauriListeners();
+
+  // Initialize notification rules
+  initializeNotificationRules();
+
+  const connectionUnlisten = await listen<string>("claude:connection", async (event) => {
     const status = event.payload as ConnectionStatus;
     claudeStore.setConnectionStatus(status);
 
+    // Handle notification for connection status
+    handleConnectionStatusChange(status);
+
     if (status === "connected") {
       claudeStore.addLine("system", "Connected to Claude Code");
       characterState.setState("idle");
+      if (!hasConnectedThisSession) {
+        hasConnectedThisSession = true;
+        await sendGreeting();
+      }
     } else if (status === "disconnected") {
+      hasConnectedThisSession = false;
       claudeStore.addLine("system", "Disconnected from Claude Code");
       characterState.setState("idle");
     } else if (status === "error") {
+      hasConnectedThisSession = false;
       claudeStore.addLine("error", "Connection error");
       characterState.setTemporaryState("error", 3000);
     }
   });
+  unlisteners.push(connectionUnlisten);
 
-  await listen<StateChangePayload>("claude:state", (event) => {
+  const stateUnlisten = await listen<StateChangePayload>("claude:state", (event) => {
     const { state } = event.payload;
 
     const stateMap: Record<string, CharacterState> = {
@@ -55,8 +125,9 @@ export async function initializeTauriListeners() {
       characterState.setState(mappedState);
     }
   });
+  unlisteners.push(stateUnlisten);
 
-  await listen<OutputPayload>("claude:output", (event) => {
+  const outputUnlisten = await listen<OutputPayload>("claude:output", (event) => {
     const { line_type, content, tool_name } = event.payload;
     claudeStore.addLine(
       line_type as "user" | "assistant" | "system" | "tool" | "error",
@@ -64,21 +135,25 @@ export async function initializeTauriListeners() {
       tool_name || undefined
     );
   });
+  unlisteners.push(outputUnlisten);
 
-  await listen<string>("claude:stream", (event) => {
+  const streamUnlisten = await listen<string>("claude:stream", () => {
     // no-op
   });
+  unlisteners.push(streamUnlisten);
 
-  await listen<string>("claude:session", (event) => {
+  const sessionUnlisten = await listen<string>("claude:session", (event) => {
     claudeStore.setSessionId(event.payload);
     claudeStore.addLine("system", `Session: ${event.payload.substring(0, 8)}...`);
   });
+  unlisteners.push(sessionUnlisten);
 
-  await listen<string>("claude:cwd", (event) => {
+  const cwdUnlisten = await listen<string>("claude:cwd", (event) => {
     claudeStore.setWorkingDirectory(event.payload);
   });
+  unlisteners.push(cwdUnlisten);
 
-  await listen<PermissionPromptEvent>("claude:permission", (event) => {
+  const permissionUnlisten = await listen<PermissionPromptEvent>("claude:permission", (event) => {
     const { id, tool_name, tool_input, description } = event.payload;
     claudeStore.requestPermission({
       id,
@@ -88,6 +163,18 @@ export async function initializeTauriListeners() {
     });
     claudeStore.addLine("system", `Permission requested for: ${tool_name}`);
   });
+  unlisteners.push(permissionUnlisten);
 
   console.log("Tauri event listeners initialized");
 }
+
+export function cleanupTauriListeners() {
+  // Cleanup all event listeners
+  unlisteners.forEach((unlisten) => unlisten());
+  unlisteners = [];
+
+  // Cleanup notification rules
+  cleanupNotificationRules();
+
+  console.log("Tauri event listeners cleaned up");
+}

src/lib/utils/stateMapper.test.ts

@@ -0,0 +1,240 @@
+import { describe, it, expect } from "vitest";
+import { mapMessageToState, extractTextFromMessage, extractToolInfo } from "./stateMapper";
+import type { ClaudeStreamMessage } from "$lib/types/messages";
+
+describe("stateMapper", () => {
+  describe("mapMessageToState", () => {
+    it("returns idle for system init message", () => {
+      const message: ClaudeStreamMessage = {
+        type: "system",
+        subtype: "init",
+        session_id: "test-session",
+        cwd: "/home/test",
+        tools: ["Read", "Write", "Edit"],
+      };
+      expect(mapMessageToState(message)).toBe("idle");
+    });
+
+    it("returns null for non-init system messages", () => {
+      const message: ClaudeStreamMessage = {
+        type: "system",
+        subtype: "compact_boundary",
+      };
+      expect(mapMessageToState(message)).toBeNull();
+    });
+
+    it("returns searching for Read tool", () => {
+      const message: ClaudeStreamMessage = {
+        type: "assistant",
+        message: {
+          content: [
+            {
+              type: "tool_use",
+              id: "tool-1",
+              name: "Read",
+              input: { file_path: "/test/file.txt" },
+            },
+          ],
+          model: "claude-3",
+          stop_reason: "tool_use",
+        },
+      };
+      expect(mapMessageToState(message)).toBe("searching");
+    });
+
+    it("returns coding for Edit tool", () => {
+      const message: ClaudeStreamMessage = {
+        type: "assistant",
+        message: {
+          content: [
+            {
+              type: "tool_use",
+              id: "tool-1",
+              name: "Edit",
+              input: { file_path: "/test/file.txt", old_string: "foo", new_string: "bar" },
+            },
+          ],
+          model: "claude-3",
+          stop_reason: "tool_use",
+        },
+      };
+      expect(mapMessageToState(message)).toBe("coding");
+    });
+
+    it("returns mcp for mcp__ prefixed tools", () => {
+      const message: ClaudeStreamMessage = {
+        type: "assistant",
+        message: {
+          content: [
+            {
+              type: "tool_use",
+              id: "tool-1",
+              name: "mcp__github__list_repos",
+              input: {},
+            },
+          ],
+          model: "claude-3",
+          stop_reason: "tool_use",
+        },
+      };
+      expect(mapMessageToState(message)).toBe("mcp");
+    });
+
+    it("returns thinking for Task tool", () => {
+      const message: ClaudeStreamMessage = {
+        type: "assistant",
+        message: {
+          content: [
+            {
+              type: "tool_use",
+              id: "tool-1",
+              name: "Task",
+              input: { prompt: "test task" },
+            },
+          ],
+          model: "claude-3",
+          stop_reason: "tool_use",
+        },
+      };
+      expect(mapMessageToState(message)).toBe("thinking");
+    });
+
+    it("returns typing for text content", () => {
+      const message: ClaudeStreamMessage = {
+        type: "assistant",
+        message: {
+          content: [{ type: "text", text: "Hello, Naomi!" }],
+          model: "claude-3",
+          stop_reason: "end_turn",
+        },
+      };
+      expect(mapMessageToState(message)).toBe("typing");
+    });
+
+    it("returns success for result success message", () => {
+      const message: ClaudeStreamMessage = {
+        type: "result",
+        subtype: "success",
+        result: "Task completed",
+      };
+      expect(mapMessageToState(message)).toBe("success");
+    });
+
+    it("returns error for result error message", () => {
+      const message: ClaudeStreamMessage = {
+        type: "result",
+        subtype: "error_max_turns",
+      };
+      expect(mapMessageToState(message)).toBe("error");
+    });
+
+    it("returns null for user messages", () => {
+      const message: ClaudeStreamMessage = {
+        type: "user",
+        message: { content: [{ type: "text", text: "Hello" }] },
+      };
+      expect(mapMessageToState(message)).toBeNull();
+    });
+  });
+
+  describe("extractTextFromMessage", () => {
+    it("extracts text from assistant message", () => {
+      const message: ClaudeStreamMessage = {
+        type: "assistant",
+        message: {
+          content: [
+            { type: "text", text: "Hello!" },
+            { type: "text", text: "How are you?" },
+          ],
+          model: "claude-3",
+          stop_reason: "end_turn",
+        },
+      };
+      expect(extractTextFromMessage(message)).toBe("Hello!\nHow are you?");
+    });
+
+    it("returns null for assistant message without text", () => {
+      const message: ClaudeStreamMessage = {
+        type: "assistant",
+        message: {
+          content: [
+            {
+              type: "tool_use",
+              id: "tool-1",
+              name: "Read",
+              input: { file_path: "/test/file.txt" },
+            },
+          ],
+          model: "claude-3",
+          stop_reason: "tool_use",
+        },
+      };
+      expect(extractTextFromMessage(message)).toBeNull();
+    });
+
+    it("extracts text from stream_event delta", () => {
+      const message: ClaudeStreamMessage = {
+        type: "stream_event",
+        event: {
+          type: "content_block_delta",
+          index: 0,
+          delta: { type: "text_delta", text: "streaming text" },
+        },
+      };
+      expect(extractTextFromMessage(message)).toBe("streaming text");
+    });
+
+    it("extracts result from result message", () => {
+      const message: ClaudeStreamMessage = {
+        type: "result",
+        subtype: "success",
+        result: "Completed successfully",
+      };
+      expect(extractTextFromMessage(message)).toBe("Completed successfully");
+    });
+  });
+
+  describe("extractToolInfo", () => {
+    it("extracts tool info from assistant message", () => {
+      const message: ClaudeStreamMessage = {
+        type: "assistant",
+        message: {
+          content: [
+            {
+              type: "tool_use",
+              id: "tool-1",
+              name: "Read",
+              input: { file_path: "/test/file.txt" },
+            },
+            {
+              type: "tool_use",
+              id: "tool-2",
+              name: "Edit",
+              input: { file_path: "/test/file.txt", old_string: "a", new_string: "b" },
+            },
+          ],
+          model: "claude-3",
+          stop_reason: "tool_use",
+        },
+      };
+      const tools = extractToolInfo(message);
+      expect(tools).toHaveLength(2);
+      expect(tools[0]).toEqual({
+        name: "Read",
+        input: { file_path: "/test/file.txt" },
+      });
+      expect(tools[1]).toEqual({
+        name: "Edit",
+        input: { file_path: "/test/file.txt", old_string: "a", new_string: "b" },
+      });
+    });
+
+    it("returns empty array for non-assistant messages", () => {
+      const message: ClaudeStreamMessage = {
+        type: "user",
+        message: { content: [{ type: "text", text: "Hello" }] },
+      };
+      expect(extractToolInfo(message)).toEqual([]);
+    });
+  });
+});

src/routes/+page.svelte

@@ -1,14 +1,34 @@
 <script lang="ts">
-  import { onMount } from "svelte";
+  import { onMount, onDestroy } from "svelte";
-  import { initializeTauriListeners } from "$lib/tauri";
+  import { initializeTauriListeners, cleanupTauriListeners } from "$lib/tauri";
+  import { configStore, applyTheme } from "$lib/stores/config";
+  import "$lib/notifications/testNotifications";
   import Terminal from "$lib/components/Terminal.svelte";
   import InputBar from "$lib/components/InputBar.svelte";
   import StatusBar from "$lib/components/StatusBar.svelte";
   import AnimeGirl from "$lib/components/AnimeGirl.svelte";
   import PermissionModal from "$lib/components/PermissionModal.svelte";
+  import ConfigSidebar from "$lib/components/ConfigSidebar.svelte";
+
+  let initialized = false;
 
   onMount(async () => {
-    await initializeTauriListeners();
+    if (!initialized) {
+      initialized = true;
+      await initializeTauriListeners();
+      await configStore.loadConfig();
+
+      // Apply saved theme on startup
+      const config = configStore.getConfig();
+      applyTheme(config.theme);
+    }
+  });
+
+  onDestroy(() => {
+    if (initialized) {
+      cleanupTauriListeners();
+      initialized = false;
+    }
   });
 </script>
 
@@ -17,7 +37,9 @@
 
   <main class="flex-1 flex overflow-hidden">
     <!-- Left panel: Character display -->
-    <div class="character-panel w-1/3 flex flex-col items-center justify-center border-r border-[var(--border-color)] bg-[var(--bg-secondary)]/50">
+    <div
+      class="character-panel w-1/3 flex flex-col items-center justify-center border-r border-[var(--border-color)] bg-[var(--bg-secondary)]/50"
+    >
       <AnimeGirl />
     </div>
 
@@ -29,19 +51,22 @@
   </main>
 
   <PermissionModal />
+  <ConfigSidebar />
 </div>
 
 <style>
   .app-container {
-    font-family: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
+    font-family:
+      "Inter",
+      -apple-system,
+      BlinkMacSystemFont,
+      "Segoe UI",
+      Roboto,
+      sans-serif;
   }
 
   .character-panel {
     min-width: 320px;
-    background: linear-gradient(
+    background: linear-gradient(180deg, var(--bg-secondary) 0%, var(--bg-primary) 100%);
-      180deg,
-      var(--bg-secondary) 0%,
-      var(--bg-primary) 100%
-    );
   }
 </style>