diff --git a/internal/gitengine/playground.go b/internal/gitengine/playground.go new file mode 100644 index 0000000..f075a07 --- /dev/null +++ b/internal/gitengine/playground.go @@ -0,0 +1,104 @@ +package gitengine + +import ( + "context" + "fmt" + "os" + "path/filepath" + "strings" + "time" +) + +// DefaultPlaygroundPath returns the standard path for the user playground repository (~/.gitarc/playground). +func DefaultPlaygroundPath() (string, error) { + home, err := os.UserHomeDir() + if err != nil { + return "", err + } + dir := filepath.Join(home, ".gitarc", "playground") + return dir, nil +} + +// EnsurePlaygroundRepo initializes or resets a real, lightweight Git repository +// with sample branches, commits, and a merge conflict scenario for demonstration. +func EnsurePlaygroundRepo(targetDir string, forceReset bool) (string, error) { + if strings.TrimSpace(targetDir) == "" { + p, err := DefaultPlaygroundPath() + if err != nil { + return "", err + } + targetDir = p + } + + absDir, err := filepath.Abs(targetDir) + if err != nil { + return "", err + } + + gitDir := filepath.Join(absDir, ".git") + exists := false + if fi, err := os.Stat(gitDir); err == nil && fi.IsDir() { + exists = true + } + + if exists && !forceReset { + return absDir, nil + } + + // Remove existing and rebuild + _ = os.RemoveAll(absDir) + if err := os.MkdirAll(absDir, 0755); err != nil { + return "", fmt.Errorf("playground dizini oluşturulamadı: %w", err) + } + + ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second) + defer cancel() + + // 1. git init -b main + if _, _, err := runCmd(ctx, absDir, "git", "init", "-b", "main"); err != nil { + if _, _, err := runCmd(ctx, absDir, "git", "init"); err != nil { + return "", fmt.Errorf("git init başarısız: %w", err) + } + _, _, _ = runCmd(ctx, absDir, "git", "checkout", "-b", "main") + } + + // 2. Local author config + _, _, _ = runCmd(ctx, absDir, "git", "config", "user.name", "GitArc Playground") + _, _, _ = runCmd(ctx, absDir, "git", "config", "user.email", "playground@gitarc.dev") + + // 3. Initial commit on main + _ = os.WriteFile(filepath.Join(absDir, "README.md"), []byte("# GitArc Playground\n\nBu depo, GitArc özelliklerini denemeniz için oluşturulmuş gerçek bir yerel Git kum havuzudur.\n"), 0644) + _ = os.WriteFile(filepath.Join(absDir, "app.go"), []byte("package main\n\nimport \"fmt\"\n\nfunc main() {\n\tfmt.Println(\"GitArc Playground\")\n}\n"), 0644) + _, _, _ = runCmd(ctx, absDir, "git", "add", "-A") + _, _, _ = runCmd(ctx, absDir, "git", "commit", "-m", "chore: initial playground commit") + + // 4. Second commit on main + _ = os.WriteFile(filepath.Join(absDir, "config.json"), []byte("{\n \"env\": \"playground\",\n \"version\": \"1.0.0\"\n}\n"), 0644) + _, _, _ = runCmd(ctx, absDir, "git", "add", "-A") + _, _, _ = runCmd(ctx, absDir, "git", "commit", "-m", "feat(config): add playground configuration") + + // 5. Branch 1: feat/auth-service + _, _, _ = runCmd(ctx, absDir, "git", "checkout", "-b", "feat/auth-service") + _ = os.WriteFile(filepath.Join(absDir, "auth.go"), []byte("package main\n\n// AuthService handles login tokens\ntype AuthService struct{}\n"), 0644) + _, _, _ = runCmd(ctx, absDir, "git", "add", "-A") + _, _, _ = runCmd(ctx, absDir, "git", "commit", "-m", "feat(auth): implement token authentication service") + + // 6. Branch 2: feat/payment-gateway + _, _, _ = runCmd(ctx, absDir, "git", "checkout", "main") + _, _, _ = runCmd(ctx, absDir, "git", "checkout", "-b", "feat/payment-gateway") + _ = os.WriteFile(filepath.Join(absDir, "payment.go"), []byte("package main\n\n// PaymentGateway processes card payments\ntype PaymentGateway struct{}\n"), 0644) + _, _, _ = runCmd(ctx, absDir, "git", "add", "-A") + _, _, _ = runCmd(ctx, absDir, "git", "commit", "-m", "feat(payment): add stripe provider interface") + + // 7. Branch 3: fix/config-staging + _, _, _ = runCmd(ctx, absDir, "git", "checkout", "main") + _, _, _ = runCmd(ctx, absDir, "git", "checkout", "-b", "fix/config-staging") + _ = os.WriteFile(filepath.Join(absDir, "config.json"), []byte("{\n \"env\": \"staging\",\n \"version\": \"1.0.1-rc1\"\n}\n"), 0644) + _, _, _ = runCmd(ctx, absDir, "git", "add", "-A") + _, _, _ = runCmd(ctx, absDir, "git", "commit", "-m", "fix(config): update staging environment target") + + // Return to main as default HEAD + _, _, _ = runCmd(ctx, absDir, "git", "checkout", "main") + + return absDir, nil +} diff --git a/internal/gitengine/playground_test.go b/internal/gitengine/playground_test.go new file mode 100644 index 0000000..3b74fe1 --- /dev/null +++ b/internal/gitengine/playground_test.go @@ -0,0 +1,40 @@ +package gitengine + +import ( + "os" + "path/filepath" + "testing" +) + +func TestEnsurePlaygroundRepo(t *testing.T) { + tempDir, err := os.MkdirTemp("", "gitarc-playground-test-*") + if err != nil { + t.Fatalf("temp dir error: %v", err) + } + defer os.RemoveAll(tempDir) + + target := filepath.Join(tempDir, "playground") + p, err := EnsurePlaygroundRepo(target, false) + if err != nil { + t.Fatalf("EnsurePlaygroundRepo error: %v", err) + } + + gitDir := filepath.Join(p, ".git") + if fi, err := os.Stat(gitDir); err != nil || !fi.IsDir() { + t.Fatalf("expected .git directory to exist at %s", gitDir) + } + + readmeFile := filepath.Join(p, "README.md") + if fi, err := os.Stat(readmeFile); err != nil || fi.Size() == 0 { + t.Fatalf("expected README.md to exist and be non-empty") + } + + // Test force reset + p2, err := EnsurePlaygroundRepo(target, true) + if err != nil { + t.Fatalf("force reset error: %v", err) + } + if p2 != p { + t.Fatalf("expected path %s, got %s", p, p2) + } +} diff --git a/main.go b/main.go index 875769b..91ec26a 100644 --- a/main.go +++ b/main.go @@ -646,13 +646,22 @@ func openBrowser(url string) { func main() { addr := flag.String("addr", "127.0.0.1:7432", "dinlenecek yerel adres (örn. 127.0.0.1:7432 veya 127.0.0.1:0)") - repoPath := flag.String("repo", ".", "doğrudan açılacak yerel git deposu yolu ('sim' = demo simülasyon)") + repoPath := flag.String("repo", ".", "doğrudan açılacak yerel git deposu yolu") + demoMode := flag.Bool("demo", false, "örnek GitArc playground deposuyla başlat") openUI := flag.Bool("open", true, "başlatınca varsayılan tarayıcıda aç") mcpMode := flag.Bool("mcp", false, "stdio üzerinden MCP JSON-RPC 2.0 sunucusu olarak çalıştır") teamMode := flag.Bool("team", false, "paylaşılan ekip sunucusu modu (sunucudaki HEAD dalı korur)") flag.Parse() targetRepo := *repoPath + if *demoMode || *repoPath == "demo" || *repoPath == "playground" { + playgroundPath, err := gitengine.EnsurePlaygroundRepo("", false) + if err != nil { + log.Fatalf("playground hazırlanamadı: %v", err) + } + targetRepo = playgroundPath + } + mgr := gitengine.NewManager(targetRepo) if *teamMode { mgr.SetTeamMode(true) diff --git a/web/app.js b/web/app.js index bef9ea6..be22e2b 100644 --- a/web/app.js +++ b/web/app.js @@ -352,21 +352,6 @@ async function bootstrap() { document.getElementById('btn-canvas-sync')?.addEventListener('click', (ev) => handleSyncSpine(ev.currentTarget)); document.getElementById('btn-sync-spine')?.addEventListener('click', (ev) => handleSyncSpine(ev.currentTarget)); - document.getElementById('btn-reset-sim')?.addEventListener('click', async () => { - if (!window.confirm('Simülasyon deposunu başlangıç durumuna sıfırlamak istiyor musunuz?')) return; - try { - const snap = state.offlineMode - ? (window.LocalFallbackEngine ? window.LocalFallbackEngine.reset() : state.snapshot) - : await apiCall('/api/simulation/reset', 'POST', {}); - state.selectedBranchId = null; - state.selectedNodeSha = null; - applySnapshot(snap); - showToast('Simülasyon başlangıç durumuna sıfırlandı', 'info'); - } catch (err) { - showToast(err.message, 'danger'); - } - }); - document.getElementById('btn-prune-gone')?.addEventListener('click', handlePruneGone); // New Branch Modal diff --git a/web/index.html b/web/index.html index c0a2239..759170d 100644 --- a/web/index.html +++ b/web/index.html @@ -49,7 +49,6 @@ - diff --git a/web/modules/canvas.js b/web/modules/canvas.js index ab133ba..07ec320 100644 --- a/web/modules/canvas.js +++ b/web/modules/canvas.js @@ -194,8 +194,6 @@ export function renderTopbar(callbacks = {}) { if (btnPrune) btnPrune.disabled = cleanableCount === 0 && snap.repo.mode !== 'live'; const btnSync = document.getElementById('btn-sync-spine'); if (btnSync) btnSync.disabled = snap.repo.mode !== 'live' && snap.repo.ahead === 0 && snap.repo.behind === 0; - const btnReset = document.getElementById('btn-reset-sim'); - if (btnReset) btnReset.hidden = snap.repo.mode === 'live'; const isProtected = Boolean(snap.repo.branchProtected); if (el.btnProtectBranch) {