@elizaos/plugin-agent-orchestrator 2.0.0-alpha.6 → 2.0.0-alpha.8

package/dist/index.js

@@ -24,89 +24,482 @@ var __export = (target, all) => {
       set: (newValue) => all[name] = () => newValue
     });
 };
+var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
-// index.ts
-import { getSessionProviders as getSessionProviders2 } from "@elizaos/core";
-
-// src/actions/messaging.ts
-function extractMessagingParams(message, _state) {
-  const params = message.content?.params;
-  if (!params) {
-    return {};
+// src/sub-agents/sweagent-sub-agent.ts
+var exports_sweagent_sub_agent = {};
+__export(exports_sweagent_sub_agent, {
+  createSweAgentSubAgent: () => createSweAgentSubAgent,
+  SweAgentSubAgent: () => SweAgentSubAgent
+});
+import * as fs3 from "node:fs/promises";
+import * as path8 from "node:path";
+import {
+  AbstractModel,
+  DefaultAgent,
+  TextProblemStatement,
+  ToolHandler
+} from "@elizaos/sweagent-root";
+function getEnvInt4(key, defaultValue) {
+  const raw = process.env[key];
+  if (!raw)
+    return defaultValue;
+  const parsed = Number.parseInt(raw, 10);
+  if (!Number.isFinite(parsed) || parsed < 1)
+    return defaultValue;
+  return parsed;
+}
+function truncate(text, maxChars) {
+  if (text.length <= maxChars)
+    return text;
+  return `${text.slice(0, Math.max(0, maxChars - 1))}…`;
+}
+function redactSensitiveText4(text) {
+  let out = text;
+  out = out.replace(/-----BEGIN [A-Z ]*PRIVATE KEY-----[\s\S]*?-----END [A-Z ]*PRIVATE KEY-----/g, "[REDACTED:PRIVATE_KEY]");
+  out = out.replace(/\bsk-[A-Za-z0-9]{16,}\b/g, "[REDACTED:API_KEY]");
+  out = out.replace(/\bAKIA[0-9A-Z]{16}\b/g, "[REDACTED:AWS_ACCESS_KEY_ID]");
+  out = out.replace(/\bASIA[0-9A-Z]{16}\b/g, "[REDACTED:AWS_ACCESS_KEY_ID]");
+  out = out.replace(/\bghp_[A-Za-z0-9]{20,}\b/g, "[REDACTED:GITHUB_TOKEN]");
+  out = out.replace(/\bgithub_pat_[A-Za-z0-9_]{20,}\b/g, "[REDACTED:GITHUB_TOKEN]");
+  out = out.replace(/\bxox[baprs]-[A-Za-z0-9-]{10,}\b/g, "[REDACTED:SLACK_TOKEN]");
+  out = out.replace(/\bBearer\s+[A-Za-z0-9._-]{10,}\b/g, "Bearer [REDACTED]");
+  out = out.replace(/\bBasic\s+[A-Za-z0-9+/=]{10,}\b/g, "Basic [REDACTED]");
+  out = out.replace(/(password\s*[:=]\s*)(\S+)/gi, "$1[REDACTED]");
+  for (const [key, value] of Object.entries(process.env)) {
+    if (!value || value.length < 12)
+      continue;
+    const upper = key.toUpperCase();
+    if (upper.includes("KEY") || upper.includes("TOKEN") || upper.includes("SECRET") || upper.includes("PASSWORD") || upper.includes("PASSWD") || upper.includes("AUTH")) {
+      out = out.split(value).join(`[REDACTED:${key}]`);
+    }
   }
-  let target;
-  if (params.target) {
-    target = params.target;
-  } else {
-    target = {};
-    if (params.channel)
-      target.channel = params.channel;
-    if (params.to)
-      target.to = params.to;
-    if (params.threadId !== undefined)
-      target.threadId = params.threadId;
-    if (params.replyTo)
-      target.replyToMessageId = params.replyTo;
+  return out;
+}
+async function ensureDir(dir) {
+  if (!dir || dir.trim() === "") {
+    throw new Error("Directory path cannot be empty");
   }
-  let content;
-  if (params.content) {
-    content = params.content;
-  } else {
-    content = {};
-    const text = params.text ?? message.content?.text;
-    if (text)
-      content.text = text;
+  await fs3.mkdir(dir, { recursive: true });
+}
+function findTool(tools, name) {
+  const tool2 = tools.find((t) => t.name === name);
+  if (!tool2)
+    throw new Error(`Required tool not available: ${name}`);
+  return tool2;
+}
+function parseGitStatusPorcelain(output) {
+  const created = [];
+  const modified = [];
+  const lines = output.split(`
+`).map((l) => l.trimEnd());
+  for (const line of lines) {
+    if (!line)
+      continue;
+    const status = line.slice(0, 2);
+    const file2 = line.slice(3).trim();
+    if (!file2)
+      continue;
+    if (status.includes("?") || status.includes("A")) {
+      created.push(file2);
+    } else {
+      modified.push(file2);
+    }
   }
-  return { target, content };
+  return { created, modified };
 }
-var sendCrossPlatformMessageAction = {
-  name: "SEND_CROSS_PLATFORM_MESSAGE",
-  similes: [
-    "CROSS_PLATFORM_MESSAGE",
-    "UNIFIED_SEND",
-    "SEND_TO_CHANNEL",
-    "RELAY_MESSAGE",
-    "BROADCAST_MESSAGE"
-  ],
-  description: "Send a message to any supported platform (Discord, Telegram, Slack, WhatsApp, Twitch). " + "Requires specifying the target channel/platform and recipient.",
-  validate: async (runtime, message, state, options) => {
-    const __avTextRaw = typeof message?.content?.text === "string" ? message.content.text : "";
-    const __avText = __avTextRaw.toLowerCase();
-    const __avKeywords = ["send", "cross", "platform", "message"];
-    const __avKeywordOk = __avKeywords.length > 0 && __avKeywords.some((kw) => kw.length > 0 && __avText.includes(kw));
-    const __avRegex = new RegExp("\\b(?:send|cross|platform|message)\\b", "i");
-    const __avRegexOk = __avRegex.test(__avText);
-    const __avSource = String(message?.content?.source ?? message?.source ?? "");
-    const __avExpectedSource = "";
-    const __avSourceOk = __avExpectedSource ? __avSource === __avExpectedSource : Boolean(__avSource || state || runtime?.agentId || runtime?.getService);
-    const __avOptions = options && typeof options === "object" ? options : {};
-    const __avInputOk = __avText.trim().length > 0 || Object.keys(__avOptions).length > 0 || Boolean(message?.content && typeof message.content === "object");
-    if (!(__avKeywordOk && __avRegexOk && __avSourceOk && __avInputOk)) {
-      return false;
+async function isGitRepo(shellTool) {
+  const res = await shellTool.execute({
+    command: "git rev-parse --is-inside-work-tree"
+  });
+  return res.success && res.output.includes("true");
+}
+function extractShellStdout(toolOutput) {
+  const idx = toolOutput.indexOf(`
+`);
+  return idx === -1 ? "" : toolOutput.slice(idx + 1);
+}
+async function getGitStatus(shellTool) {
+  const res = await shellTool.execute({ command: "git status --porcelain" });
+  if (!res.success)
+    throw new Error(`git status failed: ${res.output}`);
+  return extractShellStdout(res.output);
+}
+async function buildPatch(shellTool) {
+  const unstaged = await shellTool.execute({ command: "git diff" });
+  const staged = await shellTool.execute({ command: "git diff --cached" });
+  const parts = [];
+  if (unstaged.success)
+    parts.push(extractShellStdout(unstaged.output));
+  if (staged.success)
+    parts.push(extractShellStdout(staged.output));
+  return parts.join(`
+`).trim();
+}
+
+class LocalToolEnvironment {
+  workingDirectory;
+  shellTool;
+  patchPath;
+  submitCommand;
+  constructor(args) {
+    this.workingDirectory = args.workingDirectory;
+    this.shellTool = args.shellTool;
+    this.patchPath = args.patchPath;
+    this.submitCommand = args.submitCommand;
+    this.repo = { repoName: path8.basename(this.workingDirectory) };
+    this.name = "local";
+  }
+  repo;
+  name;
+  getCwd = () => this.workingDirectory;
+  async communicate(command) {
+    const cmd = command.trim();
+    if (cmd === this.submitCommand) {
+      const patch = await buildPatch(this.shellTool);
+      await ensureDir(path8.dirname(this.patchPath));
+      await fs3.writeFile(this.patchPath, patch, "utf-8");
+      return SUBMISSION_MARKER;
     }
-    const __avLegacyValidate = async (runtime2, message2, _state, _options) => {
-      const messagingService = runtime2.getService("MESSAGING");
-      if (!messagingService) {
-        return false;
-      }
-      const params = message2.content?.params;
-      if (!params) {
-        return true;
-      }
-      const hasTarget = params.target || params.channel && params.to;
-      const hasContent = params.content || params.text || message2.content?.text;
-      return !!(hasTarget && hasContent);
-    };
-    try {
-      return Boolean(await __avLegacyValidate(runtime, message, state, options));
-    } catch {
-      return false;
+    const result = await this.shellTool.execute({ command: cmd });
+    return result.output;
+  }
+  async readFile(p, encoding = "utf-8") {
+    const resolved = p === "/root/model.patch" ? this.patchPath : path8.resolve(this.workingDirectory, p);
+    return await fs3.readFile(resolved, encoding);
+  }
+  async writeFile(p, content) {
+    const resolved = p === "/root/model.patch" ? this.patchPath : path8.resolve(this.workingDirectory, p);
+    await ensureDir(path8.dirname(resolved));
+    await fs3.writeFile(resolved, content, "utf-8");
+  }
+  async setEnvVariables(_vars) {
+    return;
+  }
+  async executeCommand(command) {
+    await this.communicate(command);
+  }
+  async interruptSession() {
+    return;
+  }
+}
+
+class SweAgentSubAgent {
+  name = "SWE-agent Worker";
+  type = "sweagent";
+  cancelled = false;
+  maxIterations;
+  debug;
+  constructor(config2) {
+    this.maxIterations = config2?.maxIterations ?? getEnvInt4("ELIZA_CODE_SWEAGENT_MAX_ITERATIONS", 30);
+    this.debug = config2?.debug ?? process.env.ELIZA_CODE_DEBUG === "1";
+  }
+  cancel() {
+    this.cancelled = true;
+  }
+  async execute(task, context) {
+    this.cancelled = false;
+    const {
+      runtime,
+      workingDirectory,
+      tools,
+      onProgress,
+      onMessage,
+      onTrace,
+      isCancelled,
+      isPaused
+    } = context;
+    const shellTool = findTool(tools, "shell");
+    if (!await isGitRepo(shellTool)) {
+      return {
+        success: false,
+        summary: "SWE-agent requires a git repository",
+        filesCreated: [],
+        filesModified: [],
+        error: "Not a git repository (git rev-parse --is-inside-work-tree returned false)"
+      };
     }
-  },
-  handler: async (runtime, message, state, _options, callback) => {
-    const messagingService = runtime.getService("MESSAGING");
-    if (!messagingService) {
+    const beforeStatus = await getGitStatus(shellTool);
+    const patchPath = path8.resolve(workingDirectory, ".eliza/sweagent/model.patch");
+    const env = new LocalToolEnvironment({
+      workingDirectory,
+      shellTool,
+      patchPath,
+      submitCommand: "submit"
+    });
+    const toolConfig = {
+      commands: [],
+      parseFunction: "thought_action",
+      executionTimeout: 55,
+      maxConsecutiveExecutionTimeouts: 2,
+      totalExecutionTimeout: 60 * 60,
+      submitCommand: "submit",
+      useFunctionCalling: false,
+      formatErrorTemplate: "Your output was not formatted correctly. Use DISCUSSION then one command in a code block.",
+      filter: {
+        blocklistErrorTemplate: "That command is not allowed. Choose a safer alternative.",
+        blocklist: ["rm -rf", "sudo rm", "mkfs", "dd "],
+        blocklistStandalone: ["shutdown", "reboot"]
+      },
+      envVariables: {}
+    };
+    const modelConfig = {
+      name: "runtime",
+      perInstanceCostLimit: 0,
+      totalCostLimit: 0,
+      perInstanceCallLimit: 0,
+      temperature: 0.1,
+      topP: 1,
+      apiBase: null,
+      apiVersion: null,
+      apiKey: null,
+      stop: [],
+      completionKwargs: {},
+      convertSystemToUser: false,
+      retry: { retries: 0, minWait: 0, maxWait: 0 },
+      delay: 0,
+      fallbacks: [],
+      chooseApiKeyByThread: false,
+      maxInputTokens: null,
+      maxOutputTokens: null,
+      litellmModelRegistry: null,
+      customTokenizer: null
+    };
+    const model = new RuntimeModel(runtime, modelConfig, toolConfig);
+    const agent = new DefaultAgent({
+      templates: DEFAULT_TEMPLATES,
+      tools: new ToolHandler(toolConfig),
+      historyProcessors: [],
+      model,
+      maxRequeries: 3,
+      name: "sweagent"
+    });
+    const outputDir = path8.resolve(workingDirectory, ".eliza/sweagent/runs");
+    await ensureDir(outputDir);
+    const ps = new TextProblemStatement({
+      text: `${task.name}
+
+${task.description ?? ""}`.trim(),
+      id: task.id ?? "task"
+    });
+    await agent.setup(env, ps, outputDir);
+    let iteration = 0;
+    while (!this.cancelled) {
+      if (isCancelled()) {
+        return {
+          success: false,
+          summary: "Cancelled",
+          filesCreated: [],
+          filesModified: [],
+          error: "Cancelled by user"
+        };
+      }
+      if (isPaused?.()) {
+        await new Promise((r) => setTimeout(r, 250));
+        continue;
+      }
+      iteration += 1;
+      onProgress({
+        taskId: task.id ?? "",
+        progress: Math.min(90, Math.round(iteration / this.maxIterations * 80))
+      });
+      const step = await agent.step();
+      const thoughtPreview = truncate(step.thought ?? "", 220);
+      const actionPreview = truncate(step.action ?? "", 220);
+      if (this.debug) {
+        onMessage(`DISCUSSION: ${thoughtPreview}`, "info");
+        onMessage(`COMMAND: ${actionPreview}`, "info");
+      }
+      onTrace?.({
+        kind: "note",
+        level: "info",
+        message: `step ${iteration}: ${truncate(redactSensitiveText4(thoughtPreview), 160)}`,
+        ts: Date.now(),
+        seq: iteration
+      });
+      if (step.done)
+        break;
+      if (iteration >= this.maxIterations)
+        break;
+    }
+    const afterStatus = await getGitStatus(shellTool);
+    const delta = parseGitStatusPorcelain(afterStatus);
+    let patchExists = false;
+    try {
+      await fs3.stat(patchPath);
+      patchExists = true;
+    } catch {
+      patchExists = false;
+    }
+    const success2 = patchExists || delta.created.length + delta.modified.length > 0;
+    if (!success2) {
+      return {
+        success: false,
+        summary: "No patch produced",
+        filesCreated: delta.created,
+        filesModified: delta.modified,
+        error: `No submission patch produced.
+Before status:
+${beforeStatus}
+After status:
+${afterStatus}`
+      };
+    }
+    return {
+      success: true,
+      summary: "Submitted patch",
+      filesCreated: delta.created,
+      filesModified: delta.modified
+    };
+  }
+}
+function createSweAgentSubAgent(config2) {
+  return new SweAgentSubAgent(config2);
+}
+var SUBMISSION_MARKER = "<<SWE_AGENT_SUBMISSION>>", RuntimeModel, DEFAULT_TEMPLATES;
+var init_sweagent_sub_agent = __esm(() => {
+  RuntimeModel = class RuntimeModel extends AbstractModel {
+    runtime;
+    modelType;
+    stats = { apiCalls: 0, inputTokens: 0, outputTokens: 0 };
+    constructor(runtime, config2, tools) {
+      super(config2, tools);
+      this.runtime = runtime;
+      this.modelType = runtime.getModel("TEXT_REASONING_LARGE") ? "TEXT_REASONING_LARGE" : "TEXT_LARGE";
+    }
+    async query(history) {
+      this.stats.apiCalls += 1;
+      const prompt = history.map((m) => {
+        const content = typeof m.content === "string" ? m.content : JSON.stringify(m.content);
+        return `${m.role.toUpperCase()}: ${content}`;
+      }).join(`
+
+`);
+      const response = await this.runtime.useModel(this.modelType, {
+        prompt,
+        maxTokens: 4096,
+        temperature: 0.1
+      });
+      return { message: response };
+    }
+  };
+  DEFAULT_TEMPLATES = {
+    systemTemplate: `You are SWE-agent. Follow the format strictly.
+
+DISCUSSION
+Explain what you will do.
+
+\`\`\`
+<one shell command>
+\`\`\`
+
+When finished, run:
+
+\`\`\`
+submit
+\`\`\`
+`,
+    instanceTemplate: `Task:
+{{problemStatement}}
+
+Repository: {{repo}}
+Working directory: {{workingDir}}
+`,
+    nextStepTemplate: "Observation: {{observation}}",
+    nextStepTruncatedObservationTemplate: "Observation: {{observation[:max_observation_length]}}<response clipped>",
+    maxObservationLength: 50000,
+    demonstrations: [],
+    putDemosInHistory: false,
+    disableImageProcessing: true,
+    shellCheckErrorTemplate: `Your command contains syntax errors. Please fix them.
+Error: {{error_message}}
+Hint: {{hint}}`,
+    commandCancelledTimeoutTemplate: "Command cancelled after {{timeout}} seconds. The command was: {{command}}",
+    nextStepNoOutputTemplate: "Observation: (no output)",
+    strategyTemplate: undefined,
+    demonstrationTemplate: undefined
+  };
+});
+
+// src/actions/messaging.ts
+function extractMessagingParams(message, _state) {
+  const params = message.content?.params;
+  if (!params) {
+    return {};
+  }
+  let target;
+  if (params.target) {
+    target = params.target;
+  } else {
+    target = {};
+    if (params.channel)
+      target.channel = params.channel;
+    if (params.to)
+      target.to = params.to;
+    if (params.threadId !== undefined)
+      target.threadId = params.threadId;
+    if (params.replyTo)
+      target.replyToMessageId = params.replyTo;
+  }
+  let content;
+  if (params.content) {
+    content = params.content;
+  } else {
+    content = {};
+    const text = params.text ?? message.content?.text;
+    if (text)
+      content.text = text;
+  }
+  return { target, content };
+}
+var sendCrossPlatformMessageAction = {
+  name: "SEND_CROSS_PLATFORM_MESSAGE",
+  similes: [
+    "CROSS_PLATFORM_MESSAGE",
+    "UNIFIED_SEND",
+    "SEND_TO_CHANNEL",
+    "RELAY_MESSAGE",
+    "BROADCAST_MESSAGE"
+  ],
+  description: "Send a message to any supported platform (Discord, Telegram, Slack, WhatsApp, Twitch). " + "Requires specifying the target channel/platform and recipient.",
+  validate: async (runtime, message, state, options) => {
+    const __avTextRaw = typeof message?.content?.text === "string" ? message.content.text : "";
+    const __avText = __avTextRaw.toLowerCase();
+    const __avKeywords = ["send", "cross", "platform", "message"];
+    const __avKeywordOk = __avKeywords.length > 0 && __avKeywords.some((kw) => kw.length > 0 && __avText.includes(kw));
+    const __avRegex = /\b(?:send|cross|platform|message)\b/i;
+    const __avRegexOk = __avRegex.test(__avText);
+    const __avSource = String(message?.content?.source ?? message?.source ?? "");
+    const __avExpectedSource = "";
+    const __avSourceOk = __avExpectedSource ? __avSource === __avExpectedSource : Boolean(__avSource || state || runtime?.agentId || runtime?.getService);
+    const __avOptions = options && typeof options === "object" ? options : {};
+    const __avInputOk = __avText.trim().length > 0 || Object.keys(__avOptions).length > 0 || Boolean(message?.content && typeof message.content === "object");
+    if (!(__avKeywordOk && __avRegexOk && __avSourceOk && __avInputOk)) {
+      return false;
+    }
+    const __avLegacyValidate = async (runtime2, message2, _state, _options) => {
+      const messagingService = runtime2.getService("MESSAGING");
+      if (!messagingService) {
+        return false;
+      }
+      const params = message2.content?.params;
+      if (!params) {
+        return true;
+      }
+      const hasTarget = params.target || params.channel && params.to;
+      const hasContent = params.content || params.text || message2.content?.text;
+      return !!(hasTarget && hasContent);
+    };
+    try {
+      return Boolean(await __avLegacyValidate(runtime, message, state, options));
+    } catch {
+      return false;
+    }
+  },
+  handler: async (runtime, message, state, _options, callback) => {
+    const messagingService = runtime.getService("MESSAGING");
+    if (!messagingService) {
       if (callback) {
         await callback({
           text: "Messaging service is not available. Please ensure the orchestrator plugin is properly configured."
@@ -239,7 +632,7 @@ var sendToDeliveryContextAction = {
     const __avText = __avTextRaw.toLowerCase();
     const __avKeywords = ["send", "delivery", "context"];
     const __avKeywordOk = __avKeywords.length > 0 && __avKeywords.some((kw) => kw.length > 0 && __avText.includes(kw));
-    const __avRegex = new RegExp("\\b(?:send|delivery|context)\\b", "i");
+    const __avRegex = /\b(?:send|delivery|context)\b/i;
     const __avRegexOk = __avRegex.test(__avText);
     const __avSource = String(message?.content?.source ?? message?.source ?? "");
     const __avExpectedSource = "";
@@ -354,7 +747,7 @@ var sendToRoomAction = {
     const __avText = __avTextRaw.toLowerCase();
     const __avKeywords = ["send", "room"];
     const __avKeywordOk = __avKeywords.length > 0 && __avKeywords.some((kw) => kw.length > 0 && __avText.includes(kw));
-    const __avRegex = new RegExp("\\b(?:send|room)\\b", "i");
+    const __avRegex = /\b(?:send|room)\b/i;
     const __avRegexOk = __avRegex.test(__avText);
     const __avSource = String(message?.content?.source ?? message?.source ?? "");
     const __avExpectedSource = "";
@@ -464,7 +857,7 @@ var sendToSessionMessageAction = {
     const __avText = __avTextRaw.toLowerCase();
     const __avKeywords = ["send", "session", "message"];
     const __avKeywordOk = __avKeywords.length > 0 && __avKeywords.some((kw) => kw.length > 0 && __avText.includes(kw));
-    const __avRegex = new RegExp("\\b(?:send|session|message)\\b", "i");
+    const __avRegex = /\b(?:send|session|message)\b/i;
     const __avRegexOk = __avRegex.test(__avText);
     const __avSource = String(message?.content?.source ?? message?.source ?? "");
     const __avExpectedSource = "";
@@ -574,7 +967,7 @@ var listMessagingChannelsAction = {
     const __avText = __avTextRaw.toLowerCase();
     const __avKeywords = ["list", "messaging", "channels"];
     const __avKeywordOk = __avKeywords.length > 0 && __avKeywords.some((kw) => kw.length > 0 && __avText.includes(kw));
-    const __avRegex = new RegExp("\\b(?:list|messaging|channels)\\b", "i");
+    const __avRegex = /\b(?:list|messaging|channels)\b/i;
     const __avRegexOk = __avRegex.test(__avText);
     const __avSource = String(message?.content?.source ?? message?.source ?? "");
     const __avExpectedSource = "";
@@ -644,47 +1037,68 @@ var listMessagingChannelsAction = {
 
 // src/utils/session.ts
 import crypto from "node:crypto";
-import {
-  buildAcpSessionKey,
-  buildAgentMainSessionKey,
-  buildAgentPeerSessionKey,
-  buildAgentSessionKey,
-  buildGroupHistoryKey,
-  buildSubagentSessionKey,
-  createSendPolicyProvider,
-  createSessionEntry,
-  createSessionProvider,
-  createSessionSkillsProvider,
-  deleteSessionEntry,
-  extractSessionContext,
-  getSessionEntry,
-  getSessionProviders,
-  isAcpSessionKey,
-  isSubagentSessionKey,
-  isValidSessionEntry,
-  listSessionKeys,
-  loadSessionStore,
-  mergeSessionEntry,
-  normalizeAccountId,
-  normalizeAgentId,
-  normalizeMainKey,
-  parseAgentSessionKey,
-  resolveAgentIdFromSessionKey,
-  resolveAgentSessionsDir,
-  resolveDefaultSessionStorePath,
-  resolveSessionTranscriptPath,
-  resolveStateDir,
-  resolveStorePath,
-  resolveThreadParentSessionKey,
-  resolveThreadSessionKeys,
-  SessionStateManager,
-  saveSessionStore,
-  toAgentRequestSessionKey,
-  toAgentStoreSessionKey,
-  updateSessionStore,
-  updateSessionStoreEntry,
-  upsertSessionEntry
-} from "@elizaos/core";
+
+class SessionStateManager {
+  async getEntry(_key) {
+    return;
+  }
+  async setEntry(_key, _entry) {}
+}
+var getSessionProviders = () => [];
+var buildAcpSessionKey = (..._args) => "";
+var buildAgentMainSessionKey = (..._args) => "";
+var buildAgentPeerSessionKey = (..._args) => "";
+var buildAgentSessionKey = (..._args) => "";
+var buildGroupHistoryKey = (..._args) => "";
+var buildSubagentSessionKey = (..._args) => "";
+var createSendPolicyProvider = () => ({
+  name: "stub-send-policy",
+  get: async () => ({ text: "" })
+});
+var createSessionEntry = () => ({});
+var createSessionProvider = () => ({
+  name: "stub-session",
+  get: async () => ({ text: "" })
+});
+var createSessionSkillsProvider = () => ({
+  name: "stub-skills",
+  get: async () => ({ text: "" })
+});
+var deleteSessionEntry = async () => {};
+var extractSessionContext = () => ({});
+var getSessionEntry = async () => {
+  return;
+};
+var isAcpSessionKey = () => false;
+var isCoreSubagentSessionKey = () => false;
+var isValidSessionEntry = () => false;
+var listSessionKeys = async () => [];
+var loadSessionStore = async () => ({ entries: {} });
+var mergeSessionEntry = () => ({});
+var normalizeAccountId = (id) => id;
+var normalizeCoreAgentId = (id) => id;
+var normalizeMainKey = (key) => key;
+var parseAgentSessionKey = () => ({
+  agentId: "",
+  keyType: "",
+  identifier: ""
+});
+var resolveAgentIdFromSessionKey = () => "";
+var resolveAgentSessionsDir = () => "";
+var resolveDefaultSessionStorePath = () => "";
+var resolveSessionTranscriptPath = () => "";
+var resolveStateDir = () => "";
+var resolveStorePath = () => "";
+var resolveThreadParentSessionKey = () => {
+  return;
+};
+var resolveThreadSessionKeys = async () => [];
+var saveSessionStore = async () => {};
+var toAgentRequestSessionKey = () => "";
+var toAgentStoreSessionKey = () => "";
+var updateSessionStore = async () => {};
+var updateSessionStoreEntry = async () => {};
+var upsertSessionEntry = async () => {};
 function hashToUUID(input) {
   const hash = crypto.createHash("sha256").update(input).digest("hex");
   const uuid = [
@@ -777,13 +1191,13 @@ function normalizeKeyType(raw) {
   }
 }
 function buildSessionKey(agentId, keyType, identifier) {
-  const normalizedAgentId = normalizeAgentId2(agentId);
+  const normalizedAgentId = normalizeAgentId(agentId);
   return `agent:${normalizedAgentId}:${keyType}:${identifier}`;
 }
-function normalizeAgentId2(agentId) {
+function normalizeAgentId(agentId) {
   return agentId.trim().toLowerCase();
 }
-function isSubagentSessionKey2(sessionKey) {
+function isSubagentSessionKey(sessionKey) {
   const parsed = parseSessionKey(sessionKey);
   return parsed.keyType === "subagent";
 }
@@ -899,7 +1313,7 @@ function formatTokenCount(count) {
   return String(Math.round(count));
 }
 
-// src/actions/subagent-management.ts
+// src/actions/peek-subagent.ts
 function getSubagentService(runtime) {
   const svc = runtime.getService("SUBAGENT");
   if (!svc) {
@@ -907,6 +1321,98 @@ function getSubagentService(runtime) {
   }
   return svc;
 }
+var peekSubagentAction = {
+  name: "PEEK_SUBAGENT",
+  similes: [
+    "CHECK_LOGS",
+    "READ_SUBAGENT",
+    "VIEW_OUTPUT",
+    "MONITOR_TASK",
+    "INSPECT_SUBAGENT"
+  ],
+  description: "Peek at the recent internal monologue and logs of a running subagent. Use this to check progress without interrupting.",
+  validate: async (runtime, message, state, options) => {
+    const __avTextRaw = typeof message?.content?.text === "string" ? message.content.text : "";
+    const __avText = __avTextRaw.toLowerCase();
+    const __avKeywords = ["peek", "subagent"];
+    const __avKeywordOk = __avKeywords.length > 0 && __avKeywords.some((kw) => kw.length > 0 && __avText.includes(kw));
+    const __avRegex = /\b(?:peek|subagent)\b/i;
+    const __avRegexOk = __avRegex.test(__avText);
+    const __avSource = String(message?.content?.source ?? message?.source ?? "");
+    const __avExpectedSource = "";
+    const __avSourceOk = __avExpectedSource ? __avSource === __avExpectedSource : Boolean(__avSource || state || runtime?.agentId || runtime?.getService);
+    const __avOptions = options && typeof options === "object" ? options : {};
+    const __avInputOk = __avText.trim().length > 0 || Object.keys(__avOptions).length > 0 || Boolean(message?.content && typeof message.content === "object");
+    if (!(__avKeywordOk && __avRegexOk && __avSourceOk && __avInputOk)) {
+      return false;
+    }
+    const __avLegacyValidate = async (runtime2, message2, _state, _options) => {
+      const svc = runtime2.getService("SUBAGENT");
+      if (!svc)
+        return false;
+      const text = message2.content.text?.toLowerCase() ?? "";
+      return text.includes("peek") || text.includes("check logs") || text.includes("view output") || text.includes("monitor") || text.includes("inspect");
+    };
+    try {
+      return Boolean(await __avLegacyValidate(runtime, message, state, options));
+    } catch {
+      return false;
+    }
+  },
+  handler: async (runtime, _message, _state, options, callback) => {
+    const svc = getSubagentService(runtime);
+    const opts = options;
+    const runId = opts?.runId;
+    if (!runId) {
+      const msg2 = "Please specify the run ID to peek. Use LIST_SUBAGENTS to see active runs.";
+      await callback?.({ content: { text: msg2 } });
+      return { success: false, text: msg2 };
+    }
+    const result = await svc.peekSubagent(runId, opts?.count ?? 5);
+    if (!result) {
+      const msg2 = `No active run found with ID: ${runId.slice(0, 8)}...`;
+      await callback?.({ content: { text: msg2 } });
+      return { success: false, text: msg2 };
+    }
+    const lines = [
+      `## Subagent Peek: ${runId.slice(0, 8)}...`,
+      `**Status:** ${result.status.toUpperCase()}`,
+      `**Last Activity:** ${result.lastActivityAt ? `${formatDurationShort(Date.now() - result.lastActivityAt)} ago` : "Never"}`,
+      "",
+      "**Recent Logs:**"
+    ];
+    if (result.messages.length === 0) {
+      lines.push("(No output yet)");
+    } else {
+      for (const m of result.messages) {
+        const time = new Date(m.createdAt ?? 0).toLocaleTimeString();
+        const text = m.content.text?.replace(/\n/g, " ") ?? "...";
+        lines.push(`[${time}] ${text.slice(0, 100)}${text.length > 100 ? "..." : ""}`);
+      }
+    }
+    const msg = lines.join(`
+`);
+    await callback?.({ content: { text: msg } });
+    return {
+      success: true,
+      text: msg,
+      data: {
+        runId,
+        status: result.status,
+        logs: result.messages.map((m) => m.content.text)
+      }
+    };
+  }
+};
+
+// src/actions/subagent-management.ts
+function getSubagentService2(runtime) {
+  const svc = runtime.getService("SUBAGENT");
+  if (!svc) {
+    throw new Error("SubagentService not available (SUBAGENT)");
+  }
+  return svc;
+}
 function extractSessionContext2(_runtime, message) {
   const metadata = message.content?.metadata;
   const sessionKey = typeof metadata?.sessionKey === "string" ? metadata.sessionKey : undefined;
@@ -932,7 +1438,7 @@ var spawnSubagentAction = {
     const __avText = __avTextRaw.toLowerCase();
     const __avKeywords = ["spawn", "subagent"];
     const __avKeywordOk = __avKeywords.length > 0 && __avKeywords.some((kw) => kw.length > 0 && __avText.includes(kw));
-    const __avRegex = new RegExp("\\b(?:spawn|subagent)\\b", "i");
+    const __avRegex = /\b(?:spawn|subagent)\b/i;
     const __avRegexOk = __avRegex.test(__avText);
     const __avSource = String(message?.content?.source ?? message?.source ?? "");
     const __avExpectedSource = "";
@@ -959,7 +1465,7 @@ var spawnSubagentAction = {
     }
   },
   handler: async (runtime, message, _state, options, callback) => {
-    const svc = getSubagentService(runtime);
+    const svc = getSubagentService2(runtime);
     const context = extractSessionContext2(runtime, message);
     const opts = options;
     const task = opts?.task ?? message.content.text ?? "";
@@ -1011,7 +1517,7 @@ var sendToSessionAction = {
     const __avText = __avTextRaw.toLowerCase();
     const __avKeywords = ["send", "session"];
     const __avKeywordOk = __avKeywords.length > 0 && __avKeywords.some((kw) => kw.length > 0 && __avText.includes(kw));
-    const __avRegex = new RegExp("\\b(?:send|session)\\b", "i");
+    const __avRegex = /\b(?:send|session)\b/i;
     const __avRegexOk = __avRegex.test(__avText);
     const __avSource = String(message?.content?.source ?? message?.source ?? "");
     const __avExpectedSource = "";
@@ -1036,7 +1542,7 @@ var sendToSessionAction = {
     }
   },
   handler: async (runtime, message, _state, options, callback) => {
-    const svc = getSubagentService(runtime);
+    const svc = getSubagentService2(runtime);
     const context = extractSessionContext2(runtime, message);
     const opts = options;
     const targetMessage = opts?.message ?? message.content.text ?? "";
@@ -1101,7 +1607,7 @@ var listSubagentsAction = {
     const __avText = __avTextRaw.toLowerCase();
     const __avKeywords = ["list", "subagents"];
     const __avKeywordOk = __avKeywords.length > 0 && __avKeywords.some((kw) => kw.length > 0 && __avText.includes(kw));
-    const __avRegex = new RegExp("\\b(?:list|subagents)\\b", "i");
+    const __avRegex = /\b(?:list|subagents)\b/i;
     const __avRegexOk = __avRegex.test(__avText);
     const __avSource = String(message?.content?.source ?? message?.source ?? "");
     const __avExpectedSource = "";
@@ -1126,7 +1632,7 @@ var listSubagentsAction = {
     }
   },
   handler: async (runtime, message, _state, _options, callback) => {
-    const svc = getSubagentService(runtime);
+    const svc = getSubagentService2(runtime);
     const context = extractSessionContext2(runtime, message);
     const runs = svc.listSubagentRuns(context.sessionKey);
     if (runs.length === 0) {
@@ -1160,7 +1666,7 @@ var cancelSubagentAction = {
     const __avText = __avTextRaw.toLowerCase();
     const __avKeywords = ["cancel", "subagent"];
     const __avKeywordOk = __avKeywords.length > 0 && __avKeywords.some((kw) => kw.length > 0 && __avText.includes(kw));
-    const __avRegex = new RegExp("\\b(?:cancel|subagent)\\b", "i");
+    const __avRegex = /\b(?:cancel|subagent)\b/i;
     const __avRegexOk = __avRegex.test(__avText);
     const __avSource = String(message?.content?.source ?? message?.source ?? "");
     const __avExpectedSource = "";
@@ -1185,7 +1691,7 @@ var cancelSubagentAction = {
     }
   },
   handler: async (runtime, _message, _state, options, callback) => {
-    const svc = getSubagentService(runtime);
+    const svc = getSubagentService2(runtime);
     const opts = options;
     const runId = opts?.runId;
     if (!runId) {
@@ -1213,7 +1719,7 @@ var getSubagentStatusAction = {
     const __avText = __avTextRaw.toLowerCase();
     const __avKeywords = ["get", "subagent", "status"];
     const __avKeywordOk = __avKeywords.length > 0 && __avKeywords.some((kw) => kw.length > 0 && __avText.includes(kw));
-    const __avRegex = new RegExp("\\b(?:get|subagent|status)\\b", "i");
+    const __avRegex = /\b(?:get|subagent|status)\b/i;
     const __avRegexOk = __avRegex.test(__avText);
     const __avSource = String(message?.content?.source ?? message?.source ?? "");
     const __avExpectedSource = "";
@@ -1238,7 +1744,7 @@ var getSubagentStatusAction = {
     }
   },
   handler: async (runtime, _message, _state, options, callback) => {
-    const svc = getSubagentService(runtime);
+    const svc = getSubagentService2(runtime);
     const opts = options;
     const runId = opts?.runId;
     if (!runId) {
@@ -1271,98 +1777,6 @@ var getSubagentStatusAction = {
   }
 };
 
-// src/actions/peek-subagent.ts
-function getSubagentService2(runtime) {
-  const svc = runtime.getService("SUBAGENT");
-  if (!svc) {
-    throw new Error("SubagentService not available (SUBAGENT)");
-  }
-  return svc;
-}
-var peekSubagentAction = {
-  name: "PEEK_SUBAGENT",
-  similes: [
-    "CHECK_LOGS",
-    "READ_SUBAGENT",
-    "VIEW_OUTPUT",
-    "MONITOR_TASK",
-    "INSPECT_SUBAGENT"
-  ],
-  description: "Peek at the recent internal monologue and logs of a running subagent. Use this to check progress without interrupting.",
-  validate: async (runtime, message, state, options) => {
-    const __avTextRaw = typeof message?.content?.text === "string" ? message.content.text : "";
-    const __avText = __avTextRaw.toLowerCase();
-    const __avKeywords = ["peek", "subagent"];
-    const __avKeywordOk = __avKeywords.length > 0 && __avKeywords.some((kw) => kw.length > 0 && __avText.includes(kw));
-    const __avRegex = new RegExp("\\b(?:peek|subagent)\\b", "i");
-    const __avRegexOk = __avRegex.test(__avText);
-    const __avSource = String(message?.content?.source ?? message?.source ?? "");
-    const __avExpectedSource = "";
-    const __avSourceOk = __avExpectedSource ? __avSource === __avExpectedSource : Boolean(__avSource || state || runtime?.agentId || runtime?.getService);
-    const __avOptions = options && typeof options === "object" ? options : {};
-    const __avInputOk = __avText.trim().length > 0 || Object.keys(__avOptions).length > 0 || Boolean(message?.content && typeof message.content === "object");
-    if (!(__avKeywordOk && __avRegexOk && __avSourceOk && __avInputOk)) {
-      return false;
-    }
-    const __avLegacyValidate = async (runtime2, message2, _state, _options) => {
-      const svc = runtime2.getService("SUBAGENT");
-      if (!svc)
-        return false;
-      const text = message2.content.text?.toLowerCase() ?? "";
-      return text.includes("peek") || text.includes("check logs") || text.includes("view output") || text.includes("monitor") || text.includes("inspect");
-    };
-    try {
-      return Boolean(await __avLegacyValidate(runtime, message, state, options));
-    } catch {
-      return false;
-    }
-  },
-  handler: async (runtime, message, _state, options, callback) => {
-    const svc = getSubagentService2(runtime);
-    const opts = options;
-    const runId = opts?.runId;
-    if (!runId) {
-      const msg2 = "Please specify the run ID to peek. Use LIST_SUBAGENTS to see active runs.";
-      await callback?.({ content: { text: msg2 } });
-      return { success: false, text: msg2 };
-    }
-    const result = await svc.peekSubagent(runId, opts?.count ?? 5);
-    if (!result) {
-      const msg2 = `No active run found with ID: ${runId.slice(0, 8)}...`;
-      await callback?.({ content: { text: msg2 } });
-      return { success: false, text: msg2 };
-    }
-    const lines = [
-      `## Subagent Peek: ${runId.slice(0, 8)}...`,
-      `**Status:** ${result.status.toUpperCase()}`,
-      `**Last Activity:** ${result.lastActivityAt ? formatDurationShort(Date.now() - result.lastActivityAt) + " ago" : "Never"}`,
-      "",
-      "**Recent Logs:**"
-    ];
-    if (result.messages.length === 0) {
-      lines.push("(No output yet)");
-    } else {
-      for (const m of result.messages) {
-        const time = new Date(m.createdAt ?? 0).toLocaleTimeString();
-        const text = m.content.text?.replace(/\n/g, " ") ?? "...";
-        lines.push(`[${time}] ${text.slice(0, 100)}${text.length > 100 ? "..." : ""}`);
-      }
-    }
-    const msg = lines.join(`
-`);
-    await callback?.({ content: { text: msg } });
-    return {
-      success: true,
-      text: msg,
-      data: {
-        runId,
-        status: result.status,
-        logs: result.messages.map((m) => m.content.text)
-      }
-    };
-  }
-};
-
 // src/actions/task-management.ts
 function getService(runtime) {
   const svc = runtime.getService("CODE_TASK");
@@ -1393,7 +1807,14 @@ function needsClarification(text) {
     "refactor",
     "research"
   ].some((word) => t.includes(word));
-  const hasConstraint = ["by", "for", "with", "using", "priority", "deadline"].some((word) => t.includes(word));
+  const hasConstraint = [
+    "by",
+    "for",
+    "with",
+    "using",
+    "priority",
+    "deadline"
+  ].some((word) => t.includes(word));
   return hasVagueMarker || hasAction && !hasConstraint && t.split(/\s+/).length < 10;
 }
 var createTaskAction = {
@@ -1405,7 +1826,7 @@ var createTaskAction = {
     const __avText = __avTextRaw.toLowerCase();
     const __avKeywords = ["create", "task"];
     const __avKeywordOk = __avKeywords.length > 0 && __avKeywords.some((kw) => kw.length > 0 && __avText.includes(kw));
-    const __avRegex = new RegExp("\\b(?:create|task)\\b", "i");
+    const __avRegex = /\b(?:create|task)\b/i;
     const __avRegexOk = __avRegex.test(__avText);
     const __avSource = String(message?.content?.source ?? message?.source ?? "");
     const __avExpectedSource = "";
@@ -1482,7 +1903,7 @@ var listTasksAction = {
     const __avText = __avTextRaw.toLowerCase();
     const __avKeywords = ["list", "tasks"];
     const __avKeywordOk = __avKeywords.length > 0 && __avKeywords.some((kw) => kw.length > 0 && __avText.includes(kw));
-    const __avRegex = new RegExp("\\b(?:list|tasks)\\b", "i");
+    const __avRegex = /\b(?:list|tasks)\b/i;
     const __avRegexOk = __avRegex.test(__avText);
     const __avSource = String(message?.content?.source ?? message?.source ?? "");
     const __avExpectedSource = "";
@@ -1550,7 +1971,7 @@ var switchTaskAction = {
     const __avText = __avTextRaw.toLowerCase();
     const __avKeywords = ["switch", "task"];
     const __avKeywordOk = __avKeywords.length > 0 && __avKeywords.some((kw) => kw.length > 0 && __avText.includes(kw));
-    const __avRegex = new RegExp("\\b(?:switch|task)\\b", "i");
+    const __avRegex = /\b(?:switch|task)\b/i;
     const __avRegexOk = __avRegex.test(__avText);
     const __avSource = String(message?.content?.source ?? message?.source ?? "");
     const __avExpectedSource = "";
@@ -1604,7 +2025,7 @@ var searchTasksAction = {
     const __avText = __avTextRaw.toLowerCase();
     const __avKeywords = ["search", "tasks"];
     const __avKeywordOk = __avKeywords.length > 0 && __avKeywords.some((kw) => kw.length > 0 && __avText.includes(kw));
-    const __avRegex = new RegExp("\\b(?:search|tasks)\\b", "i");
+    const __avRegex = /\b(?:search|tasks)\b/i;
     const __avRegexOk = __avRegex.test(__avText);
     const __avSource = String(message?.content?.source ?? message?.source ?? "");
     const __avExpectedSource = "";
@@ -1664,7 +2085,7 @@ var pauseTaskAction = {
     const __avText = __avTextRaw.toLowerCase();
     const __avKeywords = ["pause", "task"];
     const __avKeywordOk = __avKeywords.length > 0 && __avKeywords.some((kw) => kw.length > 0 && __avText.includes(kw));
-    const __avRegex = new RegExp("\\b(?:pause|task)\\b", "i");
+    const __avRegex = /\b(?:pause|task)\b/i;
     const __avRegexOk = __avRegex.test(__avText);
     const __avSource = String(message?.content?.source ?? message?.source ?? "");
     const __avExpectedSource = "";
@@ -1712,7 +2133,7 @@ var resumeTaskAction = {
     const __avText = __avTextRaw.toLowerCase();
     const __avKeywords = ["resume", "task"];
     const __avKeywordOk = __avKeywords.length > 0 && __avKeywords.some((kw) => kw.length > 0 && __avText.includes(kw));
-    const __avRegex = new RegExp("\\b(?:resume|task)\\b", "i");
+    const __avRegex = /\b(?:resume|task)\b/i;
     const __avRegexOk = __avRegex.test(__avText);
     const __avSource = String(message?.content?.source ?? message?.source ?? "");
     const __avExpectedSource = "";
@@ -1765,7 +2186,7 @@ var cancelTaskAction = {
     const __avText = __avTextRaw.toLowerCase();
     const __avKeywords = ["cancel", "task"];
     const __avKeywordOk = __avKeywords.length > 0 && __avKeywords.some((kw) => kw.length > 0 && __avText.includes(kw));
-    const __avRegex = new RegExp("\\b(?:cancel|task)\\b", "i");
+    const __avRegex = /\b(?:cancel|task)\b/i;
     const __avRegexOk = __avRegex.test(__avText);
     const __avSource = String(message?.content?.source ?? message?.source ?? "");
     const __avExpectedSource = "";
@@ -3708,11 +4129,11 @@ class SubagentService extends Service4 {
         if (sourceAgentId === targetAgentId) {
           return true;
         }
-        const sourceNorm = normalizeAgentId2(sourceAgentId);
-        const targetNorm = normalizeAgentId2(targetAgentId);
+        const sourceNorm = normalizeAgentId(sourceAgentId);
+        const targetNorm = normalizeAgentId(targetAgentId);
         for (const rule of allowRules) {
-          const sourceMatch = rule.source === "*" || normalizeAgentId2(rule.source) === sourceNorm;
-          const targetMatch = rule.target === "*" || normalizeAgentId2(rule.target) === targetNorm;
+          const sourceMatch = rule.source === "*" || normalizeAgentId(rule.source) === sourceNorm;
+          const targetMatch = rule.target === "*" || normalizeAgentId(rule.target) === targetNorm;
           if (sourceMatch && targetMatch) {
             return true;
           }
@@ -3729,18 +4150,18 @@ class SubagentService extends Service4 {
         error: "Subagent spawning is disabled"
       };
     }
-    if (requesterContext.sessionKey && isSubagentSessionKey2(requesterContext.sessionKey)) {
+    if (requesterContext.sessionKey && isSubagentSessionKey(requesterContext.sessionKey)) {
       return {
         status: "forbidden",
         error: "sessions_spawn is not allowed from sub-agent sessions"
       };
     }
     const requesterAgentId = requesterContext.sessionKey ? extractAgentIdFromSessionKey(requesterContext.sessionKey) : this.runtime.character?.name ?? "unknown";
-    const targetAgentId = params.agentId ? normalizeAgentId2(params.agentId) : requesterAgentId;
+    const targetAgentId = params.agentId ? normalizeAgentId(params.agentId) : requesterAgentId;
     if (targetAgentId !== requesterAgentId) {
       const allowAgents = config.allowAgents ?? [];
       const allowAny = allowAgents.some((v) => v.trim() === "*");
-      const allowSet = new Set(allowAgents.filter((v) => v.trim() && v.trim() !== "*").map((v) => normalizeAgentId2(v)));
+      const allowSet = new Set(allowAgents.filter((v) => v.trim() && v.trim() !== "*").map((v) => normalizeAgentId(v)));
       if (!allowAny && !allowSet.has(targetAgentId)) {
         return {
           status: "forbidden",
@@ -4310,7 +4731,7 @@ class SubagentService extends Service4 {
   }
   findSubagentRunByLabel(label, agentId) {
     const normalizedLabel = label.toLowerCase().trim();
-    const normalizedAgentId = agentId ? normalizeAgentId2(agentId) : undefined;
+    const normalizedAgentId = agentId ? normalizeAgentId(agentId) : undefined;
     for (const run of this.subagentRuns.values()) {
       const runLabel = run.label?.toLowerCase().trim();
       if (runLabel !== normalizedLabel) {
@@ -4318,7 +4739,7 @@ class SubagentService extends Service4 {
       }
       if (normalizedAgentId) {
         const runAgentId = extractAgentIdFromSessionKey(run.childSessionKey);
-        if (normalizeAgentId2(runAgentId) !== normalizedAgentId) {
+        if (normalizeAgentId(runAgentId) !== normalizedAgentId) {
           continue;
         }
       }
@@ -4333,7 +4754,7 @@ class SubagentService extends Service4 {
       }
       if (normalizedAgentId) {
         const runAgentId = extractAgentIdFromSessionKey(run.childSessionKey);
-        if (normalizeAgentId2(runAgentId) !== normalizedAgentId) {
+        if (normalizeAgentId(runAgentId) !== normalizedAgentId) {
           return false;
         }
       }
@@ -4433,7 +4854,10 @@ class SubagentService extends Service4 {
           const timeoutMs = (config.timeoutSeconds ?? 300) * 1000;
           if (now2 - record.createdAt > timeoutMs) {
             record.endedAt = now2;
-            record.outcome = { status: "error", error: "System restarted during execution (Zombie Recovery)" };
+            record.outcome = {
+              status: "error",
+              error: "System restarted during execution (Zombie Recovery)"
+            };
             zombieCount++;
             await this.updateRunState(record.runId, {
               endedAt: record.endedAt,
@@ -4441,7 +4865,10 @@ class SubagentService extends Service4 {
             }, true);
           } else {
             record.endedAt = now2;
-            record.outcome = { status: "error", error: "Process restarted (Interrupted)" };
+            record.outcome = {
+              status: "error",
+              error: "Process restarted (Interrupted)"
+            };
             zombieCount++;
             await this.updateRunState(record.runId, {
               endedAt: record.endedAt,
@@ -4507,35 +4934,6 @@ class SubagentService extends Service4 {
     }
   }
 }
-// src/types/messaging.ts
-var MessagingEventType = {
-  SEND_REQUESTED: "MESSAGING_SEND_REQUESTED",
-  SENT: "MESSAGING_SENT",
-  SEND_FAILED: "MESSAGING_SEND_FAILED",
-  DELIVERED: "MESSAGING_DELIVERED",
-  READ: "MESSAGING_READ"
-};
-// src/types/sandbox.ts
-var SandboxEventType = {
-  CREATED: "SANDBOX_CREATED",
-  DESTROYED: "SANDBOX_DESTROYED",
-  COMMAND_STARTED: "SANDBOX_COMMAND_STARTED",
-  COMMAND_COMPLETED: "SANDBOX_COMMAND_COMPLETED",
-  COMMAND_FAILED: "SANDBOX_COMMAND_FAILED",
-  BROWSER_STARTED: "SANDBOX_BROWSER_STARTED",
-  BROWSER_STOPPED: "SANDBOX_BROWSER_STOPPED"
-};
-// src/types/subagent.ts
-var SubagentEventType = {
-  SPAWN_REQUESTED: "SUBAGENT_SPAWN_REQUESTED",
-  RUN_STARTED: "SUBAGENT_RUN_STARTED",
-  RUN_COMPLETED: "SUBAGENT_RUN_COMPLETED",
-  RUN_FAILED: "SUBAGENT_RUN_FAILED",
-  RUN_TIMEOUT: "SUBAGENT_RUN_TIMEOUT",
-  ANNOUNCE_SENT: "SUBAGENT_ANNOUNCE_SENT",
-  A2A_MESSAGE_SENT: "A2A_MESSAGE_SENT",
-  A2A_MESSAGE_RECEIVED: "A2A_MESSAGE_RECEIVED"
-};
 // src/sub-agents/claude-agent-sdk-sub-agent.ts
 import * as path2 from "node:path";
 import { pathToFileURL } from "node:url";
@@ -19243,877 +19641,182 @@ CONTENT_END
 [When finished:]
 DONE: Brief summary of what was accomplished
 
-## WORKING DIRECTORY
-
-{cwd}
-
-Now, let's solve the task methodically.`;
-function parseThinkingBlocks(response) {
-  const blocks = [];
-  const regex = /<thinking>([\s\S]*?)<\/thinking>/g;
-  let match;
-  while ((match = regex.exec(response)) !== null) {
-    blocks.push(match[1].trim());
-  }
-  return blocks;
-}
-function parsePlan(response) {
-  const steps = [];
-  const planMatch = response.match(/<plan>([\s\S]*?)<\/plan>/);
-  if (planMatch) {
-    const lines = planMatch[1].split(`
-`);
-    let id = 1;
-    for (const line of lines) {
-      const trimmed = line.trim();
-      const stepMatch = trimmed.match(/^\d+\.\s*\[([ x])\]\s*(.+)$/);
-      if (stepMatch) {
-        steps.push({
-          id: id++,
-          description: stepMatch[2],
-          completed: stepMatch[1] === "x"
-        });
-      }
-    }
-  }
-  return steps;
-}
-function parseToolCalls2(response) {
-  const calls = [];
-  const toolMatches = response.matchAll(/TOOL:\s*([A-Za-z0-9_:/.-]+)\s*\(([^)]*)\)/g);
-  for (const match of toolMatches) {
-    const name = match[1];
-    const argsStr = match[2];
-    const args = {};
-    const argMatches = argsStr.matchAll(/(\w+)="([^"]*)"/g);
-    for (const argMatch of argMatches) {
-      args[argMatch[1]] = argMatch[2];
-    }
-    let content;
-    if (name === "write_file") {
-      const fullMatch = match[0];
-      const afterTool = response.slice(response.indexOf(fullMatch) + fullMatch.length);
-      const contentMatch = afterTool.match(/CONTENT_START\s*([\s\S]*?)\s*CONTENT_END/);
-      if (contentMatch) {
-        content = contentMatch[1];
-      }
-    }
-    calls.push({ name, args, content });
-  }
-  return calls;
-}
-function generateContext7Docs(mcpTools) {
-  if (!mcpTools || mcpTools.length === 0) {
-    return "";
-  }
-  const context7Tools = mcpTools.filter((t) => t.server === "context7");
-  if (context7Tools.length === 0) {
-    return "";
-  }
-  return `
-### Documentation Lookup (Context7 MCP)
-When you need documentation for a library or API:
-- Use Context7 tools via MCP, for example:
-  - TOOL: MCP:context7/resolve-library-id(query="...", libraryName="...")
-  - TOOL: MCP:context7/query-docs(libraryId="...", query="...")
-- This is especially useful for unfamiliar libraries or APIs
-- Always check documentation when unsure about API usage`;
-}
-function generateMcpToolsDocs(mcpTools) {
-  if (!mcpTools || mcpTools.length === 0) {
-    return "";
-  }
-  const toolDocs = mcpTools.map((t) => {
-    const params = Object.entries(t.inputSchema.properties).map(([name, prop]) => `${name}="${prop.description}"`).join(", ");
-    return `- \`MCP:${t.server}/${t.name}(${params})\` - ${t.description}`;
-  }).join(`
-`);
-  return `
-### MCP Tools (External Services)
-Use these via TOOL calls like:
-TOOL: MCP:context7/query-docs(libraryId="...", query="...")
-
-${toolDocs}`;
-}
-function generateGoalsContext(goals) {
-  if (!goals || goals.length === 0) {
-    return "";
-  }
-  const activeGoals = goals.filter((g) => !g.isCompleted);
-  if (activeGoals.length === 0) {
-    return "";
-  }
-  const goalsList = activeGoals.map((g) => `- ${g.name}${g.description ? `: ${g.description}` : ""}`).join(`
-`);
-  return `
-## ACTIVE GOALS
-
-Consider how this task contributes to your active goals:
-${goalsList}`;
-}
-function generateTodoInstructions(context) {
-  if (!context.createTodo) {
-    return "";
-  }
-  return `
-You can create todos to track progress on complex tasks using the createTodo tool.`;
-}
-
-class ElizaOSNativeSubAgent {
-  name = "ElizaOS Native Worker";
-  type = "elizaos-native";
-  cancelled = false;
-  plan = [];
-  thinkingHistory = [];
-  maxIterations;
-  debug;
-  enableThinking;
-  constructor(config2) {
-    this.maxIterations = config2?.maxIterations ?? getEnvInt2("ELIZA_CODE_NATIVE_MAX_ITERATIONS", 30);
-    this.debug = config2?.debug ?? process.env.ELIZA_CODE_DEBUG === "1";
-    this.enableThinking = config2?.enableThinking ?? true;
-  }
-  cancel() {
-    this.cancelled = true;
-  }
-  async execute(task, context) {
-    this.cancelled = false;
-    this.plan = [];
-    this.thinkingHistory = [];
-    const {
-      runtime,
-      workingDirectory,
-      tools,
-      mcpTools,
-      goals,
-      onProgress,
-      onMessage,
-      onTrace,
-      createTodo,
-      completeTodo,
-      callMcpTool,
-      isCancelled,
-      isPaused
-    } = context;
-    const filesCreated = [];
-    const filesModified = [];
-    const createdTodos = [];
-    const maxTraceResponseChars = getEnvInt2("ELIZA_CODE_TRACE_MAX_RESPONSE_CHARS", this.debug ? 20000 : 4000);
-    const maxTracePromptChars = getEnvInt2("ELIZA_CODE_TRACE_MAX_PROMPT_CHARS", 20000);
-    const maxTraceToolOutputChars = getEnvInt2("ELIZA_CODE_TRACE_MAX_TOOL_OUTPUT_CHARS", 8000);
-    const maxUiPreviewChars = getEnvInt2("ELIZA_CODE_TRACE_UI_PREVIEW_CHARS", 180);
-    let traceSeq = 0;
-    const base = () => {
-      traceSeq += 1;
-      return { ts: Date.now(), seq: traceSeq };
-    };
-    onProgress({ taskId: task.id ?? "", progress: 0 });
-    const systemPrompt = ELIZAOS_NATIVE_SYSTEM_PROMPT.replace("{cwd}", workingDirectory).replace("{context7_docs}", generateContext7Docs(mcpTools)).replace("{mcp_tools_docs}", generateMcpToolsDocs(mcpTools)).replace("{goals_context}", generateGoalsContext(goals)).replace("{todo_instructions}", generateTodoInstructions(context));
-    const messages = [
-      {
-        role: "user",
-        content: `## TASK
-
-**${task.name}**
-
-${task.description ?? "No additional description provided."}
-
-Begin by analyzing the task in a <thinking> block, then explore the codebase to understand what needs to be done.`
-      }
-    ];
-    let iteration = 0;
-    let wasPaused = false;
-    while (iteration < this.maxIterations && !this.cancelled) {
-      if (isCancelled()) {
-        onMessage("Task cancelled", "warning");
-        onTrace?.({
-          kind: "status",
-          status: "cancelled",
-          message: "Task cancelled",
-          ...base()
-        });
-        return {
-          success: false,
-          summary: "Task was cancelled",
-          filesCreated,
-          filesModified,
-          error: "Cancelled by user"
-        };
-      }
-      if (isPaused?.()) {
-        if (!wasPaused) {
-          wasPaused = true;
-          onMessage("Task paused", "warning");
-          onTrace?.({
-            kind: "status",
-            status: "paused",
-            message: "Task paused",
-            ...base()
-          });
-        }
-        await sleep2(300);
-        continue;
-      }
-      if (wasPaused) {
-        wasPaused = false;
-        onMessage("Task resumed", "info");
-        onTrace?.({
-          kind: "status",
-          status: "resumed",
-          message: "Task resumed",
-          ...base()
-        });
-      }
-      iteration++;
-      onProgress({
-        taskId: task.id ?? "",
-        progress: Math.min(90, Math.round(iteration / this.maxIterations * 80))
-      });
-      const history = messages.map((m) => m.role === "user" ? `User: ${m.content}` : `Assistant: ${m.content}`).join(`
-
-`);
-      const prompt = `${systemPrompt}
-
-${history}
-
-Assistant:`;
-      const modelType = runtime.getModel(ModelType2.TEXT_REASONING_LARGE) ? ModelType2.TEXT_REASONING_LARGE : ModelType2.TEXT_LARGE;
-      let response;
-      try {
-        response = await runtime.useModel(modelType, {
-          prompt,
-          maxTokens: 4096,
-          temperature: 0.15
-        });
-      } catch (error48) {
-        const errorMsg = error48 instanceof Error ? error48.message : String(error48);
-        onMessage(`LLM error: ${errorMsg}`, "error");
-        onTrace?.({
-          kind: "note",
-          level: "error",
-          message: errorMsg,
-          ...base()
-        });
-        return {
-          success: false,
-          summary: `Failed: ${errorMsg}`,
-          filesCreated,
-          filesModified,
-          error: errorMsg
-        };
-      }
-      const thinkingBlocks = parseThinkingBlocks(response);
-      for (const thinking of thinkingBlocks) {
-        this.thinkingHistory.push(thinking);
-        if (this.debug || this.enableThinking)
-          onMessage(`THINKING: ${truncateText2(thinking, 300)}`, "info");
-      }
-      const parsedPlan = parsePlan(response);
-      if (parsedPlan.length > 0) {
-        this.plan = parsedPlan;
-        if (createTodo && createdTodos.length === 0) {
-          for (const step of this.plan) {
-            const todo = await createTodo(step.description, `Step ${step.id} of task: ${task.name}`);
-            createdTodos.push(todo);
-          }
-        }
-      }
-      const responseRedacted = redactSensitiveText2(response);
-      const responseStored = truncateText2(responseRedacted, maxTraceResponseChars);
-      const responsePreview = truncateText2(collapseWhitespace2(firstNonEmptyLine2(responseStored)), maxUiPreviewChars);
-      const llmTrace = this.debug ? {
-        kind: "llm",
-        iteration,
-        modelType: String(modelType),
-        response: responseStored,
-        responsePreview,
-        prompt: truncateText2(redactSensitiveText2(prompt), maxTracePromptChars),
-        ...base()
-      } : {
-        kind: "llm",
-        iteration,
-        modelType: String(modelType),
-        response: responseStored,
-        responsePreview,
-        ...base()
-      };
-      onTrace?.(llmTrace);
-      if (response.includes("DONE:")) {
-        const summary2 = response.split("DONE:")[1]?.trim().split(`
-`)[0] ?? "Task completed";
-        onMessage(`Done: ${summary2}`, "info");
-        onTrace?.({
-          kind: "note",
-          level: "info",
-          message: `Done: ${summary2}`,
-          ...base()
-        });
-        if (completeTodo) {
-          for (const todo of createdTodos) {
-            if (!todo.isCompleted) {
-              await completeTodo(todo.id);
-            }
-          }
-        }
-        return {
-          success: true,
-          summary: summary2,
-          filesCreated,
-          filesModified
-        };
-      }
-      const toolCalls = parseToolCalls2(response);
-      if (toolCalls.length === 0) {
-        messages.push({ role: "assistant", content: response });
-        messages.push({
-          role: "user",
-          content: `Please continue with the task. 
-
-Remember to:
-1. Start with a <thinking> block to reason about your next step
-2. Execute ONE tool using the TOOL: syntax
-3. Or say DONE: when the task is complete`
-        });
-        continue;
-      }
-      const call = toolCalls[0];
-      onTrace?.({
-        kind: "tool_call",
-        iteration,
-        name: call.name,
-        args: call.args,
-        ...base()
-      });
-      if (this.debug)
-        onMessage(`TOOL: ${call.name}(${JSON.stringify(call.args)})`, "info");
-      let result;
-      if (call.name.startsWith("MCP:") || call.name.includes("/")) {
-        if (callMcpTool) {
-          const [server, toolName] = call.name.replace("MCP:", "").split("/");
-          result = await callMcpTool(server, toolName, call.args);
-        } else {
-          result = { success: false, output: "MCP tools not available" };
-        }
-      } else {
-        result = await this.executeTool(call.name, call.args, call.content, tools, workingDirectory, filesCreated, filesModified, onMessage);
-      }
-      const outputRedacted = redactSensitiveText2(result.output);
-      const outputStored = truncateText2(outputRedacted, maxTraceToolOutputChars);
-      const outputPreview = truncateText2(collapseWhitespace2(firstNonEmptyLine2(outputStored)), maxUiPreviewChars);
-      onTrace?.({
-        kind: "tool_result",
-        iteration,
-        name: call.name,
-        success: result.success,
-        output: outputStored,
-        outputPreview,
-        ...base()
-      });
-      const completedSteps = this.plan.filter((s) => s.completed).length;
-      if (completeTodo && completedSteps > createdTodos.filter((t) => t.isCompleted).length) {
-        const todoToComplete = createdTodos.find((t) => !t.isCompleted);
-        if (todoToComplete) {
-          await completeTodo(todoToComplete.id);
-          todoToComplete.isCompleted = true;
-        }
-      }
-      messages.push({ role: "assistant", content: response });
-      messages.push({
-        role: "user",
-        content: `**Tool Result:**
-\`\`\`
-${truncateText2(result.output, 8000)}
-\`\`\`
-
-${result.success ? "✓ Command executed successfully." : "✗ Command failed."}
-
-Continue with the next step. Remember to start with a <thinking> block.`
-      });
-    }
-    const summary = `Completed after ${iteration} iterations (max reached)`;
-    onMessage(`Warning: ${summary}`, "warning");
-    onTrace?.({ kind: "note", level: "warning", message: summary, ...base() });
-    return {
-      success: true,
-      summary,
-      filesCreated,
-      filesModified
-    };
-  }
-  async executeTool(name, args, content, tools, workingDirectory, filesCreated, filesModified, onMessage) {
-    if (name === "write_file" && content !== undefined) {
-      const tool3 = tools.find((t) => t.name === "write_file");
-      if (!tool3) {
-        return { success: false, output: "write_file tool not available" };
-      }
-      const result2 = await tool3.execute({ ...args, content });
-      if (result2.success && args.filepath) {
-        if (!filesCreated.includes(args.filepath)) {
-          filesCreated.push(args.filepath);
-        }
-        const abs = path6.resolve(workingDirectory, args.filepath);
-        const link = pathToFileURL4(abs).toString();
-        const sizeValue = result2.data?.size;
-        const sizeSuffix = typeof sizeValue === "number" ? ` (${sizeValue} chars)` : "";
-        onMessage(`FILE write: ${args.filepath}${sizeSuffix} — ${link}`, "info");
-      }
-      return result2;
-    }
-    const tool2 = tools.find((t) => t.name === name || t.name === name.toLowerCase());
-    if (!tool2) {
-      return { success: false, output: `Unknown tool: ${name}` };
-    }
-    const result = await tool2.execute(args);
-    const filepath = result.data?.filepath;
-    if (result.success && typeof filepath === "string") {
-      if (name === "write_file" || name.includes("write")) {
-        if (!filesCreated.includes(filepath)) {
-          filesCreated.push(filepath);
-        }
-        const abs = path6.resolve(workingDirectory, filepath);
-        const link = pathToFileURL4(abs).toString();
-        const sizeValue = result.data?.size;
-        const sizeSuffix = typeof sizeValue === "number" ? ` (${sizeValue} chars)` : "";
-        onMessage(`FILE write: ${filepath}${sizeSuffix} — ${link}`, "info");
-      } else if (name === "edit_file" || name.includes("edit")) {
-        if (!filesModified.includes(filepath)) {
-          filesModified.push(filepath);
-        }
-        const abs = path6.resolve(workingDirectory, filepath);
-        const link = pathToFileURL4(abs).toString();
-        onMessage(`FILE edit: ${filepath} — ${link}`, "info");
-      }
-    }
-    return result;
-  }
-  getThinkingHistory() {
-    return [...this.thinkingHistory];
-  }
-  getPlan() {
-    return [...this.plan];
-  }
-}
-function sleep2(ms) {
-  return new Promise((resolve6) => setTimeout(resolve6, ms));
-}
-function getEnvInt2(key, defaultValue) {
-  const raw = process.env[key];
-  if (!raw)
-    return defaultValue;
-  const parsed = Number.parseInt(raw, 10);
-  if (!Number.isFinite(parsed) || parsed < 1)
-    return defaultValue;
-  return parsed;
-}
-function truncateText2(text, maxChars) {
-  if (text.length <= maxChars)
-    return text;
-  const safe = Math.max(0, maxChars - 1);
-  return `${text.slice(0, safe)}…`;
-}
-function collapseWhitespace2(text) {
-  return text.replace(/\s+/g, " ").trim();
-}
-function firstNonEmptyLine2(text) {
-  const lines = text.split(`
-`);
-  for (const line of lines) {
-    const trimmed = line.trim();
-    if (trimmed.length > 0)
-      return trimmed;
-  }
-  return "";
-}
-function redactSensitiveText2(text) {
-  let out = text;
-  out = out.replace(/-----BEGIN [A-Z ]*PRIVATE KEY-----[\s\S]*?-----END [A-Z ]*PRIVATE KEY-----/g, "[REDACTED:PRIVATE_KEY]");
-  out = out.replace(/\bsk-[A-Za-z0-9]{16,}\b/g, "[REDACTED:API_KEY]");
-  out = out.replace(/\bAKIA[0-9A-Z]{16}\b/g, "[REDACTED:AWS_ACCESS_KEY_ID]");
-  out = out.replace(/\bASIA[0-9A-Z]{16}\b/g, "[REDACTED:AWS_ACCESS_KEY_ID]");
-  out = out.replace(/\bghp_[A-Za-z0-9]{20,}\b/g, "[REDACTED:GITHUB_TOKEN]");
-  out = out.replace(/\bgithub_pat_[A-Za-z0-9_]{20,}\b/g, "[REDACTED:GITHUB_TOKEN]");
-  out = out.replace(/\bxox[baprs]-[A-Za-z0-9-]{10,}\b/g, "[REDACTED:SLACK_TOKEN]");
-  out = out.replace(/\bBearer\s+[A-Za-z0-9._-]{10,}\b/g, "Bearer [REDACTED]");
-  out = out.replace(/\bBasic\s+[A-Za-z0-9+/=]{10,}\b/g, "Basic [REDACTED]");
-  out = out.replace(/(password\s*[:=]\s*)(\S+)/gi, "$1[REDACTED]");
-  for (const [key, value] of Object.entries(process.env)) {
-    if (!value || value.length < 12)
-      continue;
-    const upper = key.toUpperCase();
-    if (upper.includes("KEY") || upper.includes("TOKEN") || upper.includes("SECRET") || upper.includes("PASSWORD") || upper.includes("AUTH")) {
-      out = out.split(value).join(`[REDACTED:${key}]`);
-    }
-  }
-  return out;
-}
-
-// src/sub-agents/opencode-sub-agent.ts
-import { spawn as spawn2 } from "node:child_process";
-import * as path7 from "node:path";
-import { pathToFileURL as pathToFileURL5 } from "node:url";
-import { ModelType as ModelType3 } from "@elizaos/core";
-var OPENCODE_SYSTEM_PROMPT = `You are OpenCode, an expert AI coding agent with LSP integration awareness.
-You help developers write, debug, and refactor code with precision and context-awareness.
-
-## CAPABILITIES
-
-1. **LSP-Aware Editing**: Consider type information, imports, and dependencies when making changes
-2. **Multi-Session Support**: Handle complex tasks by breaking them into logical steps
-3. **Context Management**: Track relevant files and maintain awareness of the broader codebase
-4. **Precise Modifications**: Make targeted, minimal changes that preserve existing functionality
-
-## AVAILABLE TOOLS
-
-1. TOOL: read_file(filepath="path/to/file")
-   - Read the contents of a file
-
-2. TOOL: list_files(path="directory")
-   - List contents of a directory
-
-3. TOOL: search_files(pattern="text", path="directory", max_matches="50")
-   - Search for text patterns in files
-
-4. TOOL: shell(command="your command")
-   - Execute shell commands (use for git, tests, type checking, etc.)
-
-5. TOOL: edit_file(filepath="file", old_str="find this", new_str="replace with")
-   - Make precise search/replace edits to files
-
-6. TOOL: write_file(filepath="path/to/file")
-   CONTENT_START
-   <complete file contents>
-   CONTENT_END
-   - Create or overwrite a file with complete contents
-
-## METHODOLOGY
-
-### 1. UNDERSTAND
-- Read relevant files to understand the context
-- Check for type definitions and interfaces
-- Understand the existing code patterns
-
-### 2. PLAN
-- Identify all files that need modification
-- Consider imports and dependencies
-- Plan changes in the correct order
-
-### 3. IMPLEMENT
-- Make precise, targeted changes
-- Prefer edit_file for modifications
-- Use write_file only for new files
-
-### 4. VERIFY
-- Read modified files to confirm changes
-- Consider running type checks or tests
-- Ensure no unintended side effects
-
-## RULES
-
-1. **COMPLETE CODE ONLY**: Never truncate or use placeholders
-2. **MINIMAL CHANGES**: Change only what's necessary
-3. **TYPE SAFETY**: Respect TypeScript types and interfaces
-4. **PRESERVE PATTERNS**: Follow existing code conventions
-5. **ONE TOOL AT A TIME**: Execute tools sequentially, waiting for results
-
-## OUTPUT FORMAT
-
-When using tools:
-TOOL: command(args...)
-
-For write_file with content:
-TOOL: write_file(filepath="path/to/file")
-CONTENT_START
-<complete file contents here>
-CONTENT_END
-
-When finished:
-DONE: <summary of what was accomplished>
-
-## WORKING DIRECTORY
-
-{cwd}`;
-function parseOpenCodeOutput(output) {
-  const events = [];
-  const lines = output.split(`
-`);
-  for (const line of lines) {
-    const trimmed = line.trim();
-    if (!trimmed)
-      continue;
-    if (trimmed.startsWith("{") && trimmed.endsWith("}")) {
-      try {
-        const parsed = JSON.parse(trimmed);
-        if (parsed.type && typeof parsed.type === "string") {
-          events.push({
-            type: parsed.type,
-            data: parsed
-          });
-        }
-      } catch {
-        events.push({
-          type: "message",
-          data: { content: trimmed }
-        });
-      }
-    } else {
-      events.push({
-        type: "message",
-        data: { content: trimmed }
-      });
-    }
-  }
-  return events;
-}
-function parseToolCalls3(response) {
-  const calls = [];
-  const toolMatches = response.matchAll(/TOOL:\s*([A-Za-z0-9_:/.-]+)\s*\(([^)]*)\)/g);
-  for (const match of toolMatches) {
-    const name = match[1];
-    const argsStr = match[2];
-    const args = {};
-    const argMatches = argsStr.matchAll(/(\w+)="([^"]*)"/g);
-    for (const argMatch of argMatches) {
-      args[argMatch[1]] = argMatch[2];
-    }
-    let content;
-    if (name === "write_file") {
-      const fullMatch = match[0];
-      const afterTool = response.slice(response.indexOf(fullMatch) + fullMatch.length);
-      const contentMatch = afterTool.match(/CONTENT_START\s*([\s\S]*?)\s*CONTENT_END/);
-      if (contentMatch) {
-        content = contentMatch[1];
-      }
-    }
-    calls.push({ name, args, content });
-  }
-  return calls;
-}
-async function isOpenCodeAvailable() {
-  return new Promise((resolve7) => {
-    const child = spawn2("opencode", ["--version"], {
-      stdio: ["ignore", "pipe", "pipe"]
-    });
-    let resolved = false;
-    const timeout = setTimeout(() => {
-      if (!resolved) {
-        resolved = true;
-        child.kill();
-        resolve7(false);
-      }
-    }, 5000);
-    child.on("error", () => {
-      if (!resolved) {
-        resolved = true;
-        clearTimeout(timeout);
-        resolve7(false);
-      }
-    });
-    child.on("close", (code) => {
-      if (!resolved) {
-        resolved = true;
-        clearTimeout(timeout);
-        resolve7(code === 0);
-      }
-    });
-  });
-}
-
-class OpenCodeSubAgent {
-  name = "OpenCode Worker";
-  type = "opencode";
-  cancelled = false;
-  process = null;
-  maxIterations;
-  debug;
-  preferCli;
-  constructor(config2) {
-    this.maxIterations = config2?.maxIterations ?? getEnvInt3("ELIZA_CODE_OPENCODE_MAX_ITERATIONS", 25);
-    this.debug = config2?.debug ?? process.env.ELIZA_CODE_DEBUG === "1";
-    this.preferCli = config2?.preferCli ?? process.env.ELIZA_CODE_OPENCODE_PREFER_CLI === "1";
-  }
-  cancel() {
-    this.cancelled = true;
-    if (this.process) {
-      this.process.kill();
-      this.process = null;
-    }
-  }
-  async execute(task, context) {
-    this.cancelled = false;
-    if (this.preferCli) {
-      const cliAvailable = await isOpenCodeAvailable();
-      if (cliAvailable) {
-        return this.executeWithCli(task, context);
-      }
-    }
-    return this.executeWithPrompt(task, context);
-  }
-  async executeWithCli(task, context) {
-    const { workingDirectory, onMessage, onTrace, isCancelled } = context;
-    const filesCreated = [];
-    const filesModified = [];
-    let finalResponse = "";
-    let traceSeq = 0;
-    const base = () => {
-      traceSeq += 1;
-      return { ts: Date.now(), seq: traceSeq };
-    };
-    return new Promise((resolve7) => {
-      const prompt = `${task.name}
-
-${task.description ?? ""}`.trim();
-      this.process = spawn2("opencode", ["--json", "--prompt", prompt], {
-        cwd: workingDirectory,
-        stdio: ["ignore", "pipe", "pipe"],
-        env: { ...process.env, OPENCODE_NONINTERACTIVE: "1" }
-      });
-      let _stdout = "";
-      let stderr = "";
-      this.process.stdout?.on("data", (data) => {
-        const chunk = data.toString();
-        _stdout += chunk;
-        if (isCancelled()) {
-          this.cancel();
-          return;
-        }
-        const events = parseOpenCodeOutput(chunk);
-        for (const event of events) {
-          switch (event.type) {
-            case "message": {
-              const content = event.data.content;
-              if (content) {
-                finalResponse = content;
-                if (this.debug) {
-                  onMessage(content, "info");
-                }
-              }
-              break;
-            }
-            case "tool_call": {
-              const toolName = event.data.tool;
-              const toolArgs = event.data.args;
-              onTrace?.({
-                kind: "tool_call",
-                iteration: traceSeq,
-                name: toolName,
-                args: toolArgs,
-                ...base()
-              });
-              break;
-            }
-            case "tool_result": {
-              const toolName = event.data.tool;
-              const success2 = event.data.success;
-              const output = event.data.output;
-              onTrace?.({
-                kind: "tool_result",
-                iteration: traceSeq,
-                name: toolName,
-                success: success2,
-                output: truncateText3(output, 4000),
-                outputPreview: truncateText3(output, 180),
-                ...base()
-              });
-              break;
-            }
-            case "file_change": {
-              const filepath = event.data.path;
-              const action = event.data.action;
-              if (filepath) {
-                if (action === "create" || action === "write") {
-                  if (!filesCreated.includes(filepath)) {
-                    filesCreated.push(filepath);
-                  }
-                } else {
-                  if (!filesModified.includes(filepath)) {
-                    filesModified.push(filepath);
-                  }
-                }
-                const abs = path7.resolve(workingDirectory, filepath);
-                const link = pathToFileURL5(abs).toString();
-                onMessage(`FILE ${action}: ${filepath} — ${link}`, "info");
-              }
-              break;
-            }
-            case "done": {
-              finalResponse = event.data.summary || finalResponse;
-              break;
-            }
-            case "error": {
-              const errorMsg = event.data.message;
-              onMessage(`Error: ${errorMsg}`, "error");
-              break;
-            }
-          }
-        }
-      });
-      this.process.stderr?.on("data", (data) => {
-        stderr += data.toString();
-      });
-      this.process.on("error", (error48) => {
-        resolve7({
-          success: false,
-          summary: `OpenCode CLI error: ${error48.message}`,
-          filesCreated,
-          filesModified,
-          error: error48.message
-        });
-      });
-      this.process.on("close", (code) => {
-        this.process = null;
-        if (this.cancelled || isCancelled()) {
-          resolve7({
-            success: false,
-            summary: "Cancelled",
-            filesCreated,
-            filesModified,
-            error: "Cancelled"
-          });
-          return;
-        }
-        const summary = finalResponse.trim().split(`
-`)[0] || `Completed with exit code ${code}`;
-        resolve7({
-          success: code === 0,
-          summary,
-          filesCreated,
-          filesModified,
-          error: code !== 0 ? stderr || `Exit code: ${code}` : undefined
+## WORKING DIRECTORY
+
+{cwd}
+
+Now, let's solve the task methodically.`;
+function parseThinkingBlocks(response) {
+  const blocks = [];
+  const regex = /<thinking>([\s\S]*?)<\/thinking>/g;
+  let match;
+  while ((match = regex.exec(response)) !== null) {
+    blocks.push(match[1].trim());
+  }
+  return blocks;
+}
+function parsePlan(response) {
+  const steps = [];
+  const planMatch = response.match(/<plan>([\s\S]*?)<\/plan>/);
+  if (planMatch) {
+    const lines = planMatch[1].split(`
+`);
+    let id = 1;
+    for (const line of lines) {
+      const trimmed = line.trim();
+      const stepMatch = trimmed.match(/^\d+\.\s*\[([ x])\]\s*(.+)$/);
+      if (stepMatch) {
+        steps.push({
+          id: id++,
+          description: stepMatch[2],
+          completed: stepMatch[1] === "x"
         });
-      });
-    });
+      }
+    }
   }
-  async executeWithPrompt(task, context) {
+  return steps;
+}
+function parseToolCalls2(response) {
+  const calls = [];
+  const toolMatches = response.matchAll(/TOOL:\s*([A-Za-z0-9_:/.-]+)\s*\(([^)]*)\)/g);
+  for (const match of toolMatches) {
+    const name = match[1];
+    const argsStr = match[2];
+    const args = {};
+    const argMatches = argsStr.matchAll(/(\w+)="([^"]*)"/g);
+    for (const argMatch of argMatches) {
+      args[argMatch[1]] = argMatch[2];
+    }
+    let content;
+    if (name === "write_file") {
+      const fullMatch = match[0];
+      const afterTool = response.slice(response.indexOf(fullMatch) + fullMatch.length);
+      const contentMatch = afterTool.match(/CONTENT_START\s*([\s\S]*?)\s*CONTENT_END/);
+      if (contentMatch) {
+        content = contentMatch[1];
+      }
+    }
+    calls.push({ name, args, content });
+  }
+  return calls;
+}
+function generateContext7Docs(mcpTools) {
+  if (!mcpTools || mcpTools.length === 0) {
+    return "";
+  }
+  const context7Tools = mcpTools.filter((t) => t.server === "context7");
+  if (context7Tools.length === 0) {
+    return "";
+  }
+  return `
+### Documentation Lookup (Context7 MCP)
+When you need documentation for a library or API:
+- Use Context7 tools via MCP, for example:
+  - TOOL: MCP:context7/resolve-library-id(query="...", libraryName="...")
+  - TOOL: MCP:context7/query-docs(libraryId="...", query="...")
+- This is especially useful for unfamiliar libraries or APIs
+- Always check documentation when unsure about API usage`;
+}
+function generateMcpToolsDocs(mcpTools) {
+  if (!mcpTools || mcpTools.length === 0) {
+    return "";
+  }
+  const toolDocs = mcpTools.map((t) => {
+    const params = Object.entries(t.inputSchema.properties).map(([name, prop]) => `${name}="${prop.description}"`).join(", ");
+    return `- \`MCP:${t.server}/${t.name}(${params})\` - ${t.description}`;
+  }).join(`
+`);
+  return `
+### MCP Tools (External Services)
+Use these via TOOL calls like:
+TOOL: MCP:context7/query-docs(libraryId="...", query="...")
+
+${toolDocs}`;
+}
+function generateGoalsContext(goals) {
+  if (!goals || goals.length === 0) {
+    return "";
+  }
+  const activeGoals = goals.filter((g) => !g.isCompleted);
+  if (activeGoals.length === 0) {
+    return "";
+  }
+  const goalsList = activeGoals.map((g) => `- ${g.name}${g.description ? `: ${g.description}` : ""}`).join(`
+`);
+  return `
+## ACTIVE GOALS
+
+Consider how this task contributes to your active goals:
+${goalsList}`;
+}
+function generateTodoInstructions(context) {
+  if (!context.createTodo) {
+    return "";
+  }
+  return `
+You can create todos to track progress on complex tasks using the createTodo tool.`;
+}
+
+class ElizaOSNativeSubAgent {
+  name = "ElizaOS Native Worker";
+  type = "elizaos-native";
+  cancelled = false;
+  plan = [];
+  thinkingHistory = [];
+  maxIterations;
+  debug;
+  enableThinking;
+  constructor(config2) {
+    this.maxIterations = config2?.maxIterations ?? getEnvInt2("ELIZA_CODE_NATIVE_MAX_ITERATIONS", 30);
+    this.debug = config2?.debug ?? process.env.ELIZA_CODE_DEBUG === "1";
+    this.enableThinking = config2?.enableThinking ?? true;
+  }
+  cancel() {
+    this.cancelled = true;
+  }
+  async execute(task, context) {
+    this.cancelled = false;
+    this.plan = [];
+    this.thinkingHistory = [];
     const {
       runtime,
       workingDirectory,
       tools,
-      callMcpTool,
+      mcpTools,
+      goals,
       onProgress,
       onMessage,
       onTrace,
+      createTodo,
+      completeTodo,
+      callMcpTool,
       isCancelled,
       isPaused
     } = context;
     const filesCreated = [];
     const filesModified = [];
-    const maxTraceResponseChars = getEnvInt3("ELIZA_CODE_TRACE_MAX_RESPONSE_CHARS", this.debug ? 20000 : 4000);
-    const maxTraceToolOutputChars = getEnvInt3("ELIZA_CODE_TRACE_MAX_TOOL_OUTPUT_CHARS", 8000);
-    const maxUiPreviewChars = getEnvInt3("ELIZA_CODE_TRACE_UI_PREVIEW_CHARS", 180);
+    const createdTodos = [];
+    const maxTraceResponseChars = getEnvInt2("ELIZA_CODE_TRACE_MAX_RESPONSE_CHARS", this.debug ? 20000 : 4000);
+    const maxTracePromptChars = getEnvInt2("ELIZA_CODE_TRACE_MAX_PROMPT_CHARS", 20000);
+    const maxTraceToolOutputChars = getEnvInt2("ELIZA_CODE_TRACE_MAX_TOOL_OUTPUT_CHARS", 8000);
+    const maxUiPreviewChars = getEnvInt2("ELIZA_CODE_TRACE_UI_PREVIEW_CHARS", 180);
     let traceSeq = 0;
     const base = () => {
       traceSeq += 1;
       return { ts: Date.now(), seq: traceSeq };
     };
     onProgress({ taskId: task.id ?? "", progress: 0 });
+    const systemPrompt = ELIZAOS_NATIVE_SYSTEM_PROMPT.replace("{cwd}", workingDirectory).replace("{context7_docs}", generateContext7Docs(mcpTools)).replace("{mcp_tools_docs}", generateMcpToolsDocs(mcpTools)).replace("{goals_context}", generateGoalsContext(goals)).replace("{todo_instructions}", generateTodoInstructions(context));
     const messages = [
       {
         role: "user",
-        content: `Execute this task: ${task.name}
+        content: `## TASK
 
-Description: ${task.description ?? "No additional description provided."}
+**${task.name}**
 
-Start by understanding the requirements, then implement the solution step by step.`
+${task.description ?? "No additional description provided."}
+
+Begin by analyzing the task in a <thinking> block, then explore the codebase to understand what needs to be done.`
       }
     ];
     let iteration = 0;
@@ -20146,7 +19849,7 @@ Start by understanding the requirements, then implement the solution step by ste
             ...base()
           });
         }
-        await sleep3(300);
+        await sleep2(300);
         continue;
       }
       if (wasPaused) {
@@ -20164,7 +19867,6 @@ Start by understanding the requirements, then implement the solution step by ste
         taskId: task.id ?? "",
         progress: Math.min(90, Math.round(iteration / this.maxIterations * 80))
       });
-      const systemPrompt = OPENCODE_SYSTEM_PROMPT.replace("{cwd}", workingDirectory);
       const history = messages.map((m) => m.role === "user" ? `User: ${m.content}` : `Assistant: ${m.content}`).join(`
 
 `);
@@ -20173,13 +19875,13 @@ Start by understanding the requirements, then implement the solution step by ste
 ${history}
 
 Assistant:`;
-      const modelType = runtime.getModel(ModelType3.TEXT_REASONING_LARGE) ? ModelType3.TEXT_REASONING_LARGE : ModelType3.TEXT_LARGE;
+      const modelType = runtime.getModel(ModelType2.TEXT_REASONING_LARGE) ? ModelType2.TEXT_REASONING_LARGE : ModelType2.TEXT_LARGE;
       let response;
       try {
         response = await runtime.useModel(modelType, {
           prompt,
           maxTokens: 4096,
-          temperature: 0.2
+          temperature: 0.15
         });
       } catch (error48) {
         const errorMsg = error48 instanceof Error ? error48.message : String(error48);
@@ -20198,17 +19900,42 @@ Assistant:`;
           error: errorMsg
         };
       }
-      const responseRedacted = redactSensitiveText3(response);
-      const responseStored = truncateText3(responseRedacted, maxTraceResponseChars);
-      const responsePreview = truncateText3(collapseWhitespace3(firstNonEmptyLine3(responseStored)), maxUiPreviewChars);
-      onTrace?.({
+      const thinkingBlocks = parseThinkingBlocks(response);
+      for (const thinking of thinkingBlocks) {
+        this.thinkingHistory.push(thinking);
+        if (this.debug || this.enableThinking)
+          onMessage(`THINKING: ${truncateText2(thinking, 300)}`, "info");
+      }
+      const parsedPlan = parsePlan(response);
+      if (parsedPlan.length > 0) {
+        this.plan = parsedPlan;
+        if (createTodo && createdTodos.length === 0) {
+          for (const step of this.plan) {
+            const todo = await createTodo(step.description, `Step ${step.id} of task: ${task.name}`);
+            createdTodos.push(todo);
+          }
+        }
+      }
+      const responseRedacted = redactSensitiveText2(response);
+      const responseStored = truncateText2(responseRedacted, maxTraceResponseChars);
+      const responsePreview = truncateText2(collapseWhitespace2(firstNonEmptyLine2(responseStored)), maxUiPreviewChars);
+      const llmTrace = this.debug ? {
         kind: "llm",
         iteration,
         modelType: String(modelType),
         response: responseStored,
         responsePreview,
+        prompt: truncateText2(redactSensitiveText2(prompt), maxTracePromptChars),
         ...base()
-      });
+      } : {
+        kind: "llm",
+        iteration,
+        modelType: String(modelType),
+        response: responseStored,
+        responsePreview,
+        ...base()
+      };
+      onTrace?.(llmTrace);
       if (response.includes("DONE:")) {
         const summary2 = response.split("DONE:")[1]?.trim().split(`
 `)[0] ?? "Task completed";
@@ -20219,6 +19946,13 @@ Assistant:`;
           message: `Done: ${summary2}`,
           ...base()
         });
+        if (completeTodo) {
+          for (const todo of createdTodos) {
+            if (!todo.isCompleted) {
+              await completeTodo(todo.id);
+            }
+          }
+        }
         return {
           success: true,
           summary: summary2,
@@ -20226,61 +19960,75 @@ Assistant:`;
           filesModified
         };
       }
-      const toolCalls = parseToolCalls3(response);
+      const toolCalls = parseToolCalls2(response);
       if (toolCalls.length === 0) {
         messages.push({ role: "assistant", content: response });
         messages.push({
           role: "user",
-          content: "Continue with the task. Use TOOL: to execute commands, or say DONE: when finished."
+          content: `Please continue with the task. 
+
+Remember to:
+1. Start with a <thinking> block to reason about your next step
+2. Execute ONE tool using the TOOL: syntax
+3. Or say DONE: when the task is complete`
         });
         continue;
       }
-      const results = [];
-      for (const call of toolCalls) {
-        onTrace?.({
-          kind: "tool_call",
-          iteration,
-          name: call.name,
-          args: call.args,
-          ...base()
-        });
-        const result = (call.name.startsWith("MCP:") || call.name.includes("/")) && callMcpTool ? await (async () => {
-          const [server, toolName] = call.name.replace("MCP:", "").split("/");
-          if (!server || !toolName) {
-            return {
-              success: false,
-              output: `Invalid MCP tool call name: ${call.name}`
-            };
-          }
-          return await callMcpTool(server, toolName, call.args);
-        })() : await this.executeTool(call.name, call.args, call.content, tools, workingDirectory, filesCreated, filesModified, onMessage);
-        results.push({ name: call.name, result });
-        const outputRedacted = redactSensitiveText3(result.output);
-        const outputStored = truncateText3(outputRedacted, maxTraceToolOutputChars);
-        const outputPreview = truncateText3(collapseWhitespace3(firstNonEmptyLine3(outputStored)), maxUiPreviewChars);
-        onTrace?.({
-          kind: "tool_result",
-          iteration,
-          name: call.name,
-          success: result.success,
-          output: outputStored,
-          outputPreview,
-          ...base()
-        });
+      const call = toolCalls[0];
+      onTrace?.({
+        kind: "tool_call",
+        iteration,
+        name: call.name,
+        args: call.args,
+        ...base()
+      });
+      if (this.debug)
+        onMessage(`TOOL: ${call.name}(${JSON.stringify(call.args)})`, "info");
+      let result;
+      if (call.name.startsWith("MCP:") || call.name.includes("/")) {
+        if (callMcpTool) {
+          const [server, toolName] = call.name.replace("MCP:", "").split("/");
+          result = await callMcpTool(server, toolName, call.args);
+        } else {
+          result = { success: false, output: "MCP tools not available" };
+        }
+      } else {
+        result = await this.executeTool(call.name, call.args, call.content, tools, workingDirectory, filesCreated, filesModified, onMessage);
+      }
+      const outputRedacted = redactSensitiveText2(result.output);
+      const outputStored = truncateText2(outputRedacted, maxTraceToolOutputChars);
+      const outputPreview = truncateText2(collapseWhitespace2(firstNonEmptyLine2(outputStored)), maxUiPreviewChars);
+      onTrace?.({
+        kind: "tool_result",
+        iteration,
+        name: call.name,
+        success: result.success,
+        output: outputStored,
+        outputPreview,
+        ...base()
+      });
+      const completedSteps = this.plan.filter((s) => s.completed).length;
+      if (completeTodo && completedSteps > createdTodos.filter((t) => t.isCompleted).length) {
+        const todoToComplete = createdTodos.find((t) => !t.isCompleted);
+        if (todoToComplete) {
+          await completeTodo(todoToComplete.id);
+          todoToComplete.isCompleted = true;
+        }
       }
-      const resultOutput = results.map((r) => `[${r.name}] ${r.result.success ? "✓" : "✗"} ${truncateText3(r.result.output, 2000)}`).join(`
-
-`);
       messages.push({ role: "assistant", content: response });
       messages.push({
         role: "user",
-        content: `Tool results:
-${resultOutput}
+        content: `**Tool Result:**
+\`\`\`
+${truncateText2(result.output, 8000)}
+\`\`\`
 
-Continue with the next step.`
+${result.success ? "✓ Command executed successfully." : "✗ Command failed."}
+
+Continue with the next step. Remember to start with a <thinking> block.`
       });
     }
-    const summary = `Completed after ${iteration} iterations`;
+    const summary = `Completed after ${iteration} iterations (max reached)`;
     onMessage(`Warning: ${summary}`, "warning");
     onTrace?.({ kind: "note", level: "warning", message: summary, ...base() });
     return {
@@ -20301,9 +20049,11 @@ Continue with the next step.`
         if (!filesCreated.includes(args.filepath)) {
           filesCreated.push(args.filepath);
         }
-        const abs = path7.resolve(workingDirectory, args.filepath);
-        const link = pathToFileURL5(abs).toString();
-        onMessage(`FILE write: ${args.filepath} — ${link}`, "info");
+        const abs = path6.resolve(workingDirectory, args.filepath);
+        const link = pathToFileURL4(abs).toString();
+        const sizeValue = result2.data?.size;
+        const sizeSuffix = typeof sizeValue === "number" ? ` (${sizeValue} chars)` : "";
+        onMessage(`FILE write: ${args.filepath}${sizeSuffix} — ${link}`, "info");
       }
       return result2;
     }
@@ -20318,8 +20068,8 @@ Continue with the next step.`
         if (!filesCreated.includes(filepath)) {
           filesCreated.push(filepath);
         }
-        const abs = path7.resolve(workingDirectory, filepath);
-        const link = pathToFileURL5(abs).toString();
+        const abs = path6.resolve(workingDirectory, filepath);
+        const link = pathToFileURL4(abs).toString();
         const sizeValue = result.data?.size;
         const sizeSuffix = typeof sizeValue === "number" ? ` (${sizeValue} chars)` : "";
         onMessage(`FILE write: ${filepath}${sizeSuffix} — ${link}`, "info");
@@ -20327,18 +20077,24 @@ Continue with the next step.`
         if (!filesModified.includes(filepath)) {
           filesModified.push(filepath);
         }
-        const abs = path7.resolve(workingDirectory, filepath);
-        const link = pathToFileURL5(abs).toString();
+        const abs = path6.resolve(workingDirectory, filepath);
+        const link = pathToFileURL4(abs).toString();
         onMessage(`FILE edit: ${filepath} — ${link}`, "info");
       }
     }
     return result;
   }
+  getThinkingHistory() {
+    return [...this.thinkingHistory];
+  }
+  getPlan() {
+    return [...this.plan];
+  }
 }
-function sleep3(ms) {
-  return new Promise((resolve7) => setTimeout(resolve7, ms));
+function sleep2(ms) {
+  return new Promise((resolve6) => setTimeout(resolve6, ms));
 }
-function getEnvInt3(key, defaultValue) {
+function getEnvInt2(key, defaultValue) {
   const raw = process.env[key];
   if (!raw)
     return defaultValue;
@@ -20347,16 +20103,16 @@ function getEnvInt3(key, defaultValue) {
     return defaultValue;
   return parsed;
 }
-function truncateText3(text, maxChars) {
+function truncateText2(text, maxChars) {
   if (text.length <= maxChars)
     return text;
   const safe = Math.max(0, maxChars - 1);
   return `${text.slice(0, safe)}…`;
 }
-function collapseWhitespace3(text) {
+function collapseWhitespace2(text) {
   return text.replace(/\s+/g, " ").trim();
 }
-function firstNonEmptyLine3(text) {
+function firstNonEmptyLine2(text) {
   const lines = text.split(`
 `);
   for (const line of lines) {
@@ -20366,11 +20122,12 @@ function firstNonEmptyLine3(text) {
   }
   return "";
 }
-function redactSensitiveText3(text) {
+function redactSensitiveText2(text) {
   let out = text;
   out = out.replace(/-----BEGIN [A-Z ]*PRIVATE KEY-----[\s\S]*?-----END [A-Z ]*PRIVATE KEY-----/g, "[REDACTED:PRIVATE_KEY]");
   out = out.replace(/\bsk-[A-Za-z0-9]{16,}\b/g, "[REDACTED:API_KEY]");
   out = out.replace(/\bAKIA[0-9A-Z]{16}\b/g, "[REDACTED:AWS_ACCESS_KEY_ID]");
+  out = out.replace(/\bASIA[0-9A-Z]{16}\b/g, "[REDACTED:AWS_ACCESS_KEY_ID]");
   out = out.replace(/\bghp_[A-Za-z0-9]{20,}\b/g, "[REDACTED:GITHUB_TOKEN]");
   out = out.replace(/\bgithub_pat_[A-Za-z0-9_]{20,}\b/g, "[REDACTED:GITHUB_TOKEN]");
   out = out.replace(/\bxox[baprs]-[A-Za-z0-9-]{10,}\b/g, "[REDACTED:SLACK_TOKEN]");
@@ -20388,393 +20145,653 @@ function redactSensitiveText3(text) {
   return out;
 }
 
-// src/sub-agents/sweagent-sub-agent.ts
-import * as fs3 from "node:fs/promises";
-import * as path8 from "node:path";
-import {
-  AbstractModel,
-  DefaultAgent,
-  TextProblemStatement,
-  ToolHandler
-} from "@elizaos/sweagent-root";
-var SUBMISSION_MARKER = "<<SWE_AGENT_SUBMISSION>>";
-function getEnvInt4(key, defaultValue) {
-  const raw = process.env[key];
-  if (!raw)
-    return defaultValue;
-  const parsed = Number.parseInt(raw, 10);
-  if (!Number.isFinite(parsed) || parsed < 1)
-    return defaultValue;
-  return parsed;
-}
-function truncate(text, maxChars) {
-  if (text.length <= maxChars)
-    return text;
-  return `${text.slice(0, Math.max(0, maxChars - 1))}…`;
-}
-function redactSensitiveText4(text) {
-  let out = text;
-  out = out.replace(/-----BEGIN [A-Z ]*PRIVATE KEY-----[\s\S]*?-----END [A-Z ]*PRIVATE KEY-----/g, "[REDACTED:PRIVATE_KEY]");
-  out = out.replace(/\bsk-[A-Za-z0-9]{16,}\b/g, "[REDACTED:API_KEY]");
-  out = out.replace(/\bAKIA[0-9A-Z]{16}\b/g, "[REDACTED:AWS_ACCESS_KEY_ID]");
-  out = out.replace(/\bASIA[0-9A-Z]{16}\b/g, "[REDACTED:AWS_ACCESS_KEY_ID]");
-  out = out.replace(/\bghp_[A-Za-z0-9]{20,}\b/g, "[REDACTED:GITHUB_TOKEN]");
-  out = out.replace(/\bgithub_pat_[A-Za-z0-9_]{20,}\b/g, "[REDACTED:GITHUB_TOKEN]");
-  out = out.replace(/\bxox[baprs]-[A-Za-z0-9-]{10,}\b/g, "[REDACTED:SLACK_TOKEN]");
-  out = out.replace(/\bBearer\s+[A-Za-z0-9._-]{10,}\b/g, "Bearer [REDACTED]");
-  out = out.replace(/\bBasic\s+[A-Za-z0-9+/=]{10,}\b/g, "Basic [REDACTED]");
-  out = out.replace(/(password\s*[:=]\s*)(\S+)/gi, "$1[REDACTED]");
-  for (const [key, value] of Object.entries(process.env)) {
-    if (!value || value.length < 12)
-      continue;
-    const upper = key.toUpperCase();
-    if (upper.includes("KEY") || upper.includes("TOKEN") || upper.includes("SECRET") || upper.includes("PASSWORD") || upper.includes("PASSWD") || upper.includes("AUTH")) {
-      out = out.split(value).join(`[REDACTED:${key}]`);
-    }
-  }
-  return out;
-}
-async function ensureDir(dir) {
-  if (!dir || dir.trim() === "") {
-    throw new Error("Directory path cannot be empty");
-  }
-  await fs3.mkdir(dir, { recursive: true });
-}
-function findTool(tools, name) {
-  const tool2 = tools.find((t) => t.name === name);
-  if (!tool2)
-    throw new Error(`Required tool not available: ${name}`);
-  return tool2;
-}
-function parseGitStatusPorcelain(output) {
-  const created = [];
-  const modified = [];
-  const lines = output.split(`
-`).map((l) => l.trimEnd());
-  for (const line of lines) {
-    if (!line)
-      continue;
-    const status = line.slice(0, 2);
-    const file2 = line.slice(3).trim();
-    if (!file2)
-      continue;
-    if (status.includes("?") || status.includes("A")) {
-      created.push(file2);
-    } else {
-      modified.push(file2);
-    }
-  }
-  return { created, modified };
-}
-async function isGitRepo(shellTool) {
-  const res = await shellTool.execute({
-    command: "git rev-parse --is-inside-work-tree"
-  });
-  return res.success && res.output.includes("true");
-}
-function extractShellStdout(toolOutput) {
-  const idx = toolOutput.indexOf(`
-`);
-  return idx === -1 ? "" : toolOutput.slice(idx + 1);
-}
-async function getGitStatus(shellTool) {
-  const res = await shellTool.execute({ command: "git status --porcelain" });
-  if (!res.success)
-    throw new Error(`git status failed: ${res.output}`);
-  return extractShellStdout(res.output);
-}
-async function buildPatch(shellTool) {
-  const unstaged = await shellTool.execute({ command: "git diff" });
-  const staged = await shellTool.execute({ command: "git diff --cached" });
-  const parts = [];
-  if (unstaged.success)
-    parts.push(extractShellStdout(unstaged.output));
-  if (staged.success)
-    parts.push(extractShellStdout(staged.output));
-  return parts.join(`
-`).trim();
-}
+// src/sub-agents/opencode-sub-agent.ts
+import { spawn as spawn2 } from "node:child_process";
+import * as path7 from "node:path";
+import { pathToFileURL as pathToFileURL5 } from "node:url";
+import { ModelType as ModelType3 } from "@elizaos/core";
+var OPENCODE_SYSTEM_PROMPT = `You are OpenCode, an expert AI coding agent with LSP integration awareness.
+You help developers write, debug, and refactor code with precision and context-awareness.
+
+## CAPABILITIES
+
+1. **LSP-Aware Editing**: Consider type information, imports, and dependencies when making changes
+2. **Multi-Session Support**: Handle complex tasks by breaking them into logical steps
+3. **Context Management**: Track relevant files and maintain awareness of the broader codebase
+4. **Precise Modifications**: Make targeted, minimal changes that preserve existing functionality
+
+## AVAILABLE TOOLS
+
+1. TOOL: read_file(filepath="path/to/file")
+   - Read the contents of a file
+
+2. TOOL: list_files(path="directory")
+   - List contents of a directory
+
+3. TOOL: search_files(pattern="text", path="directory", max_matches="50")
+   - Search for text patterns in files
+
+4. TOOL: shell(command="your command")
+   - Execute shell commands (use for git, tests, type checking, etc.)
+
+5. TOOL: edit_file(filepath="file", old_str="find this", new_str="replace with")
+   - Make precise search/replace edits to files
+
+6. TOOL: write_file(filepath="path/to/file")
+   CONTENT_START
+   <complete file contents>
+   CONTENT_END
+   - Create or overwrite a file with complete contents
+
+## METHODOLOGY
+
+### 1. UNDERSTAND
+- Read relevant files to understand the context
+- Check for type definitions and interfaces
+- Understand the existing code patterns
+
+### 2. PLAN
+- Identify all files that need modification
+- Consider imports and dependencies
+- Plan changes in the correct order
+
+### 3. IMPLEMENT
+- Make precise, targeted changes
+- Prefer edit_file for modifications
+- Use write_file only for new files
+
+### 4. VERIFY
+- Read modified files to confirm changes
+- Consider running type checks or tests
+- Ensure no unintended side effects
+
+## RULES
+
+1. **COMPLETE CODE ONLY**: Never truncate or use placeholders
+2. **MINIMAL CHANGES**: Change only what's necessary
+3. **TYPE SAFETY**: Respect TypeScript types and interfaces
+4. **PRESERVE PATTERNS**: Follow existing code conventions
+5. **ONE TOOL AT A TIME**: Execute tools sequentially, waiting for results
+
+## OUTPUT FORMAT
+
+When using tools:
+TOOL: command(args...)
+
+For write_file with content:
+TOOL: write_file(filepath="path/to/file")
+CONTENT_START
+<complete file contents here>
+CONTENT_END
+
+When finished:
+DONE: <summary of what was accomplished>
 
-class RuntimeModel extends AbstractModel {
-  runtime;
-  modelType;
-  stats = { apiCalls: 0, inputTokens: 0, outputTokens: 0 };
-  constructor(runtime, config2, tools) {
-    super(config2, tools);
-    this.runtime = runtime;
-    this.modelType = runtime.getModel("TEXT_REASONING_LARGE") ? "TEXT_REASONING_LARGE" : "TEXT_LARGE";
-  }
-  async query(history) {
-    this.stats.apiCalls += 1;
-    const prompt = history.map((m) => {
-      const content = typeof m.content === "string" ? m.content : JSON.stringify(m.content);
-      return `${m.role.toUpperCase()}: ${content}`;
-    }).join(`
+## WORKING DIRECTORY
 
+{cwd}`;
+function parseOpenCodeOutput(output) {
+  const events = [];
+  const lines = output.split(`
 `);
-    const response = await this.runtime.useModel(this.modelType, {
-      prompt,
-      maxTokens: 4096,
-      temperature: 0.1
-    });
-    return { message: response };
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (!trimmed)
+      continue;
+    if (trimmed.startsWith("{") && trimmed.endsWith("}")) {
+      try {
+        const parsed = JSON.parse(trimmed);
+        if (parsed.type && typeof parsed.type === "string") {
+          events.push({
+            type: parsed.type,
+            data: parsed
+          });
+        }
+      } catch {
+        events.push({
+          type: "message",
+          data: { content: trimmed }
+        });
+      }
+    } else {
+      events.push({
+        type: "message",
+        data: { content: trimmed }
+      });
+    }
   }
+  return events;
 }
-
-class LocalToolEnvironment {
-  workingDirectory;
-  shellTool;
-  patchPath;
-  submitCommand;
-  constructor(args) {
-    this.workingDirectory = args.workingDirectory;
-    this.shellTool = args.shellTool;
-    this.patchPath = args.patchPath;
-    this.submitCommand = args.submitCommand;
-    this.repo = { repoName: path8.basename(this.workingDirectory) };
-    this.name = "local";
-  }
-  repo;
-  name;
-  getCwd = () => this.workingDirectory;
-  async communicate(command) {
-    const cmd = command.trim();
-    if (cmd === this.submitCommand) {
-      const patch = await buildPatch(this.shellTool);
-      await ensureDir(path8.dirname(this.patchPath));
-      await fs3.writeFile(this.patchPath, patch, "utf-8");
-      return SUBMISSION_MARKER;
+function parseToolCalls3(response) {
+  const calls = [];
+  const toolMatches = response.matchAll(/TOOL:\s*([A-Za-z0-9_:/.-]+)\s*\(([^)]*)\)/g);
+  for (const match of toolMatches) {
+    const name = match[1];
+    const argsStr = match[2];
+    const args = {};
+    const argMatches = argsStr.matchAll(/(\w+)="([^"]*)"/g);
+    for (const argMatch of argMatches) {
+      args[argMatch[1]] = argMatch[2];
     }
-    const result = await this.shellTool.execute({ command: cmd });
-    return result.output;
-  }
-  async readFile(p, encoding = "utf-8") {
-    const resolved = p === "/root/model.patch" ? this.patchPath : path8.resolve(this.workingDirectory, p);
-    return await fs3.readFile(resolved, encoding);
-  }
-  async writeFile(p, content) {
-    const resolved = p === "/root/model.patch" ? this.patchPath : path8.resolve(this.workingDirectory, p);
-    await ensureDir(path8.dirname(resolved));
-    await fs3.writeFile(resolved, content, "utf-8");
-  }
-  async setEnvVariables(_vars) {
-    return;
-  }
-  async executeCommand(command) {
-    await this.communicate(command);
-  }
-  async interruptSession() {
-    return;
+    let content;
+    if (name === "write_file") {
+      const fullMatch = match[0];
+      const afterTool = response.slice(response.indexOf(fullMatch) + fullMatch.length);
+      const contentMatch = afterTool.match(/CONTENT_START\s*([\s\S]*?)\s*CONTENT_END/);
+      if (contentMatch) {
+        content = contentMatch[1];
+      }
+    }
+    calls.push({ name, args, content });
   }
+  return calls;
+}
+async function isOpenCodeAvailable() {
+  return new Promise((resolve7) => {
+    const child = spawn2("opencode", ["--version"], {
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    let resolved = false;
+    const timeout = setTimeout(() => {
+      if (!resolved) {
+        resolved = true;
+        child.kill();
+        resolve7(false);
+      }
+    }, 5000);
+    child.on("error", () => {
+      if (!resolved) {
+        resolved = true;
+        clearTimeout(timeout);
+        resolve7(false);
+      }
+    });
+    child.on("close", (code) => {
+      if (!resolved) {
+        resolved = true;
+        clearTimeout(timeout);
+        resolve7(code === 0);
+      }
+    });
+  });
 }
-var DEFAULT_TEMPLATES = {
-  systemTemplate: `You are SWE-agent. Follow the format strictly.
-
-DISCUSSION
-Explain what you will do.
-
-\`\`\`
-<one shell command>
-\`\`\`
-
-When finished, run:
-
-\`\`\`
-submit
-\`\`\`
-`,
-  instanceTemplate: `Task:
-{{problemStatement}}
-
-Repository: {{repo}}
-Working directory: {{workingDir}}
-`,
-  nextStepTemplate: "Observation: {{observation}}",
-  nextStepTruncatedObservationTemplate: "Observation: {{observation[:max_observation_length]}}<response clipped>",
-  maxObservationLength: 50000,
-  demonstrations: [],
-  putDemosInHistory: false,
-  disableImageProcessing: true,
-  shellCheckErrorTemplate: `Your command contains syntax errors. Please fix them.
-Error: {{error_message}}
-Hint: {{hint}}`,
-  commandCancelledTimeoutTemplate: "Command cancelled after {{timeout}} seconds. The command was: {{command}}",
-  nextStepNoOutputTemplate: "Observation: (no output)",
-  strategyTemplate: undefined,
-  demonstrationTemplate: undefined
-};
 
-class SweAgentSubAgent {
-  name = "SWE-agent Worker";
-  type = "sweagent";
+class OpenCodeSubAgent {
+  name = "OpenCode Worker";
+  type = "opencode";
   cancelled = false;
+  process = null;
   maxIterations;
   debug;
+  preferCli;
   constructor(config2) {
-    this.maxIterations = config2?.maxIterations ?? getEnvInt4("ELIZA_CODE_SWEAGENT_MAX_ITERATIONS", 30);
+    this.maxIterations = config2?.maxIterations ?? getEnvInt3("ELIZA_CODE_OPENCODE_MAX_ITERATIONS", 25);
     this.debug = config2?.debug ?? process.env.ELIZA_CODE_DEBUG === "1";
+    this.preferCli = config2?.preferCli ?? process.env.ELIZA_CODE_OPENCODE_PREFER_CLI === "1";
   }
   cancel() {
     this.cancelled = true;
+    if (this.process) {
+      this.process.kill();
+      this.process = null;
+    }
+  }
+  async execute(task, context) {
+    this.cancelled = false;
+    if (this.preferCli) {
+      const cliAvailable = await isOpenCodeAvailable();
+      if (cliAvailable) {
+        return this.executeWithCli(task, context);
+      }
+    }
+    return this.executeWithPrompt(task, context);
+  }
+  async executeWithCli(task, context) {
+    const { workingDirectory, onMessage, onTrace, isCancelled } = context;
+    const filesCreated = [];
+    const filesModified = [];
+    let finalResponse = "";
+    let traceSeq = 0;
+    const base = () => {
+      traceSeq += 1;
+      return { ts: Date.now(), seq: traceSeq };
+    };
+    return new Promise((resolve7) => {
+      const prompt = `${task.name}
+
+${task.description ?? ""}`.trim();
+      this.process = spawn2("opencode", ["--json", "--prompt", prompt], {
+        cwd: workingDirectory,
+        stdio: ["ignore", "pipe", "pipe"],
+        env: { ...process.env, OPENCODE_NONINTERACTIVE: "1" }
+      });
+      let _stdout = "";
+      let stderr = "";
+      this.process.stdout?.on("data", (data) => {
+        const chunk = data.toString();
+        _stdout += chunk;
+        if (isCancelled()) {
+          this.cancel();
+          return;
+        }
+        const events = parseOpenCodeOutput(chunk);
+        for (const event of events) {
+          switch (event.type) {
+            case "message": {
+              const content = event.data.content;
+              if (content) {
+                finalResponse = content;
+                if (this.debug) {
+                  onMessage(content, "info");
+                }
+              }
+              break;
+            }
+            case "tool_call": {
+              const toolName = event.data.tool;
+              const toolArgs = event.data.args;
+              onTrace?.({
+                kind: "tool_call",
+                iteration: traceSeq,
+                name: toolName,
+                args: toolArgs,
+                ...base()
+              });
+              break;
+            }
+            case "tool_result": {
+              const toolName = event.data.tool;
+              const success2 = event.data.success;
+              const output = event.data.output;
+              onTrace?.({
+                kind: "tool_result",
+                iteration: traceSeq,
+                name: toolName,
+                success: success2,
+                output: truncateText3(output, 4000),
+                outputPreview: truncateText3(output, 180),
+                ...base()
+              });
+              break;
+            }
+            case "file_change": {
+              const filepath = event.data.path;
+              const action = event.data.action;
+              if (filepath) {
+                if (action === "create" || action === "write") {
+                  if (!filesCreated.includes(filepath)) {
+                    filesCreated.push(filepath);
+                  }
+                } else {
+                  if (!filesModified.includes(filepath)) {
+                    filesModified.push(filepath);
+                  }
+                }
+                const abs = path7.resolve(workingDirectory, filepath);
+                const link = pathToFileURL5(abs).toString();
+                onMessage(`FILE ${action}: ${filepath} — ${link}`, "info");
+              }
+              break;
+            }
+            case "done": {
+              finalResponse = event.data.summary || finalResponse;
+              break;
+            }
+            case "error": {
+              const errorMsg = event.data.message;
+              onMessage(`Error: ${errorMsg}`, "error");
+              break;
+            }
+          }
+        }
+      });
+      this.process.stderr?.on("data", (data) => {
+        stderr += data.toString();
+      });
+      this.process.on("error", (error48) => {
+        resolve7({
+          success: false,
+          summary: `OpenCode CLI error: ${error48.message}`,
+          filesCreated,
+          filesModified,
+          error: error48.message
+        });
+      });
+      this.process.on("close", (code) => {
+        this.process = null;
+        if (this.cancelled || isCancelled()) {
+          resolve7({
+            success: false,
+            summary: "Cancelled",
+            filesCreated,
+            filesModified,
+            error: "Cancelled"
+          });
+          return;
+        }
+        const summary = finalResponse.trim().split(`
+`)[0] || `Completed with exit code ${code}`;
+        resolve7({
+          success: code === 0,
+          summary,
+          filesCreated,
+          filesModified,
+          error: code !== 0 ? stderr || `Exit code: ${code}` : undefined
+        });
+      });
+    });
   }
-  async execute(task, context) {
-    this.cancelled = false;
+  async executeWithPrompt(task, context) {
     const {
       runtime,
       workingDirectory,
       tools,
+      callMcpTool,
       onProgress,
       onMessage,
       onTrace,
       isCancelled,
       isPaused
     } = context;
-    const shellTool = findTool(tools, "shell");
-    if (!await isGitRepo(shellTool)) {
-      return {
-        success: false,
-        summary: "SWE-agent requires a git repository",
-        filesCreated: [],
-        filesModified: [],
-        error: "Not a git repository (git rev-parse --is-inside-work-tree returned false)"
-      };
-    }
-    const beforeStatus = await getGitStatus(shellTool);
-    const patchPath = path8.resolve(workingDirectory, ".eliza/sweagent/model.patch");
-    const env = new LocalToolEnvironment({
-      workingDirectory,
-      shellTool,
-      patchPath,
-      submitCommand: "submit"
-    });
-    const toolConfig = {
-      commands: [],
-      parseFunction: "thought_action",
-      executionTimeout: 55,
-      maxConsecutiveExecutionTimeouts: 2,
-      totalExecutionTimeout: 60 * 60,
-      submitCommand: "submit",
-      useFunctionCalling: false,
-      formatErrorTemplate: "Your output was not formatted correctly. Use DISCUSSION then one command in a code block.",
-      filter: {
-        blocklistErrorTemplate: "That command is not allowed. Choose a safer alternative.",
-        blocklist: ["rm -rf", "sudo rm", "mkfs", "dd "],
-        blocklistStandalone: ["shutdown", "reboot"]
-      },
-      envVariables: {}
-    };
-    const modelConfig = {
-      name: "runtime",
-      perInstanceCostLimit: 0,
-      totalCostLimit: 0,
-      perInstanceCallLimit: 0,
-      temperature: 0.1,
-      topP: 1,
-      apiBase: null,
-      apiVersion: null,
-      apiKey: null,
-      stop: [],
-      completionKwargs: {},
-      convertSystemToUser: false,
-      retry: { retries: 0, minWait: 0, maxWait: 0 },
-      delay: 0,
-      fallbacks: [],
-      chooseApiKeyByThread: false,
-      maxInputTokens: null,
-      maxOutputTokens: null,
-      litellmModelRegistry: null,
-      customTokenizer: null
+    const filesCreated = [];
+    const filesModified = [];
+    const maxTraceResponseChars = getEnvInt3("ELIZA_CODE_TRACE_MAX_RESPONSE_CHARS", this.debug ? 20000 : 4000);
+    const maxTraceToolOutputChars = getEnvInt3("ELIZA_CODE_TRACE_MAX_TOOL_OUTPUT_CHARS", 8000);
+    const maxUiPreviewChars = getEnvInt3("ELIZA_CODE_TRACE_UI_PREVIEW_CHARS", 180);
+    let traceSeq = 0;
+    const base = () => {
+      traceSeq += 1;
+      return { ts: Date.now(), seq: traceSeq };
     };
-    const model = new RuntimeModel(runtime, modelConfig, toolConfig);
-    const agent = new DefaultAgent({
-      templates: DEFAULT_TEMPLATES,
-      tools: new ToolHandler(toolConfig),
-      historyProcessors: [],
-      model,
-      maxRequeries: 3,
-      name: "sweagent"
-    });
-    const outputDir = path8.resolve(workingDirectory, ".eliza/sweagent/runs");
-    await ensureDir(outputDir);
-    const ps = new TextProblemStatement({
-      text: `${task.name}
+    onProgress({ taskId: task.id ?? "", progress: 0 });
+    const messages = [
+      {
+        role: "user",
+        content: `Execute this task: ${task.name}
 
-${task.description ?? ""}`.trim(),
-      id: task.id ?? "task"
-    });
-    await agent.setup(env, ps, outputDir);
+Description: ${task.description ?? "No additional description provided."}
+
+Start by understanding the requirements, then implement the solution step by step.`
+      }
+    ];
     let iteration = 0;
-    while (!this.cancelled) {
+    let wasPaused = false;
+    while (iteration < this.maxIterations && !this.cancelled) {
       if (isCancelled()) {
+        onMessage("Task cancelled", "warning");
+        onTrace?.({
+          kind: "status",
+          status: "cancelled",
+          message: "Task cancelled",
+          ...base()
+        });
+        return {
+          success: false,
+          summary: "Task was cancelled",
+          filesCreated,
+          filesModified,
+          error: "Cancelled by user"
+        };
+      }
+      if (isPaused?.()) {
+        if (!wasPaused) {
+          wasPaused = true;
+          onMessage("Task paused", "warning");
+          onTrace?.({
+            kind: "status",
+            status: "paused",
+            message: "Task paused",
+            ...base()
+          });
+        }
+        await sleep3(300);
+        continue;
+      }
+      if (wasPaused) {
+        wasPaused = false;
+        onMessage("Task resumed", "info");
+        onTrace?.({
+          kind: "status",
+          status: "resumed",
+          message: "Task resumed",
+          ...base()
+        });
+      }
+      iteration++;
+      onProgress({
+        taskId: task.id ?? "",
+        progress: Math.min(90, Math.round(iteration / this.maxIterations * 80))
+      });
+      const systemPrompt = OPENCODE_SYSTEM_PROMPT.replace("{cwd}", workingDirectory);
+      const history = messages.map((m) => m.role === "user" ? `User: ${m.content}` : `Assistant: ${m.content}`).join(`
+
+`);
+      const prompt = `${systemPrompt}
+
+${history}
+
+Assistant:`;
+      const modelType = runtime.getModel(ModelType3.TEXT_REASONING_LARGE) ? ModelType3.TEXT_REASONING_LARGE : ModelType3.TEXT_LARGE;
+      let response;
+      try {
+        response = await runtime.useModel(modelType, {
+          prompt,
+          maxTokens: 4096,
+          temperature: 0.2
+        });
+      } catch (error48) {
+        const errorMsg = error48 instanceof Error ? error48.message : String(error48);
+        onMessage(`LLM error: ${errorMsg}`, "error");
+        onTrace?.({
+          kind: "note",
+          level: "error",
+          message: errorMsg,
+          ...base()
+        });
+        return {
+          success: false,
+          summary: `Failed: ${errorMsg}`,
+          filesCreated,
+          filesModified,
+          error: errorMsg
+        };
+      }
+      const responseRedacted = redactSensitiveText3(response);
+      const responseStored = truncateText3(responseRedacted, maxTraceResponseChars);
+      const responsePreview = truncateText3(collapseWhitespace3(firstNonEmptyLine3(responseStored)), maxUiPreviewChars);
+      onTrace?.({
+        kind: "llm",
+        iteration,
+        modelType: String(modelType),
+        response: responseStored,
+        responsePreview,
+        ...base()
+      });
+      if (response.includes("DONE:")) {
+        const summary2 = response.split("DONE:")[1]?.trim().split(`
+`)[0] ?? "Task completed";
+        onMessage(`Done: ${summary2}`, "info");
+        onTrace?.({
+          kind: "note",
+          level: "info",
+          message: `Done: ${summary2}`,
+          ...base()
+        });
         return {
-          success: false,
-          summary: "Cancelled",
-          filesCreated: [],
-          filesModified: [],
-          error: "Cancelled by user"
+          success: true,
+          summary: summary2,
+          filesCreated,
+          filesModified
         };
       }
-      if (isPaused?.()) {
-        await new Promise((r) => setTimeout(r, 250));
+      const toolCalls = parseToolCalls3(response);
+      if (toolCalls.length === 0) {
+        messages.push({ role: "assistant", content: response });
+        messages.push({
+          role: "user",
+          content: "Continue with the task. Use TOOL: to execute commands, or say DONE: when finished."
+        });
         continue;
       }
-      iteration += 1;
-      onProgress({
-        taskId: task.id ?? "",
-        progress: Math.min(90, Math.round(iteration / this.maxIterations * 80))
-      });
-      const step = await agent.step();
-      const thoughtPreview = truncate(step.thought ?? "", 220);
-      const actionPreview = truncate(step.action ?? "", 220);
-      if (this.debug) {
-        onMessage(`DISCUSSION: ${thoughtPreview}`, "info");
-        onMessage(`COMMAND: ${actionPreview}`, "info");
+      const results = [];
+      for (const call of toolCalls) {
+        onTrace?.({
+          kind: "tool_call",
+          iteration,
+          name: call.name,
+          args: call.args,
+          ...base()
+        });
+        const result = (call.name.startsWith("MCP:") || call.name.includes("/")) && callMcpTool ? await (async () => {
+          const [server, toolName] = call.name.replace("MCP:", "").split("/");
+          if (!server || !toolName) {
+            return {
+              success: false,
+              output: `Invalid MCP tool call name: ${call.name}`
+            };
+          }
+          return await callMcpTool(server, toolName, call.args);
+        })() : await this.executeTool(call.name, call.args, call.content, tools, workingDirectory, filesCreated, filesModified, onMessage);
+        results.push({ name: call.name, result });
+        const outputRedacted = redactSensitiveText3(result.output);
+        const outputStored = truncateText3(outputRedacted, maxTraceToolOutputChars);
+        const outputPreview = truncateText3(collapseWhitespace3(firstNonEmptyLine3(outputStored)), maxUiPreviewChars);
+        onTrace?.({
+          kind: "tool_result",
+          iteration,
+          name: call.name,
+          success: result.success,
+          output: outputStored,
+          outputPreview,
+          ...base()
+        });
       }
-      onTrace?.({
-        kind: "note",
-        level: "info",
-        message: `step ${iteration}: ${truncate(redactSensitiveText4(thoughtPreview), 160)}`,
-        ts: Date.now(),
-        seq: iteration
+      const resultOutput = results.map((r) => `[${r.name}] ${r.result.success ? "✓" : "✗"} ${truncateText3(r.result.output, 2000)}`).join(`
+
+`);
+      messages.push({ role: "assistant", content: response });
+      messages.push({
+        role: "user",
+        content: `Tool results:
+${resultOutput}
+
+Continue with the next step.`
       });
-      if (step.done)
-        break;
-      if (iteration >= this.maxIterations)
-        break;
-    }
-    const afterStatus = await getGitStatus(shellTool);
-    const delta = parseGitStatusPorcelain(afterStatus);
-    let patchExists = false;
-    try {
-      await fs3.stat(patchPath);
-      patchExists = true;
-    } catch {
-      patchExists = false;
-    }
-    const success2 = patchExists || delta.created.length + delta.modified.length > 0;
-    if (!success2) {
-      return {
-        success: false,
-        summary: "No patch produced",
-        filesCreated: delta.created,
-        filesModified: delta.modified,
-        error: `No submission patch produced.
-Before status:
-${beforeStatus}
-After status:
-${afterStatus}`
-      };
     }
+    const summary = `Completed after ${iteration} iterations`;
+    onMessage(`Warning: ${summary}`, "warning");
+    onTrace?.({ kind: "note", level: "warning", message: summary, ...base() });
     return {
       success: true,
-      summary: "Submitted patch",
-      filesCreated: delta.created,
-      filesModified: delta.modified
+      summary,
+      filesCreated,
+      filesModified
     };
   }
+  async executeTool(name, args, content, tools, workingDirectory, filesCreated, filesModified, onMessage) {
+    if (name === "write_file" && content !== undefined) {
+      const tool3 = tools.find((t) => t.name === "write_file");
+      if (!tool3) {
+        return { success: false, output: "write_file tool not available" };
+      }
+      const result2 = await tool3.execute({ ...args, content });
+      if (result2.success && args.filepath) {
+        if (!filesCreated.includes(args.filepath)) {
+          filesCreated.push(args.filepath);
+        }
+        const abs = path7.resolve(workingDirectory, args.filepath);
+        const link = pathToFileURL5(abs).toString();
+        onMessage(`FILE write: ${args.filepath} — ${link}`, "info");
+      }
+      return result2;
+    }
+    const tool2 = tools.find((t) => t.name === name || t.name === name.toLowerCase());
+    if (!tool2) {
+      return { success: false, output: `Unknown tool: ${name}` };
+    }
+    const result = await tool2.execute(args);
+    const filepath = result.data?.filepath;
+    if (result.success && typeof filepath === "string") {
+      if (name === "write_file" || name.includes("write")) {
+        if (!filesCreated.includes(filepath)) {
+          filesCreated.push(filepath);
+        }
+        const abs = path7.resolve(workingDirectory, filepath);
+        const link = pathToFileURL5(abs).toString();
+        const sizeValue = result.data?.size;
+        const sizeSuffix = typeof sizeValue === "number" ? ` (${sizeValue} chars)` : "";
+        onMessage(`FILE write: ${filepath}${sizeSuffix} — ${link}`, "info");
+      } else if (name === "edit_file" || name.includes("edit")) {
+        if (!filesModified.includes(filepath)) {
+          filesModified.push(filepath);
+        }
+        const abs = path7.resolve(workingDirectory, filepath);
+        const link = pathToFileURL5(abs).toString();
+        onMessage(`FILE edit: ${filepath} — ${link}`, "info");
+      }
+    }
+    return result;
+  }
+}
+function sleep3(ms) {
+  return new Promise((resolve7) => setTimeout(resolve7, ms));
+}
+function getEnvInt3(key, defaultValue) {
+  const raw = process.env[key];
+  if (!raw)
+    return defaultValue;
+  const parsed = Number.parseInt(raw, 10);
+  if (!Number.isFinite(parsed) || parsed < 1)
+    return defaultValue;
+  return parsed;
+}
+function truncateText3(text, maxChars) {
+  if (text.length <= maxChars)
+    return text;
+  const safe = Math.max(0, maxChars - 1);
+  return `${text.slice(0, safe)}…`;
+}
+function collapseWhitespace3(text) {
+  return text.replace(/\s+/g, " ").trim();
+}
+function firstNonEmptyLine3(text) {
+  const lines = text.split(`
+`);
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (trimmed.length > 0)
+      return trimmed;
+  }
+  return "";
+}
+function redactSensitiveText3(text) {
+  let out = text;
+  out = out.replace(/-----BEGIN [A-Z ]*PRIVATE KEY-----[\s\S]*?-----END [A-Z ]*PRIVATE KEY-----/g, "[REDACTED:PRIVATE_KEY]");
+  out = out.replace(/\bsk-[A-Za-z0-9]{16,}\b/g, "[REDACTED:API_KEY]");
+  out = out.replace(/\bAKIA[0-9A-Z]{16}\b/g, "[REDACTED:AWS_ACCESS_KEY_ID]");
+  out = out.replace(/\bghp_[A-Za-z0-9]{20,}\b/g, "[REDACTED:GITHUB_TOKEN]");
+  out = out.replace(/\bgithub_pat_[A-Za-z0-9_]{20,}\b/g, "[REDACTED:GITHUB_TOKEN]");
+  out = out.replace(/\bxox[baprs]-[A-Za-z0-9-]{10,}\b/g, "[REDACTED:SLACK_TOKEN]");
+  out = out.replace(/\bBearer\s+[A-Za-z0-9._-]{10,}\b/g, "Bearer [REDACTED]");
+  out = out.replace(/\bBasic\s+[A-Za-z0-9+/=]{10,}\b/g, "Basic [REDACTED]");
+  out = out.replace(/(password\s*[:=]\s*)(\S+)/gi, "$1[REDACTED]");
+  for (const [key, value] of Object.entries(process.env)) {
+    if (!value || value.length < 12)
+      continue;
+    const upper = key.toUpperCase();
+    if (upper.includes("KEY") || upper.includes("TOKEN") || upper.includes("SECRET") || upper.includes("PASSWORD") || upper.includes("AUTH")) {
+      out = out.split(value).join(`[REDACTED:${key}]`);
+    }
+  }
+  return out;
 }
 
 // src/sub-agents/registry.ts
+var SweAgentSubAgent2 = null;
+try {
+  const sweagentModule = await Promise.resolve().then(() => (init_sweagent_sub_agent(), exports_sweagent_sub_agent));
+  SweAgentSubAgent2 = sweagentModule.SweAgentSubAgent;
+} catch {}
 var CLAUDE_CODE_PROMPT_TEMPLATE = `You are a Claude Code–style coding worker. Execute tasks using these tools:
 
 AVAILABLE TOOLS:
@@ -20841,7 +20858,10 @@ function createSubAgent(type) {
     case "opencode":
       return new OpenCodeSubAgent;
     case "sweagent":
-      return new SweAgentSubAgent;
+      if (!SweAgentSubAgent2) {
+        throw new Error("SweAgent is not available - @elizaos/sweagent-root package not installed");
+      }
+      return new SweAgentSubAgent2;
     case "elizaos-native":
       return new ElizaOSNativeSubAgent;
     default:
@@ -20886,15 +20906,15 @@ function toCodeTask(task) {
 class SubAgentProvider {
   id;
   label;
-  description;
   subAgentType;
+  description;
   constructor(id, label, subAgentType, description) {
     this.id = id;
     this.label = label;
     this.subAgentType = subAgentType;
     this.description = description;
   }
-  async executeTask(task, ctx) {
+  async executeTask(_task, _ctx) {
     throw new Error("SubAgentProvider needs IAgentRuntime to execute. This should be handled by the factory/service.");
   }
 }
@@ -20914,7 +20934,7 @@ var createSubAgentProvider = (runtime, id, type, label) => {
           if (u.message)
             ctx.appendOutput(u.message);
         },
-        onMessage: (msg, priority) => {
+        onMessage: (msg, _priority) => {
           ctx.appendOutput(msg);
         },
         isCancelled: ctx.isCancelled,
@@ -20923,12 +20943,44 @@ var createSubAgentProvider = (runtime, id, type, label) => {
           throw new Error("Todos not supported in adapter yet");
         },
         completeTodo: async () => {},
-        onTrace: (e) => {}
+        onTrace: (_e) => {}
       });
     }
   };
 };
+// src/types/messaging.ts
+var MessagingEventType = {
+  SEND_REQUESTED: "MESSAGING_SEND_REQUESTED",
+  SENT: "MESSAGING_SENT",
+  SEND_FAILED: "MESSAGING_SEND_FAILED",
+  DELIVERED: "MESSAGING_DELIVERED",
+  READ: "MESSAGING_READ"
+};
+// src/types/sandbox.ts
+var SandboxEventType = {
+  CREATED: "SANDBOX_CREATED",
+  DESTROYED: "SANDBOX_DESTROYED",
+  COMMAND_STARTED: "SANDBOX_COMMAND_STARTED",
+  COMMAND_COMPLETED: "SANDBOX_COMMAND_COMPLETED",
+  COMMAND_FAILED: "SANDBOX_COMMAND_FAILED",
+  BROWSER_STARTED: "SANDBOX_BROWSER_STARTED",
+  BROWSER_STOPPED: "SANDBOX_BROWSER_STOPPED"
+};
+// src/types/subagent.ts
+var SubagentEventType = {
+  SPAWN_REQUESTED: "SUBAGENT_SPAWN_REQUESTED",
+  RUN_STARTED: "SUBAGENT_RUN_STARTED",
+  RUN_COMPLETED: "SUBAGENT_RUN_COMPLETED",
+  RUN_FAILED: "SUBAGENT_RUN_FAILED",
+  RUN_TIMEOUT: "SUBAGENT_RUN_TIMEOUT",
+  ANNOUNCE_SENT: "SUBAGENT_ANNOUNCE_SENT",
+  A2A_MESSAGE_SENT: "A2A_MESSAGE_SENT",
+  A2A_MESSAGE_RECEIVED: "A2A_MESSAGE_RECEIVED"
+};
 // index.ts
+function getSessionProviders2() {
+  return [];
+}
 var sessionProviders = getSessionProviders2();
 var agentOrchestratorPlugin = {
   name: "agent-orchestrator",
@@ -20999,8 +21051,8 @@ export {
   normalizeSessionKey,
   normalizeMainKey,
   normalizeDeliveryContext,
-  normalizeAgentId as normalizeCoreAgentId,
-  normalizeAgentId2 as normalizeAgentId,
+  normalizeCoreAgentId,
+  normalizeAgentId,
   normalizeAccountId,
   mergeSessionEntry,
   mergeDeliveryContext,
@@ -21010,8 +21062,8 @@ export {
   listSessionKeys,
   listMessagingChannelsAction,
   isValidSessionEntry,
-  isSubagentSessionKey2 as isSubagentSessionKey,
-  isSubagentSessionKey as isCoreSubagentSessionKey,
+  isSubagentSessionKey,
+  isCoreSubagentSessionKey,
   isAcpSessionKey,
   hashToUUID,
   getSubagentStatusAction,
@@ -21055,4 +21107,4 @@ export {
   AgentOrchestratorService
 };
 
-//# debugId=15B5D85268F84FD764756E2164756E21
+//# debugId=50986580F51FCE4464756E2164756E21