@enruana/claude-orka 0.7.2 → 0.7.4

package/dist/cli.js

@@ -3,12 +3,13 @@
 // src/cli/index.ts
 import { Command } from "commander";
 import { readFileSync } from "fs";
-import { fileURLToPath as fileURLToPath3 } from "url";
+import { fileURLToPath as fileURLToPath4 } from "url";
 import { dirname as dirname3, join as join2 } from "path";
 
 // src/core/StateManager.ts
 import path4 from "path";
 import fs4 from "fs-extra";
+import { fileURLToPath as fileURLToPath2 } from "url";
 
 // src/utils/tmux.ts
 import execa from "execa";
@@ -101,7 +102,7 @@ var TmuxCommands = class {
       logger.debug(`Creating tmux session: ${name} at ${projectPath}`);
       await execa("tmux", ["new-session", "-d", "-s", name, "-c", projectPath]);
       logger.info(`Tmux session created: ${name}`);
-      await this.applyOrkaTheme(name);
+      await this.applyOrkaTheme(name, projectPath);
     } catch (error) {
       throw new TmuxError(
         `Failed to create tmux session: ${name}`,
@@ -113,16 +114,23 @@ var TmuxCommands = class {
   /**
    * Apply Claude-Orka custom tmux theme to a session
    */
-  static async applyOrkaTheme(sessionName) {
+  static async applyOrkaTheme(sessionName, projectPath) {
     try {
       const possiblePaths = [
-        // When installed globally via npm
+        // PRIORITY 1: Project-local theme (copied during orka init)
+        ...projectPath ? [path2.join(projectPath, ".claude-orka", ".tmux.orka.conf")] : [],
+        // PRIORITY 2: Current working directory project
+        path2.join(process.cwd(), ".claude-orka", ".tmux.orka.conf"),
+        // FALLBACK: Package installation paths
+        // When installed globally via npm (dist/ -> package root)
+        path2.join(__dirname, "../.tmux.orka.conf"),
+        // When running from source (src/utils/ -> package root)
         path2.join(__dirname, "../../.tmux.orka.conf"),
-        // When running from source
-        path2.join(process.cwd(), ".tmux.orka.conf"),
-        // Fallback: check in the module directory
-        path2.join(__dirname, "../../../.tmux.orka.conf")
+        // When running from current working directory (legacy)
+        path2.join(process.cwd(), ".tmux.orka.conf")
       ];
+      logger.debug(`Looking for Orka theme config. __dirname: ${__dirname}`);
+      logger.debug(`Possible paths: ${possiblePaths.map((p) => path2.resolve(p)).join(", ")}`);
       let configPath = null;
       for (const p of possiblePaths) {
         if (fs2.existsSync(p)) {
@@ -465,7 +473,7 @@ async function detectNewSessionId(previousIds, maxWaitMs = 1e4, pollIntervalMs =
         return id;
       }
     }
-    await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
+    await new Promise((resolve2) => setTimeout(resolve2, pollIntervalMs));
   }
   logger.warn("Timeout waiting for new Claude session ID");
   return null;
@@ -500,6 +508,8 @@ async function listClaudeSessions(projectPath, limit = 20) {
 }
 
 // src/core/StateManager.ts
+var __filename2 = fileURLToPath2(import.meta.url);
+var __dirname2 = path4.dirname(__filename2);
 var StateManager = class {
   projectPath;
   orkaDir;
@@ -516,6 +526,7 @@ var StateManager = class {
   async initialize() {
     logger.debug("Initializing StateManager");
     await this.ensureDirectories();
+    await this.copyThemeConfig();
     if (!await fs4.pathExists(this.statePath)) {
       logger.info("Creating initial state.json");
       const initialState = {
@@ -528,6 +539,46 @@ var StateManager = class {
     }
     logger.info("StateManager initialized");
   }
+  /**
+   * Copy tmux theme config to project's .claude-orka directory
+   * This ensures the theme persists across system restarts
+   */
+  async copyThemeConfig() {
+    const destPath = path4.join(this.orkaDir, ".tmux.orka.conf");
+    if (await fs4.pathExists(destPath)) {
+      logger.debug("Theme config already exists in project");
+      return;
+    }
+    const possibleSources = [
+      // When running from dist/ (bundled CLI)
+      path4.join(__dirname2, "../.tmux.orka.conf"),
+      // When running from src/core/ (development)
+      path4.join(__dirname2, "../../.tmux.orka.conf"),
+      // Fallback: look in node_modules (when used as dependency)
+      path4.join(__dirname2, "../../../.tmux.orka.conf")
+    ];
+    logger.debug(`Looking for tmux theme. __dirname: ${__dirname2}`);
+    let sourcePath = null;
+    for (const p of possibleSources) {
+      const resolved = path4.resolve(p);
+      const exists = await fs4.pathExists(resolved);
+      logger.debug(`  Checking ${resolved}: ${exists ? "EXISTS" : "not found"}`);
+      if (exists) {
+        sourcePath = resolved;
+        break;
+      }
+    }
+    if (!sourcePath) {
+      logger.warn("Could not find tmux theme source file to copy");
+      return;
+    }
+    try {
+      await fs4.copy(sourcePath, destPath);
+      logger.info(`Tmux theme copied to ${destPath}`);
+    } catch (error) {
+      logger.warn(`Failed to copy tmux theme: ${error.message}`);
+    }
+  }
   /**
    * Create directory structure
    */
@@ -808,14 +859,14 @@ var StateManager = class {
 // src/core/SessionManager.ts
 import { v4 as uuidv4 } from "uuid";
 import path5 from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
+import { fileURLToPath as fileURLToPath3 } from "url";
 import { dirname as dirname2 } from "path";
 import fs5 from "fs-extra";
 import { spawn } from "child_process";
 import execa2 from "execa";
-var __filename2 = fileURLToPath2(import.meta.url);
-var __dirname2 = dirname2(__filename2);
-var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+var __filename3 = fileURLToPath3(import.meta.url);
+var __dirname3 = dirname2(__filename3);
+var sleep = (ms) => new Promise((resolve2) => setTimeout(resolve2, ms));
 var SessionManager = class {
   stateManager;
   projectPath;
@@ -923,7 +974,7 @@ var SessionManager = class {
     }
     logger.info(`Tmux session not found, recovering from Claude session...`);
     await TmuxCommands.createSession(tmuxSessionId, this.projectPath);
-    await TmuxCommands.applyOrkaTheme(tmuxSessionId);
+    await TmuxCommands.applyOrkaTheme(tmuxSessionId, this.projectPath);
     if (openTerminal) {
       await TmuxCommands.openTerminalWindow(tmuxSessionId);
     }
@@ -940,7 +991,8 @@ var SessionManager = class {
     session.status = "active";
     session.lastActivity = (/* @__PURE__ */ new Date()).toISOString();
     await this.stateManager.replaceSession(session);
-    const forksToRestore = session.forks.filter((f) => f.status !== "merged");
+    const forks = session.forks || [];
+    const forksToRestore = forks.filter((f) => f.status === "active" || f.status === "saved");
     if (forksToRestore.length > 0) {
       logger.info(`Restoring ${forksToRestore.length} fork(s)...`);
       for (const fork of forksToRestore) {
@@ -1335,6 +1387,27 @@ Analyze the content and help me integrate the changes and learnings from the for
     return await this.generateForkExport(sessionId, forkId);
   }
   // ==========================================
+  // UI METHODS
+  // ==========================================
+  /**
+   * Save node position for UI persistence
+   * @param sessionId Session ID
+   * @param nodeId Node ID ('main' or fork id)
+   * @param position Position {x, y}
+   */
+  async saveNodePosition(sessionId, nodeId, position) {
+    const session = await this.getSession(sessionId);
+    if (!session) {
+      throw new Error(`Session ${sessionId} not found`);
+    }
+    if (!session.nodePositions) {
+      session.nodePositions = {};
+    }
+    session.nodePositions[nodeId] = position;
+    await this.stateManager.replaceSession(session);
+    logger.debug(`Node position saved: ${nodeId} -> (${position.x}, ${position.y})`);
+  }
+  // ==========================================
   // HELPERS PRIVADOS
   // ==========================================
   /**
@@ -1388,11 +1461,11 @@ Analyze the content and help me integrate the changes and learnings from the for
       }
       const possiblePaths = [
         // Via CLI (bundled): dist -> ./electron/main/main.js
-        path5.join(__dirname2, "./electron/main/main.js"),
+        path5.join(__dirname3, "./electron/main/main.js"),
         // Via SDK: dist/src/core -> ../../electron/main/main.js
-        path5.join(__dirname2, "../../electron/main/main.js"),
+        path5.join(__dirname3, "../../electron/main/main.js"),
         // Development: src/core -> ../../dist/electron/main/main.js
-        path5.join(__dirname2, "../../dist/electron/main/main.js")
+        path5.join(__dirname3, "../../dist/electron/main/main.js")
       ];
       let mainPath = null;
       for (const p of possiblePaths) {
@@ -1406,7 +1479,7 @@ Analyze the content and help me integrate the changes and learnings from the for
       if (!mainPath) {
         const resolvedPaths = possiblePaths.map((p) => path5.resolve(p));
         logger.warn(`Electron main.js not found. Tried paths: ${resolvedPaths.join(", ")}`);
-        logger.warn(`Current __dirname: ${__dirname2}`);
+        logger.warn(`Current __dirname: ${__dirname3}`);
         logger.warn("Skipping UI launch");
         return;
       }
@@ -1654,7 +1727,7 @@ var ClaudeOrka = class {
   async generateExportAndMerge(sessionId, forkId, waitTime = 15e3) {
     await this.generateForkExport(sessionId, forkId);
     logger.info(`Waiting ${waitTime}ms for Claude to complete export...`);
-    await new Promise((resolve) => setTimeout(resolve, waitTime));
+    await new Promise((resolve2) => setTimeout(resolve2, waitTime));
     await this.merge(sessionId, forkId);
   }
   /**
@@ -1683,6 +1756,18 @@ var ClaudeOrka = class {
     await this.exportAndMerge(sessionId, forkId);
     await this.closeFork(sessionId, forkId);
   }
+  // ==========================================
+  // UI METHODS
+  // ==========================================
+  /**
+   * Save node position for UI persistence
+   * @param sessionId Session ID
+   * @param nodeId Node ID ('main' or fork id)
+   * @param position Position {x, y}
+   */
+  async saveNodePosition(sessionId, nodeId, position) {
+    await this.sessionManager.saveNodePosition(sessionId, nodeId, position);
+  }
 };
 
 // src/cli/utils/output.ts
@@ -1742,16 +1827,17 @@ ${statusEmoji} ${chalk.bold(session.name)}`);
     if (session.status === "active") {
       console.log(`  ${chalk.gray("Tmux Session:")} ${session.tmuxSessionId}`);
     }
-    if (session.forks.length > 0) {
-      console.log(`  ${chalk.gray("Forks:")} ${session.forks.length}`);
+    const forks = session.forks || [];
+    if (forks.length > 0) {
+      console.log(`  ${chalk.gray("Forks:")} ${forks.length}`);
       console.log(
-        `    ${chalk.green("Active:")} ${session.forks.filter((f) => f.status === "active").length}`
+        `    ${chalk.green("Active:")} ${forks.filter((f) => f.status === "active").length}`
       );
       console.log(
-        `    ${chalk.yellow("Saved:")} ${session.forks.filter((f) => f.status === "saved").length}`
+        `    ${chalk.yellow("Saved:")} ${forks.filter((f) => f.status === "saved").length}`
       );
       console.log(
-        `    ${chalk.blue("Merged:")} ${session.forks.filter((f) => f.status === "merged").length}`
+        `    ${chalk.blue("Merged:")} ${forks.filter((f) => f.status === "merged").length}`
       );
     }
   }
@@ -1799,9 +1885,10 @@ ${statusEmoji} ${chalk.bold(session.name)}`);
     });
     for (const session of sessions) {
       const statusColor = session.status === "active" ? chalk.green : chalk.yellow;
-      const activeForks = session.forks.filter((f) => f.status === "active").length;
-      const savedForks = session.forks.filter((f) => f.status === "saved").length;
-      const mergedForks = session.forks.filter((f) => f.status === "merged").length;
+      const forks = session.forks || [];
+      const activeForks = forks.filter((f) => f.status === "active").length;
+      const savedForks = forks.filter((f) => f.status === "saved").length;
+      const mergedForks = forks.filter((f) => f.status === "merged").length;
       table.push([
         session.name,
         statusColor(session.status),
@@ -1879,10 +1966,11 @@ ${statusEmoji} ${chalk.bold(session.name)}`);
       console.log(
         `    ${chalk.green("Active:")} ${session.activeForks} | ${chalk.yellow("Saved:")} ${session.savedForks} | ${chalk.blue("Merged:")} ${session.mergedForks}`
       );
-      if (session.forks.length > 0) {
+      const sessionForks = session.forks || [];
+      if (sessionForks.length > 0) {
         console.log(`
   ${chalk.bold("Forks:")}`);
-        for (const fork of session.forks) {
+        for (const fork of sessionForks) {
           const forkEmoji = fork.status === "active" ? "\u2713" : fork.status === "merged" ? "\u{1F500}" : "\u{1F4BE}";
           const forkColor = fork.status === "active" ? chalk.green : fork.status === "merged" ? chalk.blue : chalk.yellow;
           console.log(`
@@ -2012,7 +2100,8 @@ async function selectSession(sessions) {
   sessions.forEach((session, index2) => {
     const statusColor = session.status === "active" ? chalk3.green : chalk3.yellow;
     const status = statusColor(`[${session.status}]`);
-    const forkCount = session.forks.length > 0 ? chalk3.gray(` (${session.forks.length} forks)`) : "";
+    const forks = session.forks || [];
+    const forkCount = forks.length > 0 ? chalk3.gray(` (${forks.length} forks)`) : "";
     console.log(`  ${chalk3.bold(index2 + 1)}. ${session.name || "Unnamed"} ${status}${forkCount}`);
     console.log(chalk3.gray(`     ID: ${session.id.slice(0, 8)}...`));
     console.log();
@@ -2021,8 +2110,8 @@ async function selectSession(sessions) {
     input: process.stdin,
     output: process.stdout
   });
-  const answer = await new Promise((resolve) => {
-    rl.question(chalk3.cyan("Enter number (or q to quit): "), resolve);
+  const answer = await new Promise((resolve2) => {
+    rl.question(chalk3.cyan("Enter number (or q to quit): "), resolve2);
   });
   rl.close();
   if (answer.toLowerCase() === "q") {
@@ -2062,8 +2151,8 @@ async function selectClaudeSession(sessions) {
     input: process.stdin,
     output: process.stdout
   });
-  const answer = await new Promise((resolve) => {
-    rl.question(chalk3.cyan("Enter number (or q to quit): "), resolve);
+  const answer = await new Promise((resolve2) => {
+    rl.question(chalk3.cyan("Enter number (or q to quit): "), resolve2);
   });
   rl.close();
   if (answer.toLowerCase() === "q") {
@@ -2161,9 +2250,10 @@ function sessionCommand(program2) {
         Output.json(session2);
       } else {
         Output.session(session2);
-        if (session2.forks.length > 0) {
+        const sessionForks = session2.forks || [];
+        if (sessionForks.length > 0) {
           Output.section("\n\u{1F33F} Forks:");
-          for (const fork of session2.forks) {
+          for (const fork of sessionForks) {
             Output.fork(fork);
           }
         }
@@ -2285,7 +2375,7 @@ function forkCommand(program2) {
         Output.error(`Session not found: ${sessionId}`);
         process.exit(1);
       }
-      let forks = session.forks;
+      let forks = session.forks || [];
       if (options.status) {
         forks = forks.filter((f) => f.status === options.status);
       }
@@ -2699,8 +2789,8 @@ function prepareCommand(program2) {
           input: process.stdin,
           output: process.stdout
         });
-        const answer = await new Promise((resolve) => {
-          rl.question("Continue? (y/n): ", resolve);
+        const answer = await new Promise((resolve2) => {
+          rl.question("Continue? (y/n): ", resolve2);
         });
         rl.close();
         if (answer.toLowerCase() !== "y") {
@@ -2844,13 +2934,13 @@ async function checkClaudeCLI() {
 }
 
 // src/cli/index.ts
-var __filename3 = fileURLToPath3(import.meta.url);
-var __dirname3 = dirname3(__filename3);
-var packageJsonPath = join2(__dirname3, "../package.json");
+var __filename4 = fileURLToPath4(import.meta.url);
+var __dirname4 = dirname3(__filename4);
+var packageJsonPath = join2(__dirname4, "../package.json");
 try {
   readFileSync(packageJsonPath, "utf-8");
 } catch {
-  packageJsonPath = join2(__dirname3, "../../package.json");
+  packageJsonPath = join2(__dirname4, "../../package.json");
 }
 var packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
 var version = packageJson.version;