@shmulikdav/solix 1.0.4 → 1.1.1

package/dist/index.js

@@ -926,6 +926,7 @@ function getDb() {
   db.exec(SCHEMA);
   ensureColumn(db, "sessions", "kind", "kind TEXT NOT NULL DEFAULT 'user'");
   ensureColumn(db, "sessions", "advisor_role", "advisor_role TEXT");
+  ensureColumn(db, "sessions", "worktree_path", "worktree_path TEXT");
   ensureColumn(db, "advisors", "texture_pack", "texture_pack TEXT");
   ensureColumn(db, "missions", "error_summary", "error_summary TEXT");
   _db = db;
@@ -1011,7 +1012,8 @@ function rowToSession(row) {
     currentMissionId: row.current_mission_id ?? void 0,
     lastCompletedMissionId: row.last_completed_mission_id ?? void 0,
     orbitSlot: row.orbit_slot,
-    name: row.name ?? void 0
+    name: row.name ?? void 0,
+    worktreePath: row.worktree_path ?? void 0
   };
 }
 function nextOrbitSlot(db, projectId) {
@@ -1046,9 +1048,9 @@ function upsertSession(db, input) {
     `INSERT INTO sessions (
        id, pid, project_id, parent_session_id, origin, model, status,
        context_usage_pct, orbit_slot, cwd, name, kind, advisor_role,
-       created_at, updated_at
+       worktree_path, created_at, updated_at
      )
-     VALUES (?, ?, ?, ?, ?, ?, ?, 0, ?, ?, NULL, ?, ?, ?, ?)`
+     VALUES (?, ?, ?, ?, ?, ?, ?, 0, ?, ?, NULL, ?, ?, ?, ?, ?)`
   ).run(
     input.id,
     input.pid,
@@ -1061,6 +1063,7 @@ function upsertSession(db, input) {
     input.cwd,
     kind,
     input.advisorRole ?? null,
+    input.worktreePath ?? null,
     ts2,
     ts2
   );
@@ -1078,7 +1081,8 @@ function upsertSession(db, input) {
     advisorRole: input.advisorRole,
     parentSessionId: input.parentSessionId,
     contextUsagePct: 0,
-    orbitSlot
+    orbitSlot,
+    worktreePath: input.worktreePath
   };
 }
 function setSessionStatus(db, sessionId, status) {
@@ -2409,9 +2413,51 @@ function mimeFor(filePath) {
 }
 
 // ../server/src/launcher.ts
-import { spawn } from "child_process";
-import { existsSync as existsSync7 } from "fs";
+import { spawn, spawnSync as spawnSync2 } from "child_process";
+import { existsSync as existsSync7, mkdirSync as mkdirSync3 } from "fs";
+import { homedir as homedir5 } from "os";
+import { basename as basename2, join as join9 } from "path";
 import { nanoid as nanoid4 } from "nanoid";
+function ensureWorktree(opts) {
+  const repoRoot = (() => {
+    const r = spawnSync2("git", ["rev-parse", "--show-toplevel"], {
+      cwd: opts.repoCwd,
+      encoding: "utf8"
+    });
+    if (r.status !== 0) {
+      throw new Error(`not a git repository: ${opts.repoCwd}`);
+    }
+    return (r.stdout ?? "").trim();
+  })();
+  const repoName = basename2(repoRoot);
+  const safeBranch = opts.branch.replace(/[^a-zA-Z0-9._-]+/g, "-");
+  const worktreesDir = join9(homedir5(), ".solix", "worktrees");
+  const path = join9(worktreesDir, `${repoName}-${safeBranch}`);
+  const list = spawnSync2("git", ["worktree", "list", "--porcelain"], {
+    cwd: repoRoot,
+    encoding: "utf8"
+  });
+  if (list.status === 0 && (list.stdout ?? "").includes(`worktree ${path}`)) {
+    return { path, created: false };
+  }
+  mkdirSync3(worktreesDir, { recursive: true });
+  const branchProbe = spawnSync2(
+    "git",
+    ["rev-parse", "--verify", "--quiet", `refs/heads/${opts.branch}`],
+    { cwd: repoRoot, encoding: "utf8" }
+  );
+  const args = branchProbe.status === 0 ? ["worktree", "add", path, opts.branch] : ["worktree", "add", path, "-b", opts.branch, opts.baseRef ?? "HEAD"];
+  const add = spawnSync2("git", args, {
+    cwd: repoRoot,
+    encoding: "utf8"
+  });
+  if (add.status !== 0) {
+    throw new Error(
+      `git worktree add failed: ${(add.stderr ?? "").slice(0, 280)}`
+    );
+  }
+  return { path, created: true };
+}
 var FAKE_CLAUDE = process.env.SOLIX_FAKE_CLAUDE === "1";
 var Launcher = class {
   constructor(db, broadcaster) {
@@ -2565,14 +2611,44 @@ var Launcher = class {
    */
   launch(opts) {
     if (!opts.initialPrompt.trim()) return { ok: false };
+    let spawnCwd = opts.cwd;
+    let worktreePath;
+    if (opts.worktreeBranch?.trim()) {
+      try {
+        const wt = ensureWorktree({
+          repoCwd: opts.cwd,
+          branch: opts.worktreeBranch.trim(),
+          baseRef: opts.worktreeBaseRef?.trim() || void 0
+        });
+        spawnCwd = wt.path;
+        worktreePath = wt.path;
+        this.broadcaster.broadcast({
+          type: "toast",
+          level: "info",
+          message: wt.created ? `Worktree created at ${wt.path}` : `Reusing worktree ${wt.path}`
+        });
+      } catch (err) {
+        this.broadcaster.broadcast({
+          type: "toast",
+          level: "error",
+          message: `Worktree setup failed: ${err.message}`
+        });
+        return { ok: false };
+      }
+    }
     if (FAKE_CLAUDE) {
-      return this.launchSynthetic(opts);
+      return this.launchSynthetic({
+        cwd: spawnCwd,
+        model: opts.model,
+        initialPrompt: opts.initialPrompt,
+        worktreePath
+      });
     }
-    if (!existsSync7(opts.cwd)) {
+    if (!existsSync7(spawnCwd)) {
       this.broadcaster.broadcast({
         type: "toast",
         level: "error",
-        message: `Launch failed: cwd does not exist (${opts.cwd})`
+        message: `Launch failed: cwd does not exist (${spawnCwd})`
       });
       return { ok: false };
     }
@@ -2582,9 +2658,10 @@ var Launcher = class {
     const sessionId = `task-${nanoid4(8)}`;
     return this.spawnPrint({
       sessionId,
-      cwd: opts.cwd,
+      cwd: spawnCwd,
       args,
-      isFollowUp: false
+      isFollowUp: false,
+      worktreePath
     });
   }
   sendPromptToInternal(sessionId, text) {
@@ -2630,6 +2707,15 @@ var Launcher = class {
       isFollowUp: true
     }).ok;
   }
+  /** Returns the worktree path the launcher resolved for an internal task,
+   * if any. Used by router.onSessionStart to persist worktree_path on the
+   * session row when claude reports its session_start hook. */
+  worktreePathForInternalCwd(cwd) {
+    for (const rec of this.internalTasks.values()) {
+      if (rec.cwd === cwd && rec.worktreePath) return rec.worktreePath;
+    }
+    return void 0;
+  }
   spawnPrint(opts) {
     let child;
     try {
@@ -2649,7 +2735,10 @@ var Launcher = class {
     }
     const pid = child.pid ?? 0;
     if (!opts.isFollowUp) {
-      this.internalTasks.set(opts.sessionId, { cwd: opts.cwd });
+      this.internalTasks.set(opts.sessionId, {
+        cwd: opts.cwd,
+        worktreePath: opts.worktreePath
+      });
     }
     let stdout = "";
     let stderr = "";
@@ -2702,7 +2791,8 @@ var Launcher = class {
       projectId: project.id,
       cwd: opts.cwd,
       origin: "internal",
-      model: opts.model ?? "sonnet"
+      model: opts.model ?? "sonnet",
+      worktreePath: opts.worktreePath
     });
     const active = setSessionStatus(this.db, sessionId, "active");
     if (active)
@@ -2845,6 +2935,7 @@ var EventRouter = class {
     const project = ensureProject(this.db, event.cwd);
     const sessionId = this.extractSessionId(event);
     const advisorRole = this.launcher?.advisorRoleForPid(event.pid);
+    const worktreePath = this.launcher?.worktreePathForInternalCwd(event.cwd);
     const session = upsertSession(this.db, {
       id: sessionId,
       pid: event.pid,
@@ -2854,7 +2945,8 @@ var EventRouter = class {
       model: this.extractModel(event),
       parentSessionId: this.extractParentSessionId(event),
       kind: advisorRole ? "advisor" : "user",
-      advisorRole
+      advisorRole,
+      worktreePath
     });
     this.broadcaster.broadcast({ type: "session_upsert", session });
     if (!session.parentSessionId) {
@@ -3132,7 +3224,9 @@ var EventRouter = class {
     return this.launcher.launch({
       cwd: opts.cwd,
       model: opts.model,
-      initialPrompt: opts.initialPrompt
+      initialPrompt: opts.initialPrompt,
+      worktreeBranch: opts.worktreeBranch,
+      worktreeBaseRef: opts.worktreeBaseRef
     });
   }
   sendPromptToSession(sessionId, text) {
@@ -3244,7 +3338,9 @@ function handleClientMessage(ctx, _ws, msg) {
       ctx.router.launchInternalSession({
         cwd: msg.cwd,
         model: msg.model,
-        initialPrompt: msg.initialPrompt
+        initialPrompt: msg.initialPrompt,
+        worktreeBranch: msg.worktreeBranch,
+        worktreeBaseRef: msg.worktreeBaseRef
       });
       break;
     case "invoke_advisor":
@@ -3274,9 +3370,9 @@ import {
   statSync as statSync5,
   watch
 } from "fs";
-import { homedir as homedir5 } from "os";
-import { join as join9 } from "path";
-var TRANSCRIPT_BASE = join9(homedir5(), ".claude", "projects");
+import { homedir as homedir6 } from "os";
+import { join as join10 } from "path";
+var TRANSCRIPT_BASE = join10(homedir6(), ".claude", "projects");
 var CONTEXT_BUDGETS_BY_MODEL = {
   "claude-opus-4-7": 2e5,
   "claude-opus-4-6": 2e5,
@@ -3289,7 +3385,7 @@ function encodeProjectPath(cwd) {
   return cwd.replace(/[/\\]/g, "-");
 }
 function transcriptPathFor(cwd, sessionId) {
-  return join9(TRANSCRIPT_BASE, encodeProjectPath(cwd), `${sessionId}.jsonl`);
+  return join10(TRANSCRIPT_BASE, encodeProjectPath(cwd), `${sessionId}.jsonl`);
 }
 var TranscriptWatcherManager = class {
   constructor(db, broadcaster) {