@agentmeshhq/agent 0.1.16 → 0.1.17

package/src/core/session-id.ts

@@ -0,0 +1,111 @@
+/**
+ * OpenCode Session ID Utilities
+ *
+ * Parses OpenCode log files to extract the active session ID (ses_XXXXX).
+ * Used for native session resumption via `opencode --session <id> --continue`.
+ */
+
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+
+const SESSION_ID_PATTERN = /service=session\s+id=(ses_[A-Za-z0-9]+)/;
+
+function getLogDir(agentName: string): string {
+  return path.join(os.homedir(), ".agentmesh", "opencode-data", agentName, "opencode", "log");
+}
+
+/**
+ * Gets the latest OpenCode session ID from agent log files.
+ *
+ * Parses log files in ~/.agentmesh/opencode-data/<agentName>/opencode/log/
+ * for the pattern: `service=session id=ses_XXXXX ... created`
+ *
+ * @returns The session ID string (e.g. "ses_365c3ec5bffeAV7qWirhNr1sU9") or null
+ */
+export function getLatestSessionId(agentName: string): string | null {
+  const logDir = getLogDir(agentName);
+
+  if (!fs.existsSync(logDir)) {
+    return null;
+  }
+
+  try {
+    // List log files sorted by name (they're timestamped, so newest last)
+    const logFiles = fs
+      .readdirSync(logDir)
+      .filter((f) => f.endsWith(".log"))
+      .sort();
+
+    if (logFiles.length === 0) {
+      return null;
+    }
+
+    // Search from newest log file backwards
+    for (let i = logFiles.length - 1; i >= 0; i--) {
+      const logPath = path.join(logDir, logFiles[i]);
+      const content = fs.readFileSync(logPath, "utf-8");
+
+      // Find all session creation lines and take the last one
+      const lines = content.split("\n");
+      let lastSessionId: string | null = null;
+
+      for (const line of lines) {
+        if (line.includes("service=session") && line.includes("created")) {
+          const match = line.match(SESSION_ID_PATTERN);
+          if (match) {
+            lastSessionId = match[1];
+          }
+        }
+      }
+
+      if (lastSessionId) {
+        return lastSessionId;
+      }
+    }
+
+    return null;
+  } catch (error) {
+    console.error(`[SESSION-ID] Failed to parse logs for ${agentName}:`, error);
+    return null;
+  }
+}
+
+/**
+ * Waits for OpenCode to write a NEW session ID to logs (different from `previousId`).
+ * Polls log files up to `maxWaitMs` with `intervalMs` between checks.
+ *
+ * This solves the race condition where we read logs before OpenCode has started
+ * and see the old session ID, falsely concluding resume succeeded.
+ *
+ * @returns The new session ID, or null if timeout or no new session appeared
+ */
+export async function waitForNewSessionId(
+  agentName: string,
+  previousId: string | null,
+  maxWaitMs = 15000,
+  intervalMs = 1000,
+): Promise<string | null> {
+  const deadline = Date.now() + maxWaitMs;
+
+  while (Date.now() < deadline) {
+    const currentId = getLatestSessionId(agentName);
+
+    // If we see a different session ID than before, OpenCode has started
+    if (currentId && currentId !== previousId) {
+      return currentId;
+    }
+
+    await new Promise((resolve) => setTimeout(resolve, intervalMs));
+  }
+
+  return null;
+}
+
+/**
+ * Snapshots the latest session ID BEFORE starting OpenCode.
+ * Used to detect whether OpenCode created a new session or resumed the requested one.
+ */
+export function snapshotSessionId(agentName: string): string | null {
+  return getLatestSessionId(agentName);
+}

package/src/core/tmux.ts

@@ -31,6 +31,7 @@ export function createSession(
   command: string,
   workdir?: string,
   env?: SessionEnv,
+  opencodeSessionId?: string,
 ): boolean {
   const sessionName = getSessionName(agentName);
 
@@ -92,6 +93,17 @@ export function createSession(
       }
     }
 
+    // Append --session --continue flags for native session resume
+    if (
+      opencodeSessionId &&
+      (finalCommand === "opencode" || finalCommand.startsWith("opencode ")) &&
+      !finalCommand.includes("--session") &&
+      !finalCommand.includes("--continue")
+    ) {
+      finalCommand = `${finalCommand} --session ${opencodeSessionId} --continue`;
+      console.log(`[TMUX] Resuming OpenCode session: ${opencodeSessionId}`);
+    }
+
     const fullCommand = `${envPrefix}${finalCommand}`;
 
     // Set reasonable terminal size for TUI applications

package/src/core/watchdog.ts

@@ -6,7 +6,6 @@
  */
 
 import { execSync, spawnSync } from "node:child_process";
-import fs from "node:fs";
 import { captureSessionOutput } from "./tmux.js";
 
 export type WatchdogStatus = "active" | "idle" | "stuck" | "permission_blocked";
@@ -139,12 +138,8 @@ export function getLastActivityTime(agentName: string, containerName?: string):
       }
       logLine = result.stdout.trim();
     } else {
-      // Non-sandbox mode: read from agent-isolated log directory
-      // Each agent has its own XDG_DATA_HOME at ~/.agentmesh/opencode-data/<agent>/
-      const agentLogDir = `${process.env.HOME}/.agentmesh/opencode-data/${agentName}/opencode/log`;
-      const sharedLogDir = `${process.env.HOME}/.local/share/opencode/log`;
-      // Prefer agent-specific logs, fall back to shared dir for backwards compatibility
-      const logDir = fs.existsSync(agentLogDir) ? agentLogDir : sharedLogDir;
+      // Non-sandbox mode: read from local logs
+      const logDir = `${process.env.HOME}/.local/share/opencode/log`;
       const result = spawnSync(
         "sh",
         ["-c", `ls -t ${logDir}/*.log 2>/dev/null | head -1 | xargs tail -1 2>/dev/null`],