5775cb0c96
The previous conflict detection only worked for merge-based pulls (--no-rebase) but failed to detect pre-existing conflicts from interrupted rebases or prior sessions. This fixes three root causes: 1. Rust: add is_rebase_in_progress/is_merge_in_progress/get_conflict_mode helpers, and dispatch git_commit_conflict_resolution between `git commit` (merge) and `git rebase --continue` (rebase) 2. Frontend: add startup conflict check via get_conflict_files before pulling, so pre-existing conflicts are detected on app launch 3. App.tsx: handleOpenConflictResolver now fetches conflicts directly when the cached list is empty, preventing the silent early-return Also exposes get_conflict_files and get_conflict_mode as Tauri commands so the frontend can independently check conflict state. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Laputa App
Personal knowledge and life management desktop app built with Tauri v2 + React + TypeScript + BlockNote.
Documentation
- 📐 ARCHITECTURE.md — System design, tech stack, data flow
- 🧩 ABSTRACTIONS.md — Core abstractions and models
- 🚀 GETTING-STARTED.md — How to navigate the codebase
- 🎨 THEMING.md — Theme system and customization
Quick Start
Prerequisites
- Node.js 20+
- pnpm 8+
- Rust (latest stable)
- macOS (for development)
Setup
# Install dependencies
pnpm install
# Install git hooks (optional but recommended)
.github/hooks/install-hooks.sh
# Run dev server
pnpm dev
# Open in browser (mock mode)
open http://localhost:5173
# Or run in Tauri
pnpm tauri dev
Testing
# Frontend tests
pnpm test
# Backend tests
cargo test
# Coverage
pnpm test:coverage
# E2E tests
pnpm test:e2e
Code Quality
# Lint
pnpm lint
# Rust checks
cargo clippy
cargo fmt --check
# CodeScene (via Claude Code)
claude 'Check code health with CodeScene MCP'
Development Workflow
See CLAUDE.md for coding guidelines and workflow.
Key principles:
- Small, atomic commits
- Test as you go
- Visual verification mandatory
- Documentation updated with code changes
CI/CD
GitHub Actions runs on every push/PR:
- ✅ Tests (frontend + Rust)
- 📊 Coverage (70% threshold)
- 🎨 Lint & format
- ⚠️ Documentation check
See .github/SETUP.md for CI/CD configuration.
Git Hooks
Pre-commit hook checks code health before every commit. See .github/HOOKS.md for details.
License
Private repository — not licensed for public use.