@agentmeshhq/agent 0.1.8 → 0.1.9

package/src/core/runner.ts

@@ -0,0 +1,200 @@
+/**
+ * Runner Module
+ * Handles model resolution, validation, and runner-specific configuration
+ */
+
+import { execSync } from "node:child_process";
+
+// ============================================================================
+// Types
+// ============================================================================
+
+export type RunnerType = "opencode" | "claude" | "custom";
+
+export interface RunnerConfig {
+  type: RunnerType;
+  command: string;
+  model: string;
+  env: Record<string, string>;
+}
+
+export interface ModelResolutionInput {
+  cliModel?: string;
+  agentModel?: string;
+  defaultModel: string;
+  command: string;
+}
+
+// ============================================================================
+// Runner Detection
+// ============================================================================
+
+/**
+ * Detects the runner type from the command
+ */
+export function detectRunner(command: string): RunnerType {
+  const cmd = command.toLowerCase().trim();
+
+  if (cmd === "opencode" || cmd.startsWith("opencode ")) {
+    return "opencode";
+  }
+
+  if (cmd === "claude" || cmd.startsWith("claude ")) {
+    return "claude";
+  }
+
+  return "custom";
+}
+
+// ============================================================================
+// Model Resolution
+// ============================================================================
+
+/**
+ * Resolves the effective model from CLI > agent config > defaults
+ */
+export function resolveModel(input: ModelResolutionInput): string {
+  // Priority: CLI flag > agent config > default
+  return input.cliModel || input.agentModel || input.defaultModel;
+}
+
+// ============================================================================
+// OpenCode Integration
+// ============================================================================
+
+let cachedOpenCodeModels: string[] | null = null;
+
+/**
+ * Gets available OpenCode models (cached)
+ */
+export function getOpenCodeModels(): string[] {
+  if (cachedOpenCodeModels) {
+    return cachedOpenCodeModels;
+  }
+
+  try {
+    const output = execSync("opencode models 2>/dev/null", {
+      encoding: "utf-8",
+      timeout: 10000,
+    });
+
+    cachedOpenCodeModels = output
+      .split("\n")
+      .map((line) => line.trim())
+      .filter((line) => line.length > 0 && !line.startsWith("#"));
+
+    return cachedOpenCodeModels;
+  } catch {
+    // OpenCode not available or failed
+    return [];
+  }
+}
+
+/**
+ * Validates that a model is available in OpenCode
+ */
+export function validateOpenCodeModel(model: string): { valid: boolean; error?: string } {
+  const models = getOpenCodeModels();
+
+  // If we couldn't get models list, allow any (graceful degradation)
+  if (models.length === 0) {
+    return { valid: true };
+  }
+
+  if (models.includes(model)) {
+    return { valid: true };
+  }
+
+  // Check for partial match (e.g., "claude-sonnet-4" matches "anthropic/claude-sonnet-4")
+  const partialMatch = models.find(
+    (m) => m.endsWith(`/${model}`) || m === model || m.split("/").pop() === model,
+  );
+
+  if (partialMatch) {
+    return { valid: true };
+  }
+
+  return {
+    valid: false,
+    error: `Model "${model}" not found in OpenCode. Run 'opencode models' to see available models.`,
+  };
+}
+
+/**
+ * Normalizes a model name for OpenCode
+ * e.g., "claude-sonnet-4" -> "anthropic/claude-sonnet-4" if that's what OpenCode expects
+ */
+export function normalizeOpenCodeModel(model: string): string {
+  const models = getOpenCodeModels();
+
+  // Direct match
+  if (models.includes(model)) {
+    return model;
+  }
+
+  // Try to find full path version
+  const fullPath = models.find((m) => m.endsWith(`/${model}`) || m.split("/").pop() === model);
+
+  return fullPath || model;
+}
+
+// ============================================================================
+// Runner Configuration
+// ============================================================================
+
+/**
+ * Builds the complete runner configuration including environment variables
+ */
+export function buildRunnerConfig(input: ModelResolutionInput): RunnerConfig {
+  const runnerType = detectRunner(input.command);
+  const model = resolveModel(input);
+  const env: Record<string, string> = {};
+
+  switch (runnerType) {
+    case "opencode": {
+      // Validate model for OpenCode
+      const validation = validateOpenCodeModel(model);
+      if (!validation.valid) {
+        console.warn(`Warning: ${validation.error}`);
+      }
+
+      // Normalize and set OPENCODE_MODEL
+      const normalizedModel = normalizeOpenCodeModel(model);
+      env.OPENCODE_MODEL = normalizedModel;
+      break;
+    }
+
+    case "claude": {
+      // Claude CLI uses ANTHROPIC_MODEL or similar
+      // For now, just pass the model - Claude CLI will handle it
+      env.CLAUDE_MODEL = model;
+      break;
+    }
+
+    case "custom":
+      // Custom runners don't get automatic model env
+      // User is responsible for configuring their tool
+      break;
+  }
+
+  return {
+    type: runnerType,
+    command: input.command,
+    model,
+    env,
+  };
+}
+
+/**
+ * Gets a human-readable runner name
+ */
+export function getRunnerDisplayName(runnerType: RunnerType): string {
+  switch (runnerType) {
+    case "opencode":
+      return "OpenCode";
+    case "claude":
+      return "Claude CLI";
+    case "custom":
+      return "Custom";
+  }
+}

package/src/core/tmux.ts

@@ -18,6 +18,9 @@ export function sessionExists(sessionName: string): boolean {
 export interface SessionEnv {
   AGENT_TOKEN?: string;
   AGENTMESH_AGENT_ID?: string;
+  OPENCODE_MODEL?: string;
+  CLAUDE_MODEL?: string;
+  [key: string]: string | undefined;
 }
 
 export function createSession(
@@ -34,17 +37,36 @@ export function createSession(
   }
 
   try {
+    // Build environment prefix for the command
+    // This ensures env vars are set BEFORE the process starts
+    let envPrefix = "";
+    if (env) {
+      const envParts: string[] = [];
+      for (const [key, value] of Object.entries(env)) {
+        if (value !== undefined && value !== "") {
+          // Escape special characters in value
+          const escapedValue = value.replace(/"/g, '\\"');
+          envParts.push(`${key}="${escapedValue}"`);
+        }
+      }
+      if (envParts.length > 0) {
+        envPrefix = envParts.join(" ") + " ";
+      }
+    }
+
+    const fullCommand = `${envPrefix}${command}`;
+
     const args = ["new-session", "-d", "-s", sessionName];
 
     if (workdir) {
       args.push("-c", workdir);
     }
 
-    args.push(command);
+    args.push(fullCommand);
 
     execSync(`tmux ${args.join(" ")}`);
 
-    // Inject environment variables after session creation
+    // Also set session environment for any subsequent processes/refreshes
     if (env) {
       setSessionEnvironment(sessionName, env);
     }
@@ -58,13 +80,10 @@ export function createSession(
 
 export function setSessionEnvironment(sessionName: string, env: SessionEnv): boolean {
   try {
-    if (env.AGENT_TOKEN) {
-      execSync(`tmux set-environment -t "${sessionName}" AGENT_TOKEN "${env.AGENT_TOKEN}"`);
-    }
-    if (env.AGENTMESH_AGENT_ID) {
-      execSync(
-        `tmux set-environment -t "${sessionName}" AGENTMESH_AGENT_ID "${env.AGENTMESH_AGENT_ID}"`,
-      );
+    for (const [key, value] of Object.entries(env)) {
+      if (value !== undefined && value !== "") {
+        execSync(`tmux set-environment -t "${sessionName}" ${key} "${value}"`);
+      }
     }
     return true;
   } catch (error) {