@veris-ai/daytona-opencode 0.1.0

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

@@ -0,0 +1,184 @@
+/**
+ * Copyright Daytona Platforms Inc.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { logger } from '../core/logger';
+import { toast } from '../core/toast';
+import { DaytonaSandboxGitManager } from './sandbox-git-manager';
+import { HostGitManager } from './host-git-manager';
+/**
+ * SessionGitManager: Combines DaytonaSandboxGitManager and HostGitManager for session lifecycle git operations.
+ */
+export class SessionGitManager {
+    sandboxGit;
+    hostGit;
+    sandbox;
+    repoPath;
+    worktree;
+    branch;
+    localBranch;
+    /** Numbered remote (sandbox-2) matches localBranch (opencode/2) */
+    remoteName;
+    constructor(sandbox, repoPath, worktree, branchNumber) {
+        this.sandbox = sandbox;
+        this.repoPath = repoPath;
+        this.worktree = worktree;
+        this.branch = 'opencode';
+        this.localBranch = `opencode/${branchNumber}`;
+        this.remoteName = `sandbox-${branchNumber}`;
+        this.sandboxGit = new DaytonaSandboxGitManager(sandbox, repoPath);
+        this.hostGit = new HostGitManager();
+    }
+    /**
+     * Allocate and reserve the next opencode/N number in the local repo at `worktree`.
+     * This keeps all host-git concerns inside the git manager layer.
+     */
+    static allocateAndReserveBranchNumber(worktree, prefix = 'opencode') {
+        return new HostGitManager().allocateAndReserveBranchNumber(worktree, prefix);
+    }
+    // In-flight syncs per session. OpenCode dispatches the `event` hook without awaiting it,
+    // so syncs started on session.idle are invisible to callers; tracking them here lets the
+    // delete path and plugin shutdown wait instead of destroying a sandbox mid-sync.
+    static pendingSyncs = new Map();
+    /**
+     * Run `fn` after any in-flight sync for this session and track it until it settles.
+     * The caller of this invocation sees failures; waiters only observe completion.
+     */
+    static enqueueSessionSync(sessionId, fn) {
+        const prev = SessionGitManager.pendingSyncs.get(sessionId) ?? Promise.resolve();
+        const operation = prev.then(fn);
+        const stored = operation.then(() => undefined, () => undefined);
+        SessionGitManager.pendingSyncs.set(sessionId, stored);
+        stored.then(() => {
+            if (SessionGitManager.pendingSyncs.get(sessionId) === stored) {
+                SessionGitManager.pendingSyncs.delete(sessionId);
+            }
+        });
+        return operation;
+    }
+    /** Resolves when the session has no in-flight sync. Never rejects. */
+    static async waitForPendingSync(sessionId) {
+        let pending = SessionGitManager.pendingSyncs.get(sessionId);
+        while (pending) {
+            await pending;
+            const next = SessionGitManager.pendingSyncs.get(sessionId);
+            pending = next === pending ? undefined : next;
+        }
+    }
+    /**
+     * Resolves when no session has an in-flight sync, or when `timeoutMs` elapses first
+     * (returns false in that case). Never rejects. The bound exists for shutdown, where a
+     * sync stalled on an unreachable sandbox must not wedge process exit; the delete path
+     * intentionally waits unbounded instead, because deleting mid-sync loses data.
+     */
+    static async waitForAllPendingSyncs(timeoutMs) {
+        const deadline = timeoutMs === undefined ? undefined : Date.now() + timeoutMs;
+        while (SessionGitManager.pendingSyncs.size > 0) {
+            const waits = [Promise.all([...SessionGitManager.pendingSyncs.values()])];
+            if (deadline !== undefined) {
+                const remaining = deadline - Date.now();
+                if (remaining <= 0)
+                    return false;
+                waits.push(new Promise((resolve) => {
+                    setTimeout(resolve, remaining).unref();
+                }));
+            }
+            await Promise.race(waits);
+            if (deadline !== undefined && Date.now() >= deadline && SessionGitManager.pendingSyncs.size > 0)
+                return false;
+        }
+        return true;
+    }
+    async getSshUrl() {
+        const sshAccess = await this.sandbox.createSshAccess(10);
+        return `ssh://${sshAccess.token}@ssh.app.daytona.io${this.repoPath}`;
+    }
+    hasLocalRepo() {
+        return this.hostGit.hasRepo(this.worktree);
+    }
+    /**
+     * Initialize git in the sandbox and sync with host
+     * Used when a new sandbox is created for a session
+     */
+    async initializeAndSync(pluginCtx) {
+        if (pluginCtx?.client?.tui) {
+            toast.initialize(pluginCtx.client.tui);
+        }
+        try {
+            // Check if local git repo exists before initializing sandbox repo
+            if (!this.hostGit.hasRepo(this.worktree)) {
+                // Always ensure the directory exists, even if git syncing is disabled
+                await this.sandboxGit.ensureDirectory();
+                logger.warn('No local git repository found. Git syncing is disabled.');
+                toast.show({
+                    title: 'Git syncing disabled',
+                    message: 'No local git repository found. Git syncing is disabled for this session.',
+                    variant: 'warning',
+                });
+                return;
+            }
+            await this.sandboxGit.ensureRepo();
+            const sshUrl = await this.getSshUrl();
+            const pushed = await this.hostGit.pushLocalToSandboxRemote(this.remoteName, sshUrl, this.branch, this.worktree);
+            if (pushed) {
+                await this.sandboxGit.resetToRemote(this.branch);
+            }
+        }
+        catch (err) {
+            toast.show({
+                title: 'Git sync error',
+                message: err?.message || 'Failed to sync git repo.',
+                variant: 'error',
+            });
+            throw err;
+        }
+    }
+    /**
+     * Auto-commit in the sandbox and pull latest from host
+     * Used on session idle
+     * Returns true if changes were synced, false if no changes or no local repo
+     */
+    async autoCommitAndPull(pluginCtx) {
+        if (pluginCtx?.client?.tui) {
+            toast.initialize(pluginCtx.client.tui);
+        }
+        try {
+            // Check if local git repo exists before attempting any git operations
+            if (!this.hostGit.hasRepo(this.worktree)) {
+                logger.warn('No local git repository found. Git syncing is disabled.');
+                return false;
+            }
+            await this.sandboxGit.ensureRepo();
+            await this.sandboxGit.autoCommit();
+            // Pull whenever the sandbox tip differs from the local opencode/N ref, not only
+            // when this call created a commit: a previous sync may have committed in the
+            // sandbox and then failed to pull, and a status-only check would skip those
+            // stranded commits forever (and let the delete path destroy them).
+            const sandboxHead = await this.sandboxGit.getHeadOid();
+            if (!sandboxHead || sandboxHead === this.hostGit.getRefOid(this.worktree, `refs/heads/${this.localBranch}`)) {
+                return false;
+            }
+            const sshUrl = await this.getSshUrl();
+            // Pull the branch the sandbox actually committed to, which may differ from the
+            // initial 'opencode' branch, so commits are never left unsynced.
+            const sandboxBranch = await this.sandboxGit.getCurrentBranch();
+            await this.hostGit.pull(this.remoteName, sshUrl, sandboxBranch, this.worktree, this.localBranch);
+            toast.show({
+                title: 'Changes synced',
+                message: `Changes have been synced to ${this.localBranch} in your local repository`,
+                variant: 'success',
+            });
+            return true;
+        }
+        catch (err) {
+            toast.show({
+                title: 'Sync failed',
+                message: err?.message || 'Failed to auto-commit and pull.',
+                variant: 'error',
+            });
+            logger.error(`[idle/git] error sandboxId=${this.sandbox.id}: ${err}`);
+            throw err;
+        }
+    }
+}
+//# sourceMappingURL=session-git-manager.js.map

package/.opencode/plugin/daytona/git/session-git-manager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-git-manager.js","sourceRoot":"","sources":["session-git-manager.ts"],"names":[],"mappings":"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"}

package/.opencode/plugin/daytona/git/session-git-manager.ts

@@ -0,0 +1,203 @@
+/**
+ * Copyright Daytona Platforms Inc.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type { Sandbox } from '@daytona/sdk'
+import { logger } from '../core/logger'
+import { toast } from '../core/toast'
+import { DaytonaSandboxGitManager } from './sandbox-git-manager'
+import { HostGitManager } from './host-git-manager'
+import type { PluginInput } from '@opencode-ai/plugin'
+
+/**
+ * SessionGitManager: Combines DaytonaSandboxGitManager and HostGitManager for session lifecycle git operations.
+ */
+export class SessionGitManager {
+  private readonly sandboxGit: DaytonaSandboxGitManager
+  private readonly hostGit: HostGitManager
+  private readonly sandbox: Sandbox
+  private readonly repoPath: string
+  private readonly worktree: string
+  private readonly branch: string
+  private readonly localBranch: string
+  /** Numbered remote (sandbox-2) matches localBranch (opencode/2) */
+  private readonly remoteName: string
+
+  constructor(sandbox: Sandbox, repoPath: string, worktree: string, branchNumber: number) {
+    this.sandbox = sandbox
+    this.repoPath = repoPath
+    this.worktree = worktree
+    this.branch = 'opencode'
+    this.localBranch = `opencode/${branchNumber}`
+    this.remoteName = `sandbox-${branchNumber}`
+    this.sandboxGit = new DaytonaSandboxGitManager(sandbox, repoPath)
+    this.hostGit = new HostGitManager()
+  }
+
+  /**
+   * Allocate and reserve the next opencode/N number in the local repo at `worktree`.
+   * This keeps all host-git concerns inside the git manager layer.
+   */
+  static allocateAndReserveBranchNumber(worktree: string, prefix = 'opencode'): number {
+    return new HostGitManager().allocateAndReserveBranchNumber(worktree, prefix)
+  }
+
+  // In-flight syncs per session. OpenCode dispatches the `event` hook without awaiting it,
+  // so syncs started on session.idle are invisible to callers; tracking them here lets the
+  // delete path and plugin shutdown wait instead of destroying a sandbox mid-sync.
+  private static pendingSyncs = new Map<string, Promise<void>>()
+
+  /**
+   * Run `fn` after any in-flight sync for this session and track it until it settles.
+   * The caller of this invocation sees failures; waiters only observe completion.
+   */
+  static enqueueSessionSync<T>(sessionId: string, fn: () => Promise<T>): Promise<T> {
+    const prev = SessionGitManager.pendingSyncs.get(sessionId) ?? Promise.resolve()
+    const operation = prev.then(fn)
+    const stored: Promise<void> = operation.then(
+      () => undefined,
+      () => undefined,
+    )
+    SessionGitManager.pendingSyncs.set(sessionId, stored)
+    stored.then(() => {
+      if (SessionGitManager.pendingSyncs.get(sessionId) === stored) {
+        SessionGitManager.pendingSyncs.delete(sessionId)
+      }
+    })
+    return operation
+  }
+
+  /** Resolves when the session has no in-flight sync. Never rejects. */
+  static async waitForPendingSync(sessionId: string): Promise<void> {
+    let pending = SessionGitManager.pendingSyncs.get(sessionId)
+    while (pending) {
+      await pending
+      const next = SessionGitManager.pendingSyncs.get(sessionId)
+      pending = next === pending ? undefined : next
+    }
+  }
+
+  /**
+   * Resolves when no session has an in-flight sync, or when `timeoutMs` elapses first
+   * (returns false in that case). Never rejects. The bound exists for shutdown, where a
+   * sync stalled on an unreachable sandbox must not wedge process exit; the delete path
+   * intentionally waits unbounded instead, because deleting mid-sync loses data.
+   */
+  static async waitForAllPendingSyncs(timeoutMs?: number): Promise<boolean> {
+    const deadline = timeoutMs === undefined ? undefined : Date.now() + timeoutMs
+    while (SessionGitManager.pendingSyncs.size > 0) {
+      const waits: Promise<unknown>[] = [Promise.all([...SessionGitManager.pendingSyncs.values()])]
+      if (deadline !== undefined) {
+        const remaining = deadline - Date.now()
+        if (remaining <= 0) return false
+        waits.push(
+          new Promise<void>((resolve) => {
+            setTimeout(resolve, remaining).unref()
+          }),
+        )
+      }
+      await Promise.race(waits)
+      if (deadline !== undefined && Date.now() >= deadline && SessionGitManager.pendingSyncs.size > 0) return false
+    }
+    return true
+  }
+
+  private async getSshUrl(): Promise<string> {
+    const sshAccess = await this.sandbox.createSshAccess(10)
+    return `ssh://${sshAccess.token}@ssh.app.daytona.io${this.repoPath}`
+  }
+
+  hasLocalRepo(): boolean {
+    return this.hostGit.hasRepo(this.worktree)
+  }
+
+  /**
+   * Initialize git in the sandbox and sync with host
+   * Used when a new sandbox is created for a session
+   */
+  async initializeAndSync(pluginCtx?: PluginInput) {
+    if (pluginCtx?.client?.tui) {
+      toast.initialize(pluginCtx.client.tui)
+    }
+    try {
+      // Check if local git repo exists before initializing sandbox repo
+      if (!this.hostGit.hasRepo(this.worktree)) {
+        // Always ensure the directory exists, even if git syncing is disabled
+        await this.sandboxGit.ensureDirectory()
+        logger.warn('No local git repository found. Git syncing is disabled.')
+        toast.show({
+          title: 'Git syncing disabled',
+          message: 'No local git repository found. Git syncing is disabled for this session.',
+          variant: 'warning',
+        })
+        return
+      }
+
+      await this.sandboxGit.ensureRepo()
+      const sshUrl = await this.getSshUrl()
+      const pushed = await this.hostGit.pushLocalToSandboxRemote(this.remoteName, sshUrl, this.branch, this.worktree)
+      if (pushed) {
+        await this.sandboxGit.resetToRemote(this.branch)
+      }
+    } catch (err: any) {
+      toast.show({
+        title: 'Git sync error',
+        message: err?.message || 'Failed to sync git repo.',
+        variant: 'error',
+      })
+      throw err
+    }
+  }
+
+  /**
+   * Auto-commit in the sandbox and pull latest from host
+   * Used on session idle
+   * Returns true if changes were synced, false if no changes or no local repo
+   */
+  async autoCommitAndPull(pluginCtx?: PluginInput): Promise<boolean> {
+    if (pluginCtx?.client?.tui) {
+      toast.initialize(pluginCtx.client.tui)
+    }
+    try {
+      // Check if local git repo exists before attempting any git operations
+      if (!this.hostGit.hasRepo(this.worktree)) {
+        logger.warn('No local git repository found. Git syncing is disabled.')
+        return false
+      }
+
+      await this.sandboxGit.ensureRepo()
+      await this.sandboxGit.autoCommit()
+
+      // Pull whenever the sandbox tip differs from the local opencode/N ref, not only
+      // when this call created a commit: a previous sync may have committed in the
+      // sandbox and then failed to pull, and a status-only check would skip those
+      // stranded commits forever (and let the delete path destroy them).
+      const sandboxHead = await this.sandboxGit.getHeadOid()
+      if (!sandboxHead || sandboxHead === this.hostGit.getRefOid(this.worktree, `refs/heads/${this.localBranch}`)) {
+        return false
+      }
+
+      const sshUrl = await this.getSshUrl()
+
+      // Pull the branch the sandbox actually committed to, which may differ from the
+      // initial 'opencode' branch, so commits are never left unsynced.
+      const sandboxBranch = await this.sandboxGit.getCurrentBranch()
+      await this.hostGit.pull(this.remoteName, sshUrl, sandboxBranch, this.worktree, this.localBranch)
+      toast.show({
+        title: 'Changes synced',
+        message: `Changes have been synced to ${this.localBranch} in your local repository`,
+        variant: 'success',
+      })
+      return true
+    } catch (err: any) {
+      toast.show({
+        title: 'Sync failed',
+        message: err?.message || 'Failed to auto-commit and pull.',
+        variant: 'error',
+      })
+      logger.error(`[idle/git] error sandboxId=${this.sandbox.id}: ${err}`)
+      throw err
+    }
+  }
+}

package/.opencode/plugin/daytona/index.d.ts

@@ -0,0 +1,125 @@
+/**
+ * Copyright Daytona Platforms Inc.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { PluginInput } from '@opencode-ai/plugin';
+export type { EventSessionDeleted, LogLevel, SandboxInfo, SessionInfo, ProjectSessionData } from './core/types';
+declare function daytonaPlugin(ctx: PluginInput): Promise<{
+    tool: {
+        bash: {
+            description: string;
+            args: {
+                command: import("zod").ZodString;
+                background: import("zod").ZodOptional<import("zod").ZodBoolean>;
+            };
+            execute(args: {
+                command: string;
+                background?: boolean;
+            }, ctx: import("@opencode-ai/plugin").ToolContext): Promise<string>;
+        };
+        read: {
+            description: string;
+            args: {
+                filePath: import("zod").ZodString;
+            };
+            execute(args: {
+                filePath: string;
+            }, ctx: import("@opencode-ai/plugin").ToolContext): Promise<string>;
+        };
+        write: {
+            description: string;
+            args: {
+                filePath: import("zod").ZodString;
+                content: import("zod").ZodString;
+            };
+            execute(args: {
+                filePath: string;
+                content: string;
+            }, ctx: import("@opencode-ai/plugin").ToolContext): Promise<string>;
+        };
+        edit: {
+            description: string;
+            args: {
+                filePath: import("zod").ZodString;
+                oldString: import("zod").ZodString;
+                newString: import("zod").ZodString;
+            };
+            execute(args: {
+                filePath: string;
+                oldString: string;
+                newString: string;
+            }, ctx: import("@opencode-ai/plugin").ToolContext): Promise<string>;
+        };
+        multiedit: {
+            description: string;
+            args: {
+                filePath: import("zod").ZodString;
+                edits: import("zod").ZodArray<import("zod").ZodObject<{
+                    oldString: import("zod").ZodString;
+                    newString: import("zod").ZodString;
+                }, import("zod/v4/core").$strip>>;
+            };
+            execute(args: {
+                filePath: string;
+                edits: Array<{
+                    oldString: string;
+                    newString: string;
+                }>;
+            }, ctx: import("@opencode-ai/plugin").ToolContext): Promise<string>;
+        };
+        ls: {
+            description: string;
+            args: {
+                dirPath: import("zod").ZodOptional<import("zod").ZodString>;
+            };
+            execute(args: {
+                dirPath?: string;
+            }, ctx: import("@opencode-ai/plugin").ToolContext): Promise<string>;
+        };
+        glob: {
+            description: string;
+            args: {
+                pattern: import("zod").ZodString;
+            };
+            execute(args: {
+                pattern: string;
+            }, ctx: import("@opencode-ai/plugin").ToolContext): Promise<string>;
+        };
+        grep: {
+            description: string;
+            args: {
+                pattern: import("zod").ZodString;
+            };
+            execute(args: {
+                pattern: string;
+            }, ctx: import("@opencode-ai/plugin").ToolContext): Promise<string>;
+        };
+        getPreviewURL: {
+            description: string;
+            args: {
+                port: import("zod").ZodNumber;
+            };
+            execute(args: {
+                port: number;
+            }, ctx: import("@opencode-ai/plugin").ToolContext): Promise<string>;
+        };
+        gitSync: {
+            description: string;
+            args: {};
+            execute(_args: {}, ctx: import("@opencode-ai/plugin").ToolContext): Promise<string>;
+        };
+        verisReceipt: {
+            description: string;
+            args: {
+                service: import("zod").ZodOptional<import("zod").ZodString>;
+            };
+            execute(args: {
+                service?: string;
+            }, ctx: import("@opencode-ai/plugin").ToolContext): Promise<string>;
+        };
+    };
+    event: (args: any) => Promise<void>;
+    'experimental.chat.system.transform': (input: import("./core/types").ExperimentalChatSystemTransformInput, output: import("./core/types").ExperimentalChatSystemTransformOutput) => Promise<void>;
+    dispose: () => Promise<void>;
+}>;
+export default daytonaPlugin;

package/.opencode/plugin/daytona/index.js

@@ -0,0 +1,60 @@
+/**
+ * Copyright Daytona Platforms Inc.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * OpenCode Plugin: Daytona Sandbox Integration
+ *
+ * OpenCode plugins extend the AI coding assistant by adding custom tools, handling events,
+ * and modifying behavior. Plugins are TypeScript/JavaScript modules that export functions
+ * which return hooks for various lifecycle events.
+ *
+ * This plugin integrates Daytona sandboxes with OpenCode, providing isolated development
+ * environments for each session. It adds custom tools for file operations, command execution,
+ * and search within sandboxes, and automatically cleans up resources when sessions end.
+ *
+ * Learn more: https://opencode.ai/docs/plugins/
+ *
+ * Daytona Sandbox Integration Tools
+ *
+ * Requires:
+ * - npm install @daytona/sdk
+ * - Environment: DAYTONA_API_KEY
+ * - Environment (optional): DAYTONA_SNAPSHOT - snapshot to create sandboxes from
+ */
+import { join } from 'path';
+import { homedir } from 'os';
+import { xdgData } from 'xdg-basedir';
+import { logger, setLogFilePath } from './core/logger';
+import { DaytonaSessionManager } from './core/session-manager';
+import { SessionGitManager } from './git/session-git-manager';
+import { toast } from './core/toast';
+import { customTools } from './plugins/custom-tools';
+import { eventHandlers } from './plugins/session-events';
+import { systemPromptTransform } from './plugins/system-transform';
+const xdgDataDir = xdgData ?? join(homedir(), '.local', 'share');
+const LOG_FILE = join(xdgDataDir, 'opencode', 'log', 'daytona.log');
+const STORAGE_DIR = join(xdgDataDir, 'opencode', 'storage', 'daytona');
+const REPO_PATH = '/home/daytona/project';
+setLogFilePath(LOG_FILE);
+const sessionManager = new DaytonaSessionManager(process.env.DAYTONA_API_KEY || '', STORAGE_DIR, REPO_PATH, process.env.DAYTONA_SNAPSHOT);
+async function daytonaPlugin(ctx) {
+    toast.initialize(ctx.client?.tui);
+    return {
+        tool: await customTools(ctx, sessionManager),
+        event: await eventHandlers(ctx, sessionManager, REPO_PATH),
+        'experimental.chat.system.transform': await systemPromptTransform(ctx, REPO_PATH),
+        // Awaited by OpenCode when the plugin scope closes (newer than the published Hooks
+        // type, ignored by older versions). Draining here keeps a graceful shutdown from
+        // abandoning a git sync that the unawaited `event` hook started on session.idle.
+        // Bounded so a sync stalled on an unreachable sandbox cannot wedge process exit.
+        dispose: async () => {
+            const drained = await SessionGitManager.waitForAllPendingSyncs(60_000);
+            if (!drained) {
+                logger.warn('[dispose] exiting with git syncs still pending after 60s; a sync may be stalled');
+            }
+        },
+    };
+}
+export default daytonaPlugin;
+//# sourceMappingURL=index.js.map

package/.opencode/plugin/daytona/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAA;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAErC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAIlE,MAAM,UAAU,GAAG,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;AAChE,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,aAAa,CAAC,CAAA;AACnE,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,CAAC,CAAA;AACtE,MAAM,SAAS,GAAG,uBAAuB,CAAA;AAEzC,cAAc,CAAC,QAAQ,CAAC,CAAA;AACxB,MAAM,cAAc,GAAG,IAAI,qBAAqB,CAC9C,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,EAAE,EACjC,WAAW,EACX,SAAS,EACT,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAC7B,CAAA;AAED,KAAK,UAAU,aAAa,CAAC,GAAgB;IAC3C,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACjC,OAAO;QACL,IAAI,EAAE,MAAM,WAAW,CAAC,GAAG,EAAE,cAAc,CAAC;QAC5C,KAAK,EAAE,MAAM,aAAa,CAAC,GAAG,EAAE,cAAc,EAAE,SAAS,CAAC;QAC1D,oCAAoC,EAAE,MAAM,qBAAqB,CAAC,GAAG,EAAE,SAAS,CAAC;QACjF,mFAAmF;QACnF,iFAAiF;QACjF,iFAAiF;QACjF,iFAAiF;QACjF,OAAO,EAAE,KAAK,IAAI,EAAE;YAClB,MAAM,OAAO,GAAG,MAAM,iBAAiB,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAA;YACtE,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,CAAC,IAAI,CAAC,iFAAiF,CAAC,CAAA;YAChG,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC;AAED,eAAe,aAAa,CAAA"}

package/.opencode/plugin/daytona/index.ts

@@ -0,0 +1,73 @@
+/**
+ * Copyright Daytona Platforms Inc.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * OpenCode Plugin: Daytona Sandbox Integration
+ *
+ * OpenCode plugins extend the AI coding assistant by adding custom tools, handling events,
+ * and modifying behavior. Plugins are TypeScript/JavaScript modules that export functions
+ * which return hooks for various lifecycle events.
+ *
+ * This plugin integrates Daytona sandboxes with OpenCode, providing isolated development
+ * environments for each session. It adds custom tools for file operations, command execution,
+ * and search within sandboxes, and automatically cleans up resources when sessions end.
+ *
+ * Learn more: https://opencode.ai/docs/plugins/
+ *
+ * Daytona Sandbox Integration Tools
+ *
+ * Requires:
+ * - npm install @daytona/sdk
+ * - Environment: DAYTONA_API_KEY
+ * - Environment (optional): DAYTONA_SNAPSHOT - snapshot to create sandboxes from
+ */
+
+import { join } from 'path'
+import { homedir } from 'os'
+import { xdgData } from 'xdg-basedir'
+import type { PluginInput } from '@opencode-ai/plugin'
+import { logger, setLogFilePath } from './core/logger'
+import { DaytonaSessionManager } from './core/session-manager'
+import { SessionGitManager } from './git/session-git-manager'
+import { toast } from './core/toast'
+import { customTools } from './plugins/custom-tools'
+import { eventHandlers } from './plugins/session-events'
+import { systemPromptTransform } from './plugins/system-transform'
+
+export type { EventSessionDeleted, LogLevel, SandboxInfo, SessionInfo, ProjectSessionData } from './core/types'
+
+const xdgDataDir = xdgData ?? join(homedir(), '.local', 'share')
+const LOG_FILE = join(xdgDataDir, 'opencode', 'log', 'daytona.log')
+const STORAGE_DIR = join(xdgDataDir, 'opencode', 'storage', 'daytona')
+const REPO_PATH = '/home/daytona/project'
+
+setLogFilePath(LOG_FILE)
+const sessionManager = new DaytonaSessionManager(
+  process.env.DAYTONA_API_KEY || '',
+  STORAGE_DIR,
+  REPO_PATH,
+  process.env.DAYTONA_SNAPSHOT,
+)
+
+async function daytonaPlugin(ctx: PluginInput) {
+  toast.initialize(ctx.client?.tui)
+  return {
+    tool: await customTools(ctx, sessionManager),
+    event: await eventHandlers(ctx, sessionManager, REPO_PATH),
+    'experimental.chat.system.transform': await systemPromptTransform(ctx, REPO_PATH),
+    // Awaited by OpenCode when the plugin scope closes (newer than the published Hooks
+    // type, ignored by older versions). Draining here keeps a graceful shutdown from
+    // abandoning a git sync that the unawaited `event` hook started on session.idle.
+    // Bounded so a sync stalled on an unreachable sandbox cannot wedge process exit.
+    dispose: async () => {
+      const drained = await SessionGitManager.waitForAllPendingSyncs(60_000)
+      if (!drained) {
+        logger.warn('[dispose] exiting with git syncs still pending after 60s; a sync may be stalled')
+      }
+    },
+  }
+}
+
+export default daytonaPlugin