@jamesmurdza/opencode-daytona 0.1.22 → 0.1.23

package/.opencode/plugin/daytona/core/logger.d.ts

@@ -1,5 +1,6 @@
 /**
- * Logger class for handling plugin logging
+ * Copyright 2025 Daytona Platforms Inc.
+ * SPDX-License-Identifier: Apache-2.0
  */
 import type { LogLevel } from './types';
 export declare function setLogFilePath(path: string): void;
@@ -12,4 +13,3 @@ declare class Logger {
 }
 export declare const logger: Logger;
 export {};
-//# sourceMappingURL=logger.d.ts.map

package/.opencode/plugin/daytona/core/logger.js

@@ -1,11 +1,19 @@
+"use strict";
+/**
+ * Copyright 2025 Daytona Platforms Inc.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.logger = void 0;
+exports.setLogFilePath = setLogFilePath;
 /**
  * Logger class for handling plugin logging
  */
-import { appendFileSync, mkdirSync, statSync, truncateSync } from 'fs';
-import { dirname } from 'path';
-import { LOG_LEVEL_INFO, LOG_LEVEL_ERROR, LOG_LEVEL_WARN } from './types';
+const fs_1 = require("fs");
+const path_1 = require("path");
+const types_1 = require("./types");
 let logFilePath;
-export function setLogFilePath(path) {
+function setLogFilePath(path) {
     logFilePath = path;
 }
 class Logger {
@@ -14,20 +22,25 @@ class Logger {
             throw new Error('Logger file path not set. Call setLogFilePath(path) before use.');
         return logFilePath;
     }
-    log(message, level = LOG_LEVEL_INFO) {
+    log(message, level = types_1.LOG_LEVEL_INFO) {
         // Ensure log directory exists
         try {
-            mkdirSync(dirname(this.logFile), { recursive: true });
+            (0, fs_1.mkdirSync)((0, path_1.dirname)(this.logFile), { recursive: true });
         }
         catch (err) {
             // Directory may already exist, ignore
         }
-        // Truncate log file if it exceeds 5MB
+        // Trim log file if it exceeds 3MB (keep last 1MB)
         try {
-            const stats = statSync(this.logFile);
-            const maxSize = 5 * 1024 * 1024; // 5MB
+            const stats = (0, fs_1.statSync)(this.logFile);
+            const maxSize = 3 * 1024 * 1024;
+            const keepSize = 1024 * 1024;
             if (stats.size > maxSize) {
-                truncateSync(this.logFile, 0);
+                const content = (0, fs_1.readFileSync)(this.logFile, 'utf8');
+                const trimmed = content.slice(-keepSize);
+                // Drop partial first line so we don't start mid-log
+                const firstNewline = trimmed.indexOf('\n');
+                (0, fs_1.writeFileSync)(this.logFile, firstNewline >= 0 ? trimmed.slice(firstNewline + 1) : trimmed);
             }
         }
         catch (err) {
@@ -35,17 +48,17 @@ class Logger {
         }
         const timestamp = new Date().toISOString();
         const logEntry = `[${timestamp}] [${level}] ${message}\n`;
-        appendFileSync(this.logFile, logEntry);
+        (0, fs_1.appendFileSync)(this.logFile, logEntry);
     }
     info(message) {
-        this.log(message, LOG_LEVEL_INFO);
+        this.log(message, types_1.LOG_LEVEL_INFO);
     }
     error(message) {
-        this.log(message, LOG_LEVEL_ERROR);
+        this.log(message, types_1.LOG_LEVEL_ERROR);
     }
     warn(message) {
-        this.log(message, LOG_LEVEL_WARN);
+        this.log(message, types_1.LOG_LEVEL_WARN);
     }
 }
-export const logger = new Logger();
+exports.logger = new Logger();
 //# sourceMappingURL=logger.js.map

package/.opencode/plugin/daytona/core/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../../.opencode/plugin/daytona/core/logger.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,IAAI,CAAA;AACtE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAE9B,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAEzE,IAAI,WAA+B,CAAA;AAEnC,MAAM,UAAU,cAAc,CAAC,IAAY;IACzC,WAAW,GAAG,IAAI,CAAA;AACpB,CAAC;AAED,MAAM,MAAM;IACV,IAAY,OAAO;QACjB,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAA;QACpG,OAAO,WAAW,CAAA;IACpB,CAAC;IAED,GAAG,CAAC,OAAe,EAAE,QAAkB,cAAc;QACnD,8BAA8B;QAC9B,IAAI,CAAC;YACH,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QACvD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,sCAAsC;QACxC,CAAC;QACD,sCAAsC;QACtC,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACpC,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAA,CAAC,MAAM;YACtC,IAAI,KAAK,CAAC,IAAI,GAAG,OAAO,EAAE,CAAC;gBACzB,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;YAC/B,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,iCAAiC;QACnC,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;QAC1C,MAAM,QAAQ,GAAG,IAAI,SAAS,MAAM,KAAK,KAAK,OAAO,IAAI,CAAA;QACzD,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IACxC,CAAC;IAED,IAAI,CAAC,OAAe;QAClB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,cAAc,CAAC,CAAA;IACnC,CAAC;IAED,KAAK,CAAC,OAAe;QACnB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,eAAe,CAAC,CAAA;IACpC,CAAC;IAED,IAAI,CAAC,OAAe;QAClB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,cAAc,CAAC,CAAA;IACnC,CAAC;CACF;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,IAAI,MAAM,EAAE,CAAA"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../../../../libs/opencode-plugin/.opencode/plugin/daytona/core/logger.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAaH,wCAEC;AAbD;;GAEG;AAEH,2BAAqF;AACrF,+BAA8B;AAE9B,mCAAyE;AAEzE,IAAI,WAA+B,CAAA;AAEnC,SAAgB,cAAc,CAAC,IAAY;IACzC,WAAW,GAAG,IAAI,CAAA;AACpB,CAAC;AAED,MAAM,MAAM;IACV,IAAY,OAAO;QACjB,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAA;QACpG,OAAO,WAAW,CAAA;IACpB,CAAC;IAED,GAAG,CAAC,OAAe,EAAE,QAAkB,sBAAc;QACnD,8BAA8B;QAC9B,IAAI,CAAC;YACH,IAAA,cAAS,EAAC,IAAA,cAAO,EAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QACvD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,sCAAsC;QACxC,CAAC;QACD,kDAAkD;QAClD,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,IAAA,aAAQ,EAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACpC,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAA;YAC/B,MAAM,QAAQ,GAAG,IAAI,GAAG,IAAI,CAAA;YAC5B,IAAI,KAAK,CAAC,IAAI,GAAG,OAAO,EAAE,CAAC;gBACzB,MAAM,OAAO,GAAG,IAAA,iBAAY,EAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;gBAClD,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAA;gBACxC,oDAAoD;gBACpD,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;gBAC1C,IAAA,kBAAa,EAAC,IAAI,CAAC,OAAO,EAAE,YAAY,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;YAC5F,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,iCAAiC;QACnC,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;QAC1C,MAAM,QAAQ,GAAG,IAAI,SAAS,MAAM,KAAK,KAAK,OAAO,IAAI,CAAA;QACzD,IAAA,mBAAc,EAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IACxC,CAAC;IAED,IAAI,CAAC,OAAe;QAClB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,sBAAc,CAAC,CAAA;IACnC,CAAC;IAED,KAAK,CAAC,OAAe;QACnB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,uBAAe,CAAC,CAAA;IACpC,CAAC;IAED,IAAI,CAAC,OAAe;QAClB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,sBAAc,CAAC,CAAA;IACnC,CAAC;CACF;AAEY,QAAA,MAAM,GAAG,IAAI,MAAM,EAAE,CAAA"}

package/.opencode/plugin/daytona/core/project-data-storage.d.ts

@@ -1,6 +1,6 @@
 /**
- * Handles file storage operations for project session data
- * Stores data per-project in ~/.local/share/opencode/storage/daytona/{projectId}.json
+ * Copyright 2025 Daytona Platforms Inc.
+ * SPDX-License-Identifier: Apache-2.0
  */
 import type { ProjectSessionData, SessionInfo } from './types';
 export declare class ProjectDataStorage {
@@ -10,18 +10,23 @@ export declare class ProjectDataStorage {
      * Get the file path for a project's session data
      */
     private getProjectFilePath;
+    /**
+     * List known project IDs from storage.
+     */
+    private listProjectIds;
     /**
      * Load project session data from disk
      */
     load(projectId: string): ProjectSessionData | null;
     /**
-     * Save project session data to disk
+     * Get a session for a project. If not found in the requested project, search all other
+     * projects on disk and, if found, migrate it into the requested project.
      */
-    save(projectId: string, worktree: string, sessions: Record<string, SessionInfo>, lastBranchNumber?: number): void;
+    getSession(projectId: string, worktree: string, sessionId: string): SessionInfo | undefined;
     /**
-     * Get the next available branch number for a project
+     * Save project session data to disk
      */
-    getNextBranchNumber(projectId: string): number;
+    save(projectId: string, worktree: string, sessions: Record<string, SessionInfo>): void;
     /**
      * Get branch number for a sandbox
      */
@@ -35,4 +40,3 @@ export declare class ProjectDataStorage {
      */
     removeSession(projectId: string, worktree: string, sessionId: string): void;
 }
-//# sourceMappingURL=project-data-storage.d.ts.map

package/.opencode/plugin/daytona/core/project-data-storage.js

@@ -1,24 +1,45 @@
+"use strict";
+/**
+ * Copyright 2025 Daytona Platforms Inc.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProjectDataStorage = void 0;
 /**
  * Handles file storage operations for project session data
  * Stores data per-project in ~/.local/share/opencode/storage/daytona/{projectId}.json
  */
-import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
-import { join } from 'path';
-import { logger } from './logger';
-export class ProjectDataStorage {
+const fs_1 = require("fs");
+const path_1 = require("path");
+const logger_1 = require("./logger");
+class ProjectDataStorage {
     storageDir;
     constructor(storageDir) {
         this.storageDir = storageDir;
         // Ensure storage directory exists
-        if (!existsSync(this.storageDir)) {
-            mkdirSync(this.storageDir, { recursive: true });
+        if (!(0, fs_1.existsSync)(this.storageDir)) {
+            (0, fs_1.mkdirSync)(this.storageDir, { recursive: true });
         }
     }
     /**
      * Get the file path for a project's session data
      */
     getProjectFilePath(projectId) {
-        return join(this.storageDir, `${projectId}.json`);
+        return (0, path_1.join)(this.storageDir, `${projectId}.json`);
+    }
+    /**
+     * List known project IDs from storage.
+     */
+    listProjectIds() {
+        try {
+            return (0, fs_1.readdirSync)(this.storageDir)
+                .filter((name) => name.endsWith('.json'))
+                .map((name) => name.slice(0, -'.json'.length));
+        }
+        catch (err) {
+            logger_1.logger.error(`Failed to list project data files: ${err}`);
+            return [];
+        }
     }
     /**
      * Load project session data from disk
@@ -26,49 +47,73 @@ export class ProjectDataStorage {
     load(projectId) {
         const filePath = this.getProjectFilePath(projectId);
         try {
-            if (existsSync(filePath)) {
-                return JSON.parse(readFileSync(filePath, 'utf-8'));
+            if ((0, fs_1.existsSync)(filePath)) {
+                return JSON.parse((0, fs_1.readFileSync)(filePath, 'utf-8'));
             }
         }
         catch (err) {
-            logger.error(`Failed to load project data for ${projectId}: ${err}`);
+            logger_1.logger.error(`Failed to load project data for ${projectId}: ${err}`);
         }
         return null;
     }
+    /**
+     * Get a session for a project. If not found in the requested project, search all other
+     * projects on disk and, if found, migrate it into the requested project.
+     */
+    getSession(projectId, worktree, sessionId) {
+        const current = this.load(projectId);
+        const currentSession = current?.sessions?.[sessionId];
+        if (currentSession) {
+            return currentSession;
+        }
+        // Look in other projects and migrate if found.
+        for (const otherProjectId of this.listProjectIds()) {
+            if (otherProjectId === projectId)
+                continue;
+            const otherData = this.load(otherProjectId);
+            const found = otherData?.sessions?.[sessionId];
+            if (!found)
+                continue;
+            const destination = current ?? {
+                projectId,
+                worktree,
+                sessions: {},
+            };
+            // Remove from source first (best effort).
+            try {
+                delete otherData.sessions[sessionId];
+                this.save(otherProjectId, otherData.worktree, otherData.sessions);
+            }
+            catch (err) {
+                logger_1.logger.warn(`Failed to remove session ${sessionId} from project ${otherProjectId}: ${err}`);
+            }
+            // Add to destination and persist.
+            destination.sessions[sessionId] = found;
+            // Prefer the worktree for the project we're actually operating on.
+            destination.worktree = worktree;
+            this.save(projectId, destination.worktree, destination.sessions);
+            logger_1.logger.info(`Migrated session ${sessionId} from project ${otherProjectId} to project ${projectId}`);
+            return found;
+        }
+        return undefined;
+    }
     /**
      * Save project session data to disk
      */
-    save(projectId, worktree, sessions, lastBranchNumber) {
+    save(projectId, worktree, sessions) {
         const filePath = this.getProjectFilePath(projectId);
         const projectData = {
             projectId,
             worktree,
-            lastBranchNumber,
             sessions,
         };
         try {
-            writeFileSync(filePath, JSON.stringify(projectData, null, 2));
-            logger.info(`Saved project data for ${projectId}`);
+            (0, fs_1.writeFileSync)(filePath, JSON.stringify(projectData, null, 2));
+            logger_1.logger.info(`Saved project data for ${projectId}`);
         }
         catch (err) {
-            logger.error(`Failed to save project data for ${projectId}: ${err}`);
-        }
-    }
-    /**
-     * Get the next available branch number for a project
-     */
-    getNextBranchNumber(projectId) {
-        const projectData = this.load(projectId);
-        if (!projectData) {
-            return 1;
+            logger_1.logger.error(`Failed to save project data for ${projectId}: ${err}`);
         }
-        const branchNumbers = Object.values(projectData.sessions)
-            .map(s => s.branchNumber)
-            .filter((n) => n !== undefined);
-        // Use a persisted monotonic pointer so we never reuse deleted numbers.
-        const pointer = projectData.lastBranchNumber ?? 0;
-        const maxInSessions = branchNumbers.length > 0 ? Math.max(...branchNumbers) : 0;
-        return Math.max(pointer, maxInSessions) + 1;
     }
     /**
      * Get branch number for a sandbox
@@ -78,7 +123,7 @@ export class ProjectDataStorage {
         if (!projectData) {
             return undefined;
         }
-        const session = Object.values(projectData.sessions).find(s => s.sandboxId === sandboxId);
+        const session = Object.values(projectData.sessions).find((s) => s.sandboxId === sandboxId);
         return session?.branchNumber;
     }
     /**
@@ -88,32 +133,28 @@ export class ProjectDataStorage {
         const projectData = this.load(projectId) || {
             projectId,
             worktree,
-            lastBranchNumber: 0,
             sessions: {},
         };
         const now = Date.now();
         if (!projectData.sessions[sessionId]) {
-            // Assign branch number if not provided
-            const assignedBranchNumber = branchNumber ?? this.getNextBranchNumber(projectId);
             projectData.sessions[sessionId] = {
                 sandboxId,
-                branchNumber: assignedBranchNumber,
+                ...(branchNumber !== undefined ? { branchNumber } : {}),
                 created: now,
                 lastAccessed: now,
             };
-            projectData.lastBranchNumber = Math.max(projectData.lastBranchNumber ?? 0, assignedBranchNumber);
         }
         else {
             projectData.sessions[sessionId].sandboxId = sandboxId;
             projectData.sessions[sessionId].lastAccessed = now;
             // Only update branch number if it wasn't set before
             if (projectData.sessions[sessionId].branchNumber === undefined) {
-                const assignedBranchNumber = branchNumber ?? this.getNextBranchNumber(projectId);
-                projectData.sessions[sessionId].branchNumber = assignedBranchNumber;
-                projectData.lastBranchNumber = Math.max(projectData.lastBranchNumber ?? 0, assignedBranchNumber);
+                if (branchNumber !== undefined) {
+                    projectData.sessions[sessionId].branchNumber = branchNumber;
+                }
             }
         }
-        this.save(projectId, worktree, projectData.sessions, projectData.lastBranchNumber);
+        this.save(projectId, worktree, projectData.sessions);
     }
     /**
      * Remove a session from the project file
@@ -122,9 +163,9 @@ export class ProjectDataStorage {
         const projectData = this.load(projectId);
         if (projectData && projectData.sessions[sessionId]) {
             delete projectData.sessions[sessionId];
-            // Intentionally keep lastBranchNumber so branch numbering remains monotonic
-            this.save(projectId, worktree, projectData.sessions, projectData.lastBranchNumber);
+            this.save(projectId, worktree, projectData.sessions);
         }
     }
 }
+exports.ProjectDataStorage = ProjectDataStorage;
 //# sourceMappingURL=project-data-storage.js.map

package/.opencode/plugin/daytona/core/project-data-storage.js.map

@@ -1 +1 @@
-{"version":3,"file":"project-data-storage.js","sourceRoot":"","sources":["../../../../../.opencode/plugin/daytona/core/project-data-storage.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"project-data-storage.js","sourceRoot":"","sources":["../../../../../../../libs/opencode-plugin/.opencode/plugin/daytona/core/project-data-storage.ts"],"names":[],"mappings":"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"}

package/.opencode/plugin/daytona/core/session-manager.d.ts

@@ -1,3 +1,7 @@
+/**
+ * Copyright 2025 Daytona Platforms Inc.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 /**
  * Manages Daytona sandbox sessions and persists session-sandbox mappings
  * Stores data per-project in ~/.local/share/opencode/storage/daytona/{projectId}.json
@@ -40,4 +44,3 @@ export declare class DaytonaSessionManager {
      */
     deleteSandbox(sessionId: string, projectId: string): Promise<void>;
 }
-//# sourceMappingURL=session-manager.d.ts.map

package/.opencode/plugin/daytona/core/session-manager.js

@@ -1,13 +1,21 @@
+"use strict";
+/**
+ * Copyright 2025 Daytona Platforms Inc.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DaytonaSessionManager = void 0;
 /**
  * Manages Daytona sandbox sessions and persists session-sandbox mappings
  * Stores data per-project in ~/.local/share/opencode/storage/daytona/{projectId}.json
  */
-import { Daytona } from '@daytonaio/sdk';
-import { logger } from './logger';
-import { SessionGitManager } from '../git/session-git-manager';
-import { ProjectDataStorage } from './project-data-storage';
-import { toast } from './toast';
-export class DaytonaSessionManager {
+const sdk_1 = require("@daytonaio/sdk");
+const logger_1 = require("./logger");
+const session_git_manager_1 = require("../git/session-git-manager");
+const sandbox_git_manager_1 = require("../git/sandbox-git-manager");
+const project_data_storage_1 = require("./project-data-storage");
+const toast_1 = require("./toast");
+class DaytonaSessionManager {
     apiKey;
     dataStorage;
     sessionSandboxes;
@@ -15,7 +23,7 @@ export class DaytonaSessionManager {
     repoPath;
     constructor(apiKey, storageDir, repoPath) {
         this.apiKey = apiKey;
-        this.dataStorage = new ProjectDataStorage(storageDir);
+        this.dataStorage = new project_data_storage_1.ProjectDataStorage(storageDir);
         this.repoPath = repoPath;
         this.sessionSandboxes = new Map();
     }
@@ -40,7 +48,7 @@ export class DaytonaSessionManager {
             for (const [sessionId, sessionInfo] of Object.entries(projectData.sessions)) {
                 this.sessionSandboxes.set(sessionId, { id: sessionInfo.sandboxId });
             }
-            logger.info(`Loaded ${Object.keys(projectData.sessions).length} sessions for project ${projectId}`);
+            logger_1.logger.info(`Loaded ${Object.keys(projectData.sessions).length} sessions for project ${projectId}`);
         }
     }
     /**
@@ -49,6 +57,7 @@ export class DaytonaSessionManager {
     setProjectContext(projectId) {
         if (this.currentProjectId !== projectId) {
             this.currentProjectId = projectId;
+            this.sessionSandboxes.clear();
             this.loadProjectSessions(projectId);
         }
     }
@@ -63,11 +72,11 @@ export class DaytonaSessionManager {
      */
     async getSandbox(sessionId, projectId, worktree, pluginCtx) {
         if (pluginCtx?.client?.tui) {
-            toast.initialize(pluginCtx.client.tui);
+            toast_1.toast.initialize(pluginCtx.client.tui);
         }
         if (!this.apiKey) {
-            logger.error('DAYTONA_API_KEY is not set. Cannot create or retrieve sandbox.');
-            toast.show({
+            logger_1.logger.error('DAYTONA_API_KEY is not set. Cannot create or retrieve sandbox.');
+            toast_1.toast.show({
                 title: 'Sandbox error',
                 message: 'DAYTONA_API_KEY is not set. Please set the environment variable to use Daytona sandboxes.',
                 variant: 'error',
@@ -82,7 +91,7 @@ export class DaytonaSessionManager {
             // Refresh sandbox state and ensure it's running
             await existing.refreshData();
             if (existing.state !== 'started') {
-                logger.info(`Starting sandbox ${existing.id} (current state: ${existing.state})`);
+                logger_1.logger.info(`Starting sandbox ${existing.id} (current state: ${existing.state})`);
                 await existing.start();
             }
             this.dataStorage.updateSession(projectId, worktree, sessionId, existing.id);
@@ -90,50 +99,99 @@ export class DaytonaSessionManager {
         }
         // If we have a sandboxId but not a full sandbox object, reconnect to it
         if (this.isPartiallyInitialized(existing)) {
-            logger.info(`Reconnecting to existing sandbox: ${existing.id}`);
-            const daytona = new Daytona({ apiKey: this.apiKey });
+            logger_1.logger.info(`Reconnecting to existing sandbox: ${existing.id}`);
+            const daytona = new sdk_1.Daytona({ apiKey: this.apiKey });
+            const reconnectStart = Date.now();
+            logger_1.logger.info(`Daytona get begin sandboxId=${existing.id}`);
             const sandbox = await daytona.get(existing.id);
+            logger_1.logger.info(`Daytona get done sandboxId=${existing.id} in ${Date.now() - reconnectStart}ms`);
+            logger_1.logger.info(`Starting sandbox begin sandboxId=${sandbox.id}`);
             await sandbox.start();
+            logger_1.logger.info(`Starting sandbox done sandboxId=${sandbox.id} in ${Date.now() - reconnectStart}ms`);
             this.sessionSandboxes.set(sessionId, sandbox);
             // Preserve branch number if it exists for this sandbox
             let branchNumber = this.dataStorage.getBranchNumberForSandbox(projectId, sandbox.id);
             if (!branchNumber) {
-                branchNumber = this.dataStorage.getNextBranchNumber(projectId);
+                try {
+                    branchNumber = session_git_manager_1.SessionGitManager.allocateAndReserveBranchNumber(worktree);
+                }
+                catch {
+                    // No local git repo (or git unavailable) shouldn't block sandbox usage.
+                    branchNumber = undefined;
+                }
             }
             this.dataStorage.updateSession(projectId, worktree, sessionId, sandbox.id, branchNumber);
-            toast.show({
+            toast_1.toast.show({
                 title: 'Sandbox connected',
                 message: `Connected to existing sandbox.`,
                 variant: 'info',
             });
+            // Even if git syncing is disabled, ensure the project directory exists in the sandbox.
+            if (!branchNumber) {
+                try {
+                    await new sandbox_git_manager_1.DaytonaSandboxGitManager(sandbox, this.repoPath).ensureDirectory();
+                }
+                catch (err) {
+                    logger_1.logger.warn(`Failed to ensure sandbox project directory exists: ${err}`);
+                }
+            }
             return sandbox;
         }
+        // If not in cache/storage for this project, try to recover from other projects and migrate.
+        if (!existing) {
+            const migrated = this.dataStorage.getSession(projectId, worktree, sessionId);
+            if (migrated?.sandboxId) {
+                logger_1.logger.info(`Recovered session ${sessionId} for project ${projectId} (migrated from another project)`);
+                this.sessionSandboxes.set(sessionId, { id: migrated.sandboxId });
+                // Re-run getSandbox to go through the normal reconnect path.
+                return this.getSandbox(sessionId, projectId, worktree, pluginCtx);
+            }
+        }
         // Otherwise, create a new sandbox
-        logger.info(`Creating new sandbox for session: ${sessionId} in project: ${projectId}`);
-        const daytona = new Daytona({ apiKey: this.apiKey });
-        const sandbox = await daytona.create();
+        logger_1.logger.info(`Creating new sandbox for session: ${sessionId} in project: ${projectId}`);
+        const daytona = new sdk_1.Daytona({ apiKey: this.apiKey });
+        const createStart = Date.now();
+        logger_1.logger.info(`Daytona create begin sessionId=${sessionId}`);
+        const waitingLog = setTimeout(() => {
+            logger_1.logger.warn(`Daytona create still waiting after ${Date.now() - createStart}ms (sessionId=${sessionId})`);
+        }, 15_000);
+        const sandbox = await daytona.create().finally(() => clearTimeout(waitingLog));
+        logger_1.logger.info(`Daytona create done sessionId=${sessionId} sandboxId=${sandbox.id} in ${Date.now() - createStart}ms`);
         this.sessionSandboxes.set(sessionId, sandbox);
         // Get or assign branch number for this sandbox
         let branchNumber = this.dataStorage.getBranchNumberForSandbox(projectId, sandbox.id);
         if (!branchNumber) {
-            branchNumber = this.dataStorage.getNextBranchNumber(projectId);
+            try {
+                branchNumber = session_git_manager_1.SessionGitManager.allocateAndReserveBranchNumber(worktree);
+            }
+            catch (err) {
+                logger_1.logger.warn(`allocateAndReserveBranchNumber failed sessionId=${sessionId}: ${err}`);
+                // No local git repo (or git unavailable) shouldn't block sandbox usage.
+                branchNumber = undefined;
+            }
         }
         this.dataStorage.updateSession(projectId, worktree, sessionId, sandbox.id, branchNumber);
-        logger.info(`Sandbox created successfully: ${sandbox.id} with branch number ${branchNumber}`);
+        logger_1.logger.info(`Sandbox created successfully: ${sandbox.id}${branchNumber ? ` with branch number ${branchNumber}` : ''}`);
         // Initialize git repo in the sandbox and sync with host
         try {
-            const sessionGit = new SessionGitManager(sandbox, this.repoPath, branchNumber);
-            await sessionGit.initializeAndSync(pluginCtx);
+            if (branchNumber) {
+                const sessionGit = new session_git_manager_1.SessionGitManager(sandbox, this.repoPath, worktree, branchNumber);
+                await sessionGit.initializeAndSync(pluginCtx);
+            }
+            else {
+                // Git disabled; still ensure the directory exists so tools can operate.
+                await new sandbox_git_manager_1.DaytonaSandboxGitManager(sandbox, this.repoPath).ensureDirectory();
+            }
         }
         catch (err) {
-            logger.error(`Failed to initialize git repo or push local changes in sandbox: ${err}`);
-            toast.show({
+            logger_1.logger.error(`Failed to initialize git repo or push local changes in sandbox: ${err}`);
+            toast_1.toast.show({
                 title: 'Git error',
                 message: err?.message || 'Failed to initialize git repo in sandbox.',
                 variant: 'error',
             });
         }
-        toast.show({
+        toast_1.toast.show({
             title: 'Sandbox created',
             message: `Created new sandbox for session.`,
             variant: 'success',
@@ -147,22 +205,22 @@ export class DaytonaSessionManager {
         let sandbox = this.sessionSandboxes.get(sessionId);
         // If not in cache, try to load from storage and reconnect
         if (!sandbox || this.isPartiallyInitialized(sandbox)) {
-            const projectData = this.dataStorage.load(projectId);
-            const sessionInfo = projectData?.sessions?.[sessionId];
+            const storedWorktree = this.dataStorage.load(projectId)?.worktree ?? '';
+            const sessionInfo = this.dataStorage.getSession(projectId, storedWorktree, sessionId);
             if (sessionInfo?.sandboxId) {
-                const daytona = new Daytona({ apiKey: this.apiKey });
+                const daytona = new sdk_1.Daytona({ apiKey: this.apiKey });
                 try {
                     sandbox = await daytona.get(sessionInfo.sandboxId);
                     this.sessionSandboxes.set(sessionId, sandbox);
                 }
                 catch (err) {
-                    logger.error(`Failed to reconnect to sandbox ${sessionInfo.sandboxId}: ${err}`);
+                    logger_1.logger.error(`Failed to reconnect to sandbox ${sessionInfo.sandboxId}: ${err}`);
                 }
             }
         }
         // Delete the sandbox if we have a fully initialized one
         if (this.isFullyInitialized(sandbox)) {
-            logger.info(`Removing sandbox for session: ${sessionId}`);
+            logger_1.logger.info(`Removing sandbox for session: ${sessionId}`);
             await sandbox.delete();
             this.sessionSandboxes.delete(sessionId);
             // Remove from storage
@@ -170,11 +228,12 @@ export class DaytonaSessionManager {
             if (projectData) {
                 this.dataStorage.removeSession(projectId, projectData.worktree, sessionId);
             }
-            logger.info(`Sandbox deleted successfully.`);
+            logger_1.logger.info(`Sandbox deleted successfully.`);
         }
         else {
-            logger.warn(`No sandbox found for session: ${sessionId}`);
+            logger_1.logger.warn(`No sandbox found for session: ${sessionId}`);
         }
     }
 }
+exports.DaytonaSessionManager = DaytonaSessionManager;
 //# sourceMappingURL=session-manager.js.map