@agentmeshhq/agent 0.1.8 → 0.1.9

package/dist/core/runner.js

@@ -0,0 +1,148 @@
+/**
+ * Runner Module
+ * Handles model resolution, validation, and runner-specific configuration
+ */
+import { execSync } from "node:child_process";
+// ============================================================================
+// Runner Detection
+// ============================================================================
+/**
+ * Detects the runner type from the command
+ */
+export function detectRunner(command) {
+    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) {
+    // Priority: CLI flag > agent config > default
+    return input.cliModel || input.agentModel || input.defaultModel;
+}
+// ============================================================================
+// OpenCode Integration
+// ============================================================================
+let cachedOpenCodeModels = null;
+/**
+ * Gets available OpenCode models (cached)
+ */
+export function getOpenCodeModels() {
+    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) {
+    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) {
+    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) {
+    const runnerType = detectRunner(input.command);
+    const model = resolveModel(input);
+    const env = {};
+    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) {
+    switch (runnerType) {
+        case "opencode":
+            return "OpenCode";
+        case "claude":
+            return "Claude CLI";
+        case "custom":
+            return "Custom";
+    }
+}
+//# sourceMappingURL=runner.js.map

package/dist/core/runner.js.map

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

package/dist/core/tmux.d.ts

@@ -3,6 +3,9 @@ export declare 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 declare function createSession(agentName: string, command: string, workdir?: string, env?: SessionEnv): boolean;
 export declare function setSessionEnvironment(sessionName: string, env: SessionEnv): boolean;

package/dist/core/tmux.js

@@ -19,13 +19,30 @@ export function createSession(agentName, command, workdir, env) {
         return false;
     }
     try {
+        // Build environment prefix for the command
+        // This ensures env vars are set BEFORE the process starts
+        let envPrefix = "";
+        if (env) {
+            const envParts = [];
+            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);
         }
@@ -38,11 +55,10 @@ export function createSession(agentName, command, workdir, env) {
 }
 export function setSessionEnvironment(sessionName, env) {
     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;
     }

package/dist/core/tmux.js.map

@@ -1 +1 @@
-{"version":3,"file":"tmux.js","sourceRoot":"","sources":["../../src/core/tmux.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tmux.js","sourceRoot":"","sources":["../../src/core/tmux.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentmeshhq/agent",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "AgentMesh Agent Wrapper - Turn any AI coding assistant into a dispatchable, nudge-able agent",
   "type": "module",
   "main": "dist/index.js",

package/src/__tests__/runner.test.ts

@@ -0,0 +1,105 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import {
+  buildRunnerConfig,
+  detectRunner,
+  getRunnerDisplayName,
+  type RunnerType,
+  resolveModel,
+} from "../core/runner.js";
+
+describe("Runner Module", () => {
+  describe("detectRunner", () => {
+    it("should detect opencode runner", () => {
+      expect(detectRunner("opencode")).toBe("opencode");
+      expect(detectRunner("opencode --some-flag")).toBe("opencode");
+      expect(detectRunner("OPENCODE")).toBe("opencode");
+    });
+
+    it("should detect claude runner", () => {
+      expect(detectRunner("claude")).toBe("claude");
+      expect(detectRunner("claude --some-flag")).toBe("claude");
+      expect(detectRunner("CLAUDE")).toBe("claude");
+    });
+
+    it("should detect custom runner for unknown commands", () => {
+      expect(detectRunner("aider")).toBe("custom");
+      expect(detectRunner("cursor")).toBe("custom");
+      expect(detectRunner("my-custom-tool")).toBe("custom");
+    });
+  });
+
+  describe("resolveModel", () => {
+    it("should prioritize CLI model over all others", () => {
+      const result = resolveModel({
+        cliModel: "cli-model",
+        agentModel: "agent-model",
+        defaultModel: "default-model",
+        command: "opencode",
+      });
+      expect(result).toBe("cli-model");
+    });
+
+    it("should use agent model when CLI not provided", () => {
+      const result = resolveModel({
+        agentModel: "agent-model",
+        defaultModel: "default-model",
+        command: "opencode",
+      });
+      expect(result).toBe("agent-model");
+    });
+
+    it("should fall back to default model", () => {
+      const result = resolveModel({
+        defaultModel: "default-model",
+        command: "opencode",
+      });
+      expect(result).toBe("default-model");
+    });
+  });
+
+  describe("buildRunnerConfig", () => {
+    it("should build config for opencode with OPENCODE_MODEL env", () => {
+      const config = buildRunnerConfig({
+        cliModel: "claude-sonnet-4",
+        defaultModel: "claude-sonnet-4",
+        command: "opencode",
+      });
+
+      expect(config.type).toBe("opencode");
+      expect(config.model).toBe("claude-sonnet-4");
+      expect(config.env.OPENCODE_MODEL).toBeDefined();
+    });
+
+    it("should build config for claude with CLAUDE_MODEL env", () => {
+      const config = buildRunnerConfig({
+        cliModel: "claude-sonnet-4",
+        defaultModel: "claude-sonnet-4",
+        command: "claude",
+      });
+
+      expect(config.type).toBe("claude");
+      expect(config.model).toBe("claude-sonnet-4");
+      expect(config.env.CLAUDE_MODEL).toBe("claude-sonnet-4");
+    });
+
+    it("should build config for custom runner without env vars", () => {
+      const config = buildRunnerConfig({
+        cliModel: "gpt-4",
+        defaultModel: "claude-sonnet-4",
+        command: "aider",
+      });
+
+      expect(config.type).toBe("custom");
+      expect(config.model).toBe("gpt-4");
+      expect(Object.keys(config.env)).toHaveLength(0);
+    });
+  });
+
+  describe("getRunnerDisplayName", () => {
+    it("should return correct display names", () => {
+      expect(getRunnerDisplayName("opencode")).toBe("OpenCode");
+      expect(getRunnerDisplayName("claude")).toBe("Claude CLI");
+      expect(getRunnerDisplayName("custom")).toBe("Custom");
+    });
+  });
+});

package/src/cli/index.ts

@@ -168,9 +168,10 @@ program
   .command("restart")
   .description("Restart an agent (preserves agent ID)")
   .argument("<name>", "Agent name")
-  .action(async (name) => {
+  .option("-m, --model <model>", "Model to use (default: preserve previous model)")
+  .action(async (name, options) => {
     try {
-      await restart(name);
+      await restart(name, { model: options.model });
     } catch (error) {
       console.error(pc.red((error as Error).message));
       process.exit(1);

package/src/cli/restart.ts

@@ -4,7 +4,11 @@ import { destroySession, getSessionName, sessionExists } from "../core/tmux.js";
 import { start } from "./start.js";
 import { stop } from "./stop.js";
 
-export async function restart(name: string): Promise<void> {
+export interface RestartOptions {
+  model?: string;
+}
+
+export async function restart(name: string, options: RestartOptions = {}): Promise<void> {
   const config = loadConfig();
 
   if (!config) {
@@ -34,6 +38,9 @@ export async function restart(name: string): Promise<void> {
   // Find agent config to get workdir and other settings
   const agentConfig = config.agents.find((a) => a.name === name);
 
+  // Model priority: CLI option > previous runtime model > agent config
+  const effectiveModel = options.model || agent.runtimeModel || agentConfig?.model;
+
   console.log(pc.dim("Starting new session..."));
 
   // Start with the same settings, agent ID will be reused from state
@@ -41,7 +48,7 @@ export async function restart(name: string): Promise<void> {
     name,
     command: agentConfig?.command,
     workdir: agentConfig?.workdir,
-    model: agentConfig?.model,
+    model: effectiveModel,
     foreground: false,
   });
 

package/src/cli/status.ts

@@ -1,5 +1,6 @@
 import pc from "picocolors";
 import { loadConfig, loadState } from "../config/loader.js";
+import { getRunnerDisplayName } from "../core/runner.js";
 import { getSessionName, sessionExists } from "../core/tmux.js";
 
 interface HealthResponse {
@@ -60,7 +61,11 @@ export async function status(): Promise<void> {
   console.log(`  Total:    ${pc.dim(String(state.agents.length))}`);
 
   if (runningAgents.length > 0) {
-    console.log(`  Names:    ${pc.dim(runningAgents.map((a) => a.name).join(", "))}`);
+    console.log(`  Active:`);
+    for (const agent of runningAgents) {
+      const modelInfo = agent.runtimeModel ? ` [${agent.runtimeModel}]` : "";
+      console.log(`    - ${pc.cyan(agent.name)}${pc.dim(modelInfo)}`);
+    }
   }
 
   // Check tmux

package/src/cli/whoami.ts

@@ -1,5 +1,6 @@
 import pc from "picocolors";
 import { loadConfig, loadState } from "../config/loader.js";
+import { getRunnerDisplayName, type RunnerType } from "../core/runner.js";
 import { decodeToken, getTokenExpiry } from "../utils/jwt.js";
 
 export async function whoami(agentName?: string): Promise<void> {
@@ -23,9 +24,18 @@ export async function whoami(agentName?: string): Promise<void> {
       const expiry = getTokenExpiry(envToken);
       const expiryStr = formatExpiry(expiry);
 
+      // Find the agent in state to get model info
+      const agentState = state.agents.find((a) => a.agentId === envAgentId);
+
       console.log(pc.bold("Current Agent"));
       console.log(`  ID:        ${pc.cyan(envAgentId)}`);
       console.log(`  Workspace: ${pc.dim(config.workspace)}`);
+      if (agentState?.runtimeModel) {
+        const runnerName = agentState.runnerType
+          ? getRunnerDisplayName(agentState.runnerType)
+          : "Unknown";
+        console.log(`  Model:     ${pc.cyan(agentState.runtimeModel)} (${pc.dim(runnerName)})`);
+      }
       console.log(`  Token:     ${expiryStr}`);
       console.log(`  Hub:       ${pc.dim(config.hubUrl)}`);
       return;
@@ -49,6 +59,10 @@ export async function whoami(agentName?: string): Promise<void> {
       console.log(`  ${pc.cyan(agent.name)}`);
       console.log(`    ID:      ${pc.dim(agent.agentId)}`);
       console.log(`    Status:  ${running ? pc.green("running") : pc.yellow("stopped")}`);
+      if (agent.runtimeModel) {
+        const runnerName = agent.runnerType ? getRunnerDisplayName(agent.runnerType) : "Unknown";
+        console.log(`    Model:   ${pc.dim(agent.runtimeModel)} (${runnerName})`);
+      }
       console.log(`    Token:   ${expiryStr}`);
       console.log();
     }
@@ -71,6 +85,10 @@ export async function whoami(agentName?: string): Promise<void> {
   console.log(`  ID:        ${pc.cyan(agent.agentId)}`);
   console.log(`  Workspace: ${pc.dim(config.workspace)}`);
   console.log(`  Status:    ${running ? pc.green("running") : pc.yellow("stopped")}`);
+  if (agent.runtimeModel) {
+    const runnerName = agent.runnerType ? getRunnerDisplayName(agent.runnerType) : "Unknown";
+    console.log(`  Model:     ${pc.cyan(agent.runtimeModel)} (${pc.dim(runnerName)})`);
+  }
   console.log(`  Token:     ${expiryStr}`);
   console.log(`  Session:   ${pc.dim(agent.tmuxSession || "none")}`);
   console.log(`  Started:   ${pc.dim(agent.startedAt || "unknown")}`);

package/src/config/schema.ts

@@ -30,6 +30,8 @@ export const DEFAULT_CONFIG: Partial<Config> = {
 export const CONFIG_PATH = `${process.env.HOME}/.agentmesh/config.json`;
 export const STATE_PATH = `${process.env.HOME}/.agentmesh/state.json`;
 
+export type RunnerType = "opencode" | "claude" | "custom";
+
 export interface AgentState {
   name: string;
   agentId: string;
@@ -37,6 +39,10 @@ export interface AgentState {
   tmuxSession: string;
   startedAt: string;
   token?: string;
+  /** The effective runtime model (resolved from CLI > agent > defaults) */
+  runtimeModel?: string;
+  /** The runner type (opencode, claude, custom) */
+  runnerType?: RunnerType;
 }
 
 export interface State {

package/src/core/daemon.ts

@@ -2,6 +2,7 @@ import {
   addAgentToState,
   getAgentState,
   loadConfig,
+  loadState,
   removeAgentFromState,
   updateAgentInState,
 } from "../config/loader.js";
@@ -10,6 +11,7 @@ import { loadContext, loadOrCreateContext, saveContext } from "../context/index.
 import { Heartbeat } from "./heartbeat.js";
 import { handleWebSocketEvent, injectRestoredContext, injectStartupMessage } from "./injector.js";
 import { checkInbox, registerAgent } from "./registry.js";
+import { buildRunnerConfig, getRunnerDisplayName, type RunnerConfig } from "./runner.js";
 import {
   captureSessionContext,
   createSession,
@@ -34,6 +36,7 @@ export class AgentDaemon {
   private agentName: string;
   private config: Config;
   private agentConfig: AgentConfig;
+  private runnerConfig: RunnerConfig;
   private ws: AgentWebSocket | null = null;
   private heartbeat: Heartbeat | null = null;
   private token: string | null = null;
@@ -69,6 +72,58 @@ export class AgentDaemon {
     if (options.model) agentConfig.model = options.model;
 
     this.agentConfig = agentConfig;
+
+    // Build runner configuration with model resolution
+    this.runnerConfig = buildRunnerConfig({
+      cliModel: options.model,
+      agentModel: agentConfig.model,
+      defaultModel: config.defaults.model,
+      command: agentConfig.command,
+    });
+
+    const runnerName = getRunnerDisplayName(this.runnerConfig.type);
+    console.log(`Runner: ${runnerName}`);
+    console.log(`Effective model: ${this.runnerConfig.model}`);
+
+    // Check workdir conflicts - prevent multiple agents from using same directory
+    this.checkWorkdirConflict(agentConfig.workdir);
+  }
+
+  /**
+   * Checks if another agent is already using the specified workdir
+   */
+  private checkWorkdirConflict(workdir?: string): void {
+    if (!workdir) return;
+
+    const state = loadState();
+    const conflictingAgent = state.agents.find((a) => {
+      // Skip self
+      if (a.name === this.agentName) return false;
+
+      // Check if agent is actually running
+      if (!a.pid) return false;
+      try {
+        process.kill(a.pid, 0); // Check if process exists
+      } catch {
+        return false; // Process not running
+      }
+
+      // Check if session exists and has same workdir
+      // We need to check the config for this agent's workdir
+      const otherAgentConfig = this.config.agents.find((c) => c.name === a.name);
+      if (otherAgentConfig?.workdir === workdir) {
+        return true;
+      }
+
+      return false;
+    });
+
+    if (conflictingAgent) {
+      throw new Error(
+        `Workdir conflict: Agent "${conflictingAgent.name}" is already using "${workdir}".\n` +
+          `Use a different --workdir or stop the other agent first.`,
+      );
+    }
   }
 
   async start(): Promise<void> {
@@ -90,6 +145,7 @@ export class AgentDaemon {
         this.agentName,
         this.agentConfig.command,
         this.agentConfig.workdir,
+        this.runnerConfig.env, // Pass runner env vars (e.g., OPENCODE_MODEL)
       );
 
       if (!created) {
@@ -97,6 +153,10 @@ export class AgentDaemon {
       }
     } else {
       console.log(`Reconnecting to existing session: ${sessionName}`);
+      // Update environment for existing session
+      if (Object.keys(this.runnerConfig.env).length > 0) {
+        updateSessionEnvironment(this.agentName, this.runnerConfig.env);
+      }
     }
 
     // Register with hub
@@ -132,6 +192,8 @@ export class AgentDaemon {
       tmuxSession: sessionName,
       startedAt: new Date().toISOString(),
       token: this.token,
+      runtimeModel: this.runnerConfig.model,
+      runnerType: this.runnerConfig.type,
     });
 
     // Start heartbeat with auto-refresh