fix(git): gitworktree is not creating

Author: mohithxkarthikeya

kernel/src/db/branches.rs

@@ -0,0 +1,203 @@
+// src/db/branches.rs
+//
+// Persistent record of every agent branch created by Stackbox.
+//
+// KEY DESIGN:
+//   - One row per agent session (runbox_id + session_id + agent_kind).
+//   - branch (stackbox/{short}/{slug}) is permanent — survives worktree removal.
+//   - worktree_path is nullable — set on spawn, cleared when PTY exits.
+//   - status: working → done → merged | deleted
+//
+// Schema DDL lives in db/schema.rs::migrate().
+
+use rusqlite::{params, Result};
+use super::{Db, now_ms};
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Types
+// ─────────────────────────────────────────────────────────────────────────────
+
+#[derive(Debug, Clone, serde::Serialize)]
+pub struct AgentBranch {
+    pub id:            String,
+    pub runbox_id:     String,
+    pub session_id:    String,
+    pub agent_kind:    String,
+    /// e.g. "stackbox/a1b2c3d4/codex"
+    pub branch:        String,
+    /// None once PTY exits; branch still lives.
+    pub worktree_path: Option<String>,
+    /// working | done | merged | deleted
+    pub status:        String,
+    pub commit_count:  i64,
+    pub created_at:    i64,
+    pub updated_at:    i64,
+    /// None until user merges.
+    pub merged_at:     Option<i64>,
+}
+
+fn row_to_branch(row: &rusqlite::Row<'_>) -> rusqlite::Result<AgentBranch> {
+    Ok(AgentBranch {
+        id:            row.get(0)?,
+        runbox_id:     row.get(1)?,
+        session_id:    row.get(2)?,
+        agent_kind:    row.get(3)?,
+        branch:        row.get(4)?,
+        worktree_path: row.get(5)?,
+        status:        row.get(6)?,
+        commit_count:  row.get(7)?,
+        created_at:    row.get(8)?,
+        updated_at:    row.get(9)?,
+        merged_at:     row.get(10)?,
+    })
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Write — lifecycle events
+// ─────────────────────────────────────────────────────────────────────────────
+
+/// Called at PTY spawn: create the branch record with worktree_path set.
+pub fn record_branch_start(
+    db:            &Db,
+    runbox_id:     &str,
+    session_id:    &str,
+    agent_kind:    &str,
+    branch:        &str,
+    worktree_path: &str,
+) -> Result<()> {
+    let id   = format!("{runbox_id}-{session_id}");
+    let rb   = runbox_id.to_string();
+    let sid  = session_id.to_string();
+    let ak   = agent_kind.to_string();
+    let br   = branch.to_string();
+    let wt   = worktree_path.to_string();
+    let ts   = now_ms();
+
+    db.write_async(move |conn| {
+        let _ = conn.execute(
+            "INSERT INTO agent_branches
+                (id, runbox_id, session_id, agent_kind, branch, worktree_path,
+                 status, commit_count, created_at, updated_at)
+             VALUES (?1, ?2, ?3, ?4, ?5, ?6, 'working', 0, ?7, ?7)
+             ON CONFLICT(id) DO UPDATE SET
+                worktree_path = excluded.worktree_path,
+                status        = 'working',
+                updated_at    = excluded.updated_at",
+            params![id, rb, sid, ak, br, wt, ts],
+        );
+    });
+    Ok(())
+}
+
+/// Called when PTY exits naturally or is killed.
+/// Clears worktree_path (directory removed) but keeps the branch.
+pub fn record_branch_done(db: &Db, runbox_id: &str, session_id: &str) -> Result<()> {
+    let id = format!("{runbox_id}-{session_id}");
+    let ts = now_ms();
+    db.write_async(move |conn| {
+        let _ = conn.execute(
+            "UPDATE agent_branches SET
+                worktree_path = NULL,
+                status        = CASE WHEN status = 'working' THEN 'done' ELSE status END,
+                updated_at    = ?1
+             WHERE id = ?2",
+            params![ts, id],
+        );
+    });
+    Ok(())
+}
+
+/// Called after user merges the branch into main.
+pub fn record_branch_merged(db: &Db, branch: &str) -> Result<()> {
+    let br = branch.to_string();
+    let ts = now_ms();
+    db.write_async(move |conn| {
+        let _ = conn.execute(
+            "UPDATE agent_branches SET status='merged', merged_at=?1, updated_at=?1
+             WHERE branch=?2",
+            params![ts, br],
+        );
+    });
+    Ok(())
+}
+
+/// Called after user explicitly deletes a branch.
+pub fn record_branch_deleted(db: &Db, branch: &str) -> Result<()> {
+    let br = branch.to_string();
+    let ts = now_ms();
+    db.write_async(move |conn| {
+        let _ = conn.execute(
+            "UPDATE agent_branches SET status='deleted', updated_at=?1 WHERE branch=?2",
+            params![ts, br],
+        );
+    });
+    Ok(())
+}
+
+/// Increment the commit count for a branch (called after git_commit).
+pub fn increment_commit_count(db: &Db, branch: &str) -> Result<()> {
+    let br = branch.to_string();
+    let ts = now_ms();
+    db.write_async(move |conn| {
+        let _ = conn.execute(
+            "UPDATE agent_branches SET commit_count=commit_count+1, updated_at=?1 WHERE branch=?2",
+            params![ts, br],
+        );
+    });
+    Ok(())
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Read
+// ─────────────────────────────────────────────────────────────────────────────
+
+/// All branch records for a runbox, newest first.
+pub fn list_for_runbox(db: &Db, runbox_id: &str) -> Result<Vec<AgentBranch>> {
+    let conn = db.read();
+    let mut stmt = conn.prepare(
+        "SELECT id, runbox_id, session_id, agent_kind, branch, worktree_path,
+                status, commit_count, created_at, updated_at, merged_at
+         FROM agent_branches WHERE runbox_id=?1
+         ORDER BY created_at DESC",
+    )?;
+    let rows = stmt.query_map(params![runbox_id], row_to_branch)?;
+    Ok(rows.filter_map(|r| r.ok()).collect())
+}
+
+/// All branches with an active worktree (worktree_path IS NOT NULL).
+/// Used by cleanup to detect orphans.
+pub fn list_active_worktrees(db: &Db) -> Vec<String> {
+    let conn = db.read();
+    let mut stmt = match conn.prepare(
+        "SELECT worktree_path FROM agent_branches WHERE worktree_path IS NOT NULL",
+    ) {
+        Ok(s)  => s,
+        Err(_) => return vec![],
+    };
+    stmt.query_map([], |row| row.get::<_, String>(0))
+        .ok()
+        .map(|rows| rows.filter_map(|r| r.ok()).collect())
+        .unwrap_or_default()
+}
+
+/// Get a single branch record by branch name.
+pub fn get_by_branch(db: &Db, branch: &str) -> Option<AgentBranch> {
+    db.read()
+        .query_row(
+            "SELECT id, runbox_id, session_id, agent_kind, branch, worktree_path,
+                    status, commit_count, created_at, updated_at, merged_at
+             FROM agent_branches WHERE branch=?1 ORDER BY created_at DESC LIMIT 1",
+            params![branch],
+            row_to_branch,
+        )
+        .ok()
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Legacy compatibility — keep runbox_set_worktree working for callers not yet migrated
+// ─────────────────────────────────────────────────────────────────────────────
+
+pub use super::runboxes::{
+    runbox_set_branch,
+    runbox_delete,
+};

kernel/src/db/schema.rs

@@ -4,9 +4,7 @@
 // Migrations are additive — never drop columns on existing installs.
 //
 // MIGRATION ORDER RULE: always run ALTER TABLE column additions BEFORE any
-// CREATE INDEX that references those columns. SQLite's CREATE TABLE IF NOT
-// EXISTS is a no-op on existing databases, so the index would reference a
-// non-existent column and panic at startup.
+// CREATE INDEX that references those columns.
 
 use rusqlite::{Connection, Result};
 
@@ -48,14 +46,9 @@ pub fn migrate(conn: &Connection) -> Result<()> {
     // Additive migrations — safe on existing databases
     conn.execute("ALTER TABLE runboxes ADD COLUMN worktree_path TEXT", []).ok();
 
-    // ── Per-agent worktree table (V2 schema) ─────────────────────────────────
-    //
-    // PRIMARY KEY = runbox_id (one row per runbox, not per agent-kind).
-    // Tracks worktree path, branch, PR url, and lifecycle status.
-    //
-    // CRITICAL: all ALTER TABLE column additions for this table MUST come
-    // before the CREATE INDEX on pr_url. On existing installs the CREATE TABLE
-    // is a no-op, so the index would reference a missing column and crash.
+    // ── Legacy agent_worktrees table — kept for backwards compat reads ─────────
+    // New writes go to agent_branches. This table is not dropped to avoid
+    // breaking existing installs that might still have data in it.
     conn.execute_batch("
         CREATE TABLE IF NOT EXISTS agent_worktrees (
             runbox_id      TEXT PRIMARY KEY,
@@ -69,20 +62,79 @@ pub fn migrate(conn: &Connection) -> Result<()> {
         );
     ")?;
 
-    // Additive column migrations — run BEFORE any index that touches these columns.
-    // Each uses .ok() so they silently no-op on new installs (column already exists).
     conn.execute("ALTER TABLE agent_worktrees ADD COLUMN agent_kind TEXT NOT NULL DEFAULT ''", []).ok();
     conn.execute("ALTER TABLE agent_worktrees ADD COLUMN branch TEXT", []).ok();
     conn.execute("ALTER TABLE agent_worktrees ADD COLUMN pr_url TEXT", []).ok();
     conn.execute("ALTER TABLE agent_worktrees ADD COLUMN status TEXT NOT NULL DEFAULT 'working'", []).ok();
     conn.execute("ALTER TABLE agent_worktrees ADD COLUMN created_at INTEGER NOT NULL DEFAULT 0", []).ok();
     conn.execute("ALTER TABLE agent_worktrees ADD COLUMN updated_at INTEGER NOT NULL DEFAULT 0", []).ok();
 
-    // NOW safe to create the index — pr_url is guaranteed to exist.
     conn.execute_batch("
         CREATE INDEX IF NOT EXISTS idx_awt_pr_url ON agent_worktrees(pr_url);
     ")?;
 
+    // ── Agent branches — the new persistent branch tracking table ─────────────
+    //
+    // Separates worktree lifetime (temporary) from branch lifetime (permanent).
+    //
+    // id = "{runbox_id}-{session_id}" — unique per session, not per runbox.
+    // branch = "stackbox/{runbox_short}/{slug}" — survives worktree removal.
+    // worktree_path = NULL once PTY exits.
+    // status: working → done → merged | deleted
+    conn.execute_batch("
+        CREATE TABLE IF NOT EXISTS agent_branches (
+            id            TEXT PRIMARY KEY,
+            runbox_id     TEXT NOT NULL,
+            session_id    TEXT NOT NULL,
+            agent_kind    TEXT NOT NULL DEFAULT '',
+            branch        TEXT NOT NULL,
+            worktree_path TEXT,
+            status        TEXT NOT NULL DEFAULT 'working',
+            commit_count  INTEGER NOT NULL DEFAULT 0,
+            created_at    INTEGER NOT NULL DEFAULT 0,
+            updated_at    INTEGER NOT NULL DEFAULT 0,
+            merged_at     INTEGER
+        );
+    ")?;
+
+    // Additive column migrations for agent_branches (safe on existing installs)
+    conn.execute("ALTER TABLE agent_branches ADD COLUMN session_id TEXT NOT NULL DEFAULT ''", []).ok();
+    conn.execute("ALTER TABLE agent_branches ADD COLUMN agent_kind TEXT NOT NULL DEFAULT ''", []).ok();
+    conn.execute("ALTER TABLE agent_branches ADD COLUMN branch TEXT NOT NULL DEFAULT ''", []).ok();
+    conn.execute("ALTER TABLE agent_branches ADD COLUMN worktree_path TEXT", []).ok();
+    conn.execute("ALTER TABLE agent_branches ADD COLUMN status TEXT NOT NULL DEFAULT 'working'", []).ok();
+    conn.execute("ALTER TABLE agent_branches ADD COLUMN commit_count INTEGER NOT NULL DEFAULT 0", []).ok();
+    conn.execute("ALTER TABLE agent_branches ADD COLUMN created_at INTEGER NOT NULL DEFAULT 0", []).ok();
+    conn.execute("ALTER TABLE agent_branches ADD COLUMN updated_at INTEGER NOT NULL DEFAULT 0", []).ok();
+    conn.execute("ALTER TABLE agent_branches ADD COLUMN merged_at INTEGER", []).ok();
+
+    conn.execute_batch("
+        CREATE INDEX IF NOT EXISTS idx_ab_runbox  ON agent_branches(runbox_id);
+        CREATE INDEX IF NOT EXISTS idx_ab_session ON agent_branches(session_id);
+        CREATE INDEX IF NOT EXISTS idx_ab_status  ON agent_branches(status);
+        CREATE INDEX IF NOT EXISTS idx_ab_branch  ON agent_branches(branch);
+    ")?;
+
+    // Migrate existing agent_worktrees data into agent_branches (one-time, idempotent)
+    conn.execute(
+        "INSERT OR IGNORE INTO agent_branches
+            (id, runbox_id, session_id, agent_kind, branch, worktree_path,
+             status, created_at, updated_at)
+         SELECT
+            runbox_id,
+            runbox_id,
+            runbox_id,
+            agent_kind,
+            COALESCE(branch, 'stackbox/migrated'),
+            NULL,
+            CASE status WHEN 'merged' THEN 'merged' ELSE 'done' END,
+            created_at,
+            updated_at
+         FROM agent_worktrees
+         WHERE branch IS NOT NULL",
+        [],
+    ).ok();
+
     // ── Workspace events — the core append-only event log ─────────────────────
     conn.execute_batch("
         CREATE TABLE IF NOT EXISTS workspace_events (