@harmonyos-arkts/opencode-acp 0.0.1 → 0.0.3

package/dist/index.cjs

@@ -396,7 +396,7 @@ var require_parse = __commonJS({
     var resolveCommand = require_resolveCommand();
     var escape = require_escape();
     var readShebang = require_readShebang();
-    var isWin = process.platform === "win32";
+    var isWin2 = process.platform === "win32";
     var isExecutableRegExp = /\.(?:com|exe)$/i;
     var isCmdShimRegExp = /node_modules[\\/].bin[\\/][^\\/]+\.cmd$/i;
     function detectShebang(parsed) {
@@ -410,7 +410,7 @@ var require_parse = __commonJS({
       return parsed.file;
     }
     function parseNonShell(parsed) {
-      if (!isWin) {
+      if (!isWin2) {
         return parsed;
       }
       const commandFile = detectShebang(parsed);
@@ -454,7 +454,7 @@ var require_parse = __commonJS({
 var require_enoent = __commonJS({
   "node_modules/cross-spawn/lib/enoent.js"(exports2, module2) {
     "use strict";
-    var isWin = process.platform === "win32";
+    var isWin2 = process.platform === "win32";
     function notFoundError(original, syscall) {
       return Object.assign(new Error(`${syscall} ${original.command} ENOENT`), {
         code: "ENOENT",
@@ -465,7 +465,7 @@ var require_enoent = __commonJS({
       });
     }
     function hookChildProcess(cp, parsed) {
-      if (!isWin) {
+      if (!isWin2) {
         return;
       }
       const originalEmit = cp.emit;
@@ -480,13 +480,13 @@ var require_enoent = __commonJS({
       };
     }
     function verifyENOENT(status, parsed) {
-      if (isWin && status === 1 && !parsed.file) {
+      if (isWin2 && status === 1 && !parsed.file) {
         return notFoundError(parsed.original, "spawn");
       }
       return null;
     }
     function verifyENOENTSync(status, parsed) {
-      if (isWin && status === 1 && !parsed.file) {
+      if (isWin2 && status === 1 && !parsed.file) {
         return notFoundError(parsed.original, "spawnSync");
       }
       return null;
@@ -19586,6 +19586,9 @@ function createOpencodeClient(config2) {
 // node_modules/@opencode-ai/sdk/dist/v2/server.js
 var import_cross_spawn = __toESM(require_cross_spawn(), 1);
 
+// src/agent.ts
+var import_url2 = require("url");
+
 // src/session-manager.ts
 var SessionManager = class {
   sessions = /* @__PURE__ */ new Map();
@@ -19613,10 +19616,7 @@ var SessionManager = class {
    * Called by agent.newSession() / agent.loadSession().
    */
   async create(cwd, mcpServers, model) {
-    const response = await this.sdk.session.create(
-      { directory: cwd },
-      { throwOnError: true }
-    );
+    const response = await this.sdk.session.create({ directory: cwd }, { throwOnError: true });
     const session = response.data;
     const state = {
       id: session.id,
@@ -19633,10 +19633,7 @@ var SessionManager = class {
    * Called by agent.loadSession() / agent.unstable_resumeSession().
    */
   async load(sessionId, cwd, mcpServers, model) {
-    await this.sdk.session.get(
-      { sessionID: sessionId, directory: cwd },
-      { throwOnError: true }
-    );
+    await this.sdk.session.get({ sessionID: sessionId, directory: cwd }, { throwOnError: true });
     const state = {
       id: sessionId,
       cwd,
@@ -19724,7 +19721,562 @@ var SessionManager = class {
   }
 };
 
+// node_modules/diff/libesm/util/string.js
+function hasOnlyWinLineEndings(string4) {
+  return string4.includes("\r\n") && !string4.startsWith("\n") && !string4.match(/[^\r]\n/);
+}
+function hasOnlyUnixLineEndings(string4) {
+  return !string4.includes("\r\n") && string4.includes("\n");
+}
+
+// node_modules/diff/libesm/patch/line-endings.js
+function unixToWin(patch) {
+  if (Array.isArray(patch)) {
+    return patch.map((p) => unixToWin(p));
+  }
+  return Object.assign(Object.assign({}, patch), { hunks: patch.hunks.map((hunk) => Object.assign(Object.assign({}, hunk), { lines: hunk.lines.map((line, i) => {
+    var _a2;
+    return line.startsWith("\\") || line.endsWith("\r") || ((_a2 = hunk.lines[i + 1]) === null || _a2 === void 0 ? void 0 : _a2.startsWith("\\")) ? line : line + "\r";
+  }) })) });
+}
+function winToUnix(patch) {
+  if (Array.isArray(patch)) {
+    return patch.map((p) => winToUnix(p));
+  }
+  return Object.assign(Object.assign({}, patch), { hunks: patch.hunks.map((hunk) => Object.assign(Object.assign({}, hunk), { lines: hunk.lines.map((line) => line.endsWith("\r") ? line.substring(0, line.length - 1) : line) })) });
+}
+function isUnix(patch) {
+  if (!Array.isArray(patch)) {
+    patch = [patch];
+  }
+  return !patch.some((index) => index.hunks.some((hunk) => hunk.lines.some((line) => !line.startsWith("\\") && line.endsWith("\r"))));
+}
+function isWin(patch) {
+  if (!Array.isArray(patch)) {
+    patch = [patch];
+  }
+  return patch.some((index) => index.hunks.some((hunk) => hunk.lines.some((line) => line.endsWith("\r")))) && patch.every((index) => index.hunks.every((hunk) => hunk.lines.every((line, i) => {
+    var _a2;
+    return line.startsWith("\\") || line.endsWith("\r") || ((_a2 = hunk.lines[i + 1]) === null || _a2 === void 0 ? void 0 : _a2.startsWith("\\"));
+  })));
+}
+
+// node_modules/diff/libesm/patch/parse.js
+function parsePatch(uniDiff) {
+  const diffstr = uniDiff.split(/\n/), list = [];
+  let i = 0;
+  function isGitDiffHeader(line) {
+    return /^diff --git /.test(line);
+  }
+  function isDiffHeader(line) {
+    return isGitDiffHeader(line) || /^Index:\s/.test(line) || /^diff(?: -r \w+)+\s/.test(line);
+  }
+  function isFileHeader(line) {
+    return /^(---|\+\+\+)\s/.test(line);
+  }
+  function isHunkHeader(line) {
+    return /^@@\s/.test(line);
+  }
+  function parseIndex() {
+    var _a2;
+    const index = {};
+    index.hunks = [];
+    list.push(index);
+    let seenDiffHeader = false;
+    while (i < diffstr.length) {
+      const line = diffstr[i];
+      if (isFileHeader(line) || isHunkHeader(line)) {
+        break;
+      }
+      if (isGitDiffHeader(line)) {
+        if (seenDiffHeader) {
+          return;
+        }
+        seenDiffHeader = true;
+        index.isGit = true;
+        const paths = parseGitDiffHeader(line);
+        if (paths) {
+          index.oldFileName = paths.oldFileName;
+          index.newFileName = paths.newFileName;
+        }
+        i++;
+        while (i < diffstr.length) {
+          const extLine = diffstr[i];
+          if (isFileHeader(extLine) || isHunkHeader(extLine) || isDiffHeader(extLine)) {
+            break;
+          }
+          const renameFromMatch = /^rename from (.*)/.exec(extLine);
+          if (renameFromMatch) {
+            index.oldFileName = "a/" + unquoteIfQuoted(renameFromMatch[1]);
+            index.isRename = true;
+          }
+          const renameToMatch = /^rename to (.*)/.exec(extLine);
+          if (renameToMatch) {
+            index.newFileName = "b/" + unquoteIfQuoted(renameToMatch[1]);
+            index.isRename = true;
+          }
+          const copyFromMatch = /^copy from (.*)/.exec(extLine);
+          if (copyFromMatch) {
+            index.oldFileName = "a/" + unquoteIfQuoted(copyFromMatch[1]);
+            index.isCopy = true;
+          }
+          const copyToMatch = /^copy to (.*)/.exec(extLine);
+          if (copyToMatch) {
+            index.newFileName = "b/" + unquoteIfQuoted(copyToMatch[1]);
+            index.isCopy = true;
+          }
+          const newFileModeMatch = /^new file mode (\d+)/.exec(extLine);
+          if (newFileModeMatch) {
+            index.isCreate = true;
+            index.newMode = newFileModeMatch[1];
+          }
+          const deletedFileModeMatch = /^deleted file mode (\d+)/.exec(extLine);
+          if (deletedFileModeMatch) {
+            index.isDelete = true;
+            index.oldMode = deletedFileModeMatch[1];
+          }
+          const oldModeMatch = /^old mode (\d+)/.exec(extLine);
+          if (oldModeMatch) {
+            index.oldMode = oldModeMatch[1];
+          }
+          const newModeMatch = /^new mode (\d+)/.exec(extLine);
+          if (newModeMatch) {
+            index.newMode = newModeMatch[1];
+          }
+          if (/^Binary files /.test(extLine)) {
+            index.isBinary = true;
+          }
+          i++;
+        }
+        continue;
+      } else if (isDiffHeader(line)) {
+        if (seenDiffHeader) {
+          return;
+        }
+        seenDiffHeader = true;
+        const headerMatch = /^(?:Index:|diff(?: -r \w+)+)\s+/.exec(line);
+        if (headerMatch) {
+          index.index = line.substring(headerMatch[0].length).trim();
+        }
+      }
+      i++;
+    }
+    parseFileHeader(index);
+    parseFileHeader(index);
+    if (index.oldFileName === void 0 !== (index.newFileName === void 0)) {
+      throw new Error("Missing " + (index.oldFileName !== void 0 ? '"+++ ..."' : '"--- ..."') + " file header for " + ((_a2 = index.oldFileName) !== null && _a2 !== void 0 ? _a2 : index.newFileName));
+    }
+    while (i < diffstr.length) {
+      const line = diffstr[i];
+      if (isDiffHeader(line) || isFileHeader(line) || /^===================================================================/.test(line)) {
+        break;
+      } else if (isHunkHeader(line)) {
+        index.hunks.push(parseHunk());
+      } else {
+        i++;
+      }
+    }
+  }
+  function parseGitDiffHeader(line) {
+    const rest = line.substring("diff --git ".length);
+    if (rest.startsWith('"')) {
+      const oldPath = parseQuotedFileName(rest);
+      if (oldPath === null) {
+        return null;
+      }
+      const afterOld = rest.substring(oldPath.rawLength + 1);
+      let newFileName;
+      if (afterOld.startsWith('"')) {
+        const newPath = parseQuotedFileName(afterOld);
+        if (newPath === null) {
+          return null;
+        }
+        newFileName = newPath.fileName;
+      } else {
+        newFileName = afterOld;
+      }
+      return {
+        oldFileName: oldPath.fileName,
+        newFileName
+      };
+    }
+    const quoteIdx = rest.indexOf('"');
+    if (quoteIdx > 0) {
+      const oldFileName = rest.substring(0, quoteIdx - 1);
+      const newPath = parseQuotedFileName(rest.substring(quoteIdx));
+      if (newPath === null) {
+        return null;
+      }
+      return {
+        oldFileName,
+        newFileName: newPath.fileName
+      };
+    }
+    if (rest.startsWith("a/")) {
+      const splits = [];
+      let idx = 0;
+      while (true) {
+        idx = rest.indexOf(" b/", idx + 1);
+        if (idx === -1) {
+          break;
+        }
+        splits.push(idx);
+      }
+      if (splits.length > 0) {
+        const mid = splits[Math.floor(splits.length / 2)];
+        return {
+          oldFileName: rest.substring(0, mid),
+          newFileName: rest.substring(mid + 1)
+        };
+      }
+    }
+    return null;
+  }
+  function unquoteIfQuoted(s) {
+    if (s.startsWith('"')) {
+      const parsed = parseQuotedFileName(s);
+      if (parsed) {
+        return parsed.fileName;
+      }
+    }
+    return s;
+  }
+  function parseQuotedFileName(s) {
+    if (!s.startsWith('"')) {
+      return null;
+    }
+    let result = "";
+    let j = 1;
+    while (j < s.length) {
+      if (s[j] === '"') {
+        return { fileName: result, rawLength: j + 1 };
+      }
+      if (s[j] === "\\" && j + 1 < s.length) {
+        j++;
+        switch (s[j]) {
+          case "a":
+            result += "\x07";
+            break;
+          case "b":
+            result += "\b";
+            break;
+          case "f":
+            result += "\f";
+            break;
+          case "n":
+            result += "\n";
+            break;
+          case "r":
+            result += "\r";
+            break;
+          case "t":
+            result += "	";
+            break;
+          case "v":
+            result += "\v";
+            break;
+          case "\\":
+            result += "\\";
+            break;
+          case '"':
+            result += '"';
+            break;
+          case "0":
+          case "1":
+          case "2":
+          case "3":
+          case "4":
+          case "5":
+          case "6":
+          case "7": {
+            if (j + 2 >= s.length || s[j + 1] < "0" || s[j + 1] > "7" || s[j + 2] < "0" || s[j + 2] > "7") {
+              return null;
+            }
+            const bytes = [parseInt(s.substring(j, j + 3), 8)];
+            j += 3;
+            while (s[j] === "\\" && s[j + 1] >= "0" && s[j + 1] <= "7") {
+              if (j + 3 >= s.length || s[j + 2] < "0" || s[j + 2] > "7" || s[j + 3] < "0" || s[j + 3] > "7") {
+                return null;
+              }
+              bytes.push(parseInt(s.substring(j + 1, j + 4), 8));
+              j += 4;
+            }
+            result += new TextDecoder("utf-8").decode(new Uint8Array(bytes));
+            continue;
+          }
+          // Note that in C, there are also three kinds of hex escape sequences:
+          // - \xhh
+          // - \uhhhh
+          // - \Uhhhhhhhh
+          // We do not bother to parse them here because, so far as we know,
+          // they are never emitted by any tools that generate unified diff
+          // format diffs, and so for now jsdiff does not consider them legal.
+          default:
+            return null;
+        }
+      } else {
+        result += s[j];
+      }
+      j++;
+    }
+    return null;
+  }
+  function parseFileHeader(index) {
+    const fileHeaderMatch = /^(---|\+\+\+)\s+/.exec(diffstr[i]);
+    if (fileHeaderMatch) {
+      const prefix = fileHeaderMatch[1], data = diffstr[i].substring(3).trim().split("	", 2), header = (data[1] || "").trim();
+      let fileName = data[0];
+      if (fileName.startsWith('"')) {
+        fileName = unquoteIfQuoted(fileName);
+      } else {
+        fileName = fileName.replace(/\\\\/g, "\\");
+      }
+      if (prefix === "---") {
+        index.oldFileName = fileName;
+        index.oldHeader = header;
+      } else {
+        index.newFileName = fileName;
+        index.newHeader = header;
+      }
+      i++;
+    }
+  }
+  function parseHunk() {
+    var _a2;
+    const chunkHeaderIndex = i, chunkHeaderLine = diffstr[i++], chunkHeader = chunkHeaderLine.split(/@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/);
+    const hunk = {
+      oldStart: +chunkHeader[1],
+      oldLines: typeof chunkHeader[2] === "undefined" ? 1 : +chunkHeader[2],
+      newStart: +chunkHeader[3],
+      newLines: typeof chunkHeader[4] === "undefined" ? 1 : +chunkHeader[4],
+      lines: []
+    };
+    if (hunk.oldLines === 0) {
+      hunk.oldStart += 1;
+    }
+    if (hunk.newLines === 0) {
+      hunk.newStart += 1;
+    }
+    let addCount = 0, removeCount = 0;
+    for (; i < diffstr.length && (removeCount < hunk.oldLines || addCount < hunk.newLines || ((_a2 = diffstr[i]) === null || _a2 === void 0 ? void 0 : _a2.startsWith("\\"))); i++) {
+      const operation = diffstr[i].length == 0 && i != diffstr.length - 1 ? " " : diffstr[i][0];
+      if (operation === "+" || operation === "-" || operation === " " || operation === "\\") {
+        hunk.lines.push(diffstr[i]);
+        if (operation === "+") {
+          addCount++;
+        } else if (operation === "-") {
+          removeCount++;
+        } else if (operation === " ") {
+          addCount++;
+          removeCount++;
+        }
+      } else {
+        throw new Error(`Hunk at line ${chunkHeaderIndex + 1} contained invalid line ${diffstr[i]}`);
+      }
+    }
+    if (!addCount && hunk.newLines === 1) {
+      hunk.newLines = 0;
+    }
+    if (!removeCount && hunk.oldLines === 1) {
+      hunk.oldLines = 0;
+    }
+    if (addCount !== hunk.newLines) {
+      throw new Error("Added line count did not match for hunk at line " + (chunkHeaderIndex + 1));
+    }
+    if (removeCount !== hunk.oldLines) {
+      throw new Error("Removed line count did not match for hunk at line " + (chunkHeaderIndex + 1));
+    }
+    if (i < diffstr.length && diffstr[i] && /^[+ -]/.test(diffstr[i]) && !isFileHeader(diffstr[i])) {
+      throw new Error("Hunk at line " + (chunkHeaderIndex + 1) + " has more lines than expected (expected " + hunk.oldLines + " old lines and " + hunk.newLines + " new lines)");
+    }
+    return hunk;
+  }
+  while (i < diffstr.length) {
+    parseIndex();
+  }
+  return list;
+}
+
+// node_modules/diff/libesm/util/distance-iterator.js
+function distance_iterator_default(start, minLine, maxLine) {
+  let wantForward = true, backwardExhausted = false, forwardExhausted = false, localOffset = 1;
+  return function iterator() {
+    if (wantForward && !forwardExhausted) {
+      if (backwardExhausted) {
+        localOffset++;
+      } else {
+        wantForward = false;
+      }
+      if (start + localOffset <= maxLine) {
+        return start + localOffset;
+      }
+      forwardExhausted = true;
+    }
+    if (!backwardExhausted) {
+      if (!forwardExhausted) {
+        wantForward = true;
+      }
+      if (minLine <= start - localOffset) {
+        return start - localOffset++;
+      }
+      backwardExhausted = true;
+      return iterator();
+    }
+    return void 0;
+  };
+}
+
+// node_modules/diff/libesm/patch/apply.js
+function applyPatch(source, patch, options = {}) {
+  let patches;
+  if (typeof patch === "string") {
+    patches = parsePatch(patch);
+  } else if (Array.isArray(patch)) {
+    patches = patch;
+  } else {
+    patches = [patch];
+  }
+  if (patches.length > 1) {
+    throw new Error("applyPatch only works with a single input.");
+  }
+  return applyStructuredPatch(source, patches[0], options);
+}
+function applyStructuredPatch(source, patch, options = {}) {
+  if (options.autoConvertLineEndings || options.autoConvertLineEndings == null) {
+    if (hasOnlyWinLineEndings(source) && isUnix(patch)) {
+      patch = unixToWin(patch);
+    } else if (hasOnlyUnixLineEndings(source) && isWin(patch)) {
+      patch = winToUnix(patch);
+    }
+  }
+  const lines = source.split("\n"), hunks = patch.hunks, compareLine = options.compareLine || ((lineNumber, line, operation, patchContent) => line === patchContent), fuzzFactor = options.fuzzFactor || 0;
+  let minLine = 0;
+  if (fuzzFactor < 0 || !Number.isInteger(fuzzFactor)) {
+    throw new Error("fuzzFactor must be a non-negative integer");
+  }
+  if (!hunks.length) {
+    return source;
+  }
+  let prevLine = "", removeEOFNL = false, addEOFNL = false;
+  for (let i = 0; i < hunks[hunks.length - 1].lines.length; i++) {
+    const line = hunks[hunks.length - 1].lines[i];
+    if (line[0] == "\\") {
+      if (prevLine[0] == "+") {
+        removeEOFNL = true;
+      } else if (prevLine[0] == "-") {
+        addEOFNL = true;
+      }
+    }
+    prevLine = line;
+  }
+  if (removeEOFNL) {
+    if (addEOFNL) {
+      if (!fuzzFactor && lines[lines.length - 1] == "") {
+        return false;
+      }
+    } else if (lines[lines.length - 1] == "") {
+      lines.pop();
+    } else if (!fuzzFactor) {
+      return false;
+    }
+  } else if (addEOFNL) {
+    if (lines[lines.length - 1] != "") {
+      lines.push("");
+    } else if (!fuzzFactor) {
+      return false;
+    }
+  }
+  function applyHunk(hunkLines, toPos, maxErrors, hunkLinesI = 0, lastContextLineMatched = true, patchedLines = [], patchedLinesLength = 0) {
+    let nConsecutiveOldContextLines = 0;
+    let nextContextLineMustMatch = false;
+    for (; hunkLinesI < hunkLines.length; hunkLinesI++) {
+      const hunkLine = hunkLines[hunkLinesI], operation = hunkLine.length > 0 ? hunkLine[0] : " ", content = hunkLine.length > 0 ? hunkLine.substr(1) : hunkLine;
+      if (operation === "-") {
+        if (compareLine(toPos + 1, lines[toPos], operation, content)) {
+          toPos++;
+          nConsecutiveOldContextLines = 0;
+        } else {
+          if (!maxErrors || lines[toPos] == null) {
+            return null;
+          }
+          patchedLines[patchedLinesLength] = lines[toPos];
+          return applyHunk(hunkLines, toPos + 1, maxErrors - 1, hunkLinesI, false, patchedLines, patchedLinesLength + 1);
+        }
+      }
+      if (operation === "+") {
+        if (!lastContextLineMatched) {
+          return null;
+        }
+        patchedLines[patchedLinesLength] = content;
+        patchedLinesLength++;
+        nConsecutiveOldContextLines = 0;
+        nextContextLineMustMatch = true;
+      }
+      if (operation === " ") {
+        nConsecutiveOldContextLines++;
+        patchedLines[patchedLinesLength] = lines[toPos];
+        if (compareLine(toPos + 1, lines[toPos], operation, content)) {
+          patchedLinesLength++;
+          lastContextLineMatched = true;
+          nextContextLineMustMatch = false;
+          toPos++;
+        } else {
+          if (nextContextLineMustMatch || !maxErrors) {
+            return null;
+          }
+          return lines[toPos] && (applyHunk(hunkLines, toPos + 1, maxErrors - 1, hunkLinesI + 1, false, patchedLines, patchedLinesLength + 1) || applyHunk(hunkLines, toPos + 1, maxErrors - 1, hunkLinesI, false, patchedLines, patchedLinesLength + 1)) || applyHunk(hunkLines, toPos, maxErrors - 1, hunkLinesI + 1, false, patchedLines, patchedLinesLength);
+        }
+      }
+    }
+    patchedLinesLength -= nConsecutiveOldContextLines;
+    toPos -= nConsecutiveOldContextLines;
+    patchedLines.length = patchedLinesLength;
+    return {
+      patchedLines,
+      oldLineLastI: toPos - 1
+    };
+  }
+  const resultLines = [];
+  let prevHunkOffset = 0;
+  for (let i = 0; i < hunks.length; i++) {
+    const hunk = hunks[i];
+    let hunkResult;
+    const maxLine = lines.length - hunk.oldLines + fuzzFactor;
+    let toPos;
+    for (let maxErrors = 0; maxErrors <= fuzzFactor; maxErrors++) {
+      toPos = hunk.oldStart + prevHunkOffset - 1;
+      const iterator = distance_iterator_default(toPos, minLine, maxLine);
+      for (; toPos !== void 0; toPos = iterator()) {
+        hunkResult = applyHunk(hunk.lines, toPos, maxErrors);
+        if (hunkResult) {
+          break;
+        }
+      }
+      if (hunkResult) {
+        break;
+      }
+    }
+    if (!hunkResult) {
+      return false;
+    }
+    for (let i2 = minLine; i2 < toPos; i2++) {
+      resultLines.push(lines[i2]);
+    }
+    for (let i2 = 0; i2 < hunkResult.patchedLines.length; i2++) {
+      const line = hunkResult.patchedLines[i2];
+      resultLines.push(line);
+    }
+    minLine = hunkResult.oldLineLastI + 1;
+    prevHunkOffset = toPos + 1 - hunk.oldStart;
+  }
+  for (let i = minLine; i < lines.length; i++) {
+    resultLines.push(lines[i]);
+  }
+  return resultLines.join("\n");
+}
+
 // src/utils.ts
+var import_url = require("url");
 function toToolKind(toolName) {
   const tool = toolName.toLowerCase();
   switch (tool) {
@@ -19764,6 +20316,26 @@ function toLocations(toolName, input) {
       return [];
   }
 }
+function parseUri(uri) {
+  try {
+    if (uri.startsWith("file://")) {
+      const path = uri.slice(7);
+      const name = path.split("/").pop() || path;
+      return { type: "file", url: uri, filename: name, mime: "text/plain" };
+    }
+    if (uri.startsWith("zed://")) {
+      const url2 = new URL(uri);
+      const path = url2.searchParams.get("path");
+      if (path) {
+        const name = path.split("/").pop() || path;
+        return { type: "file", url: (0, import_url.pathToFileURL)(path).href, filename: name, mime: "text/plain" };
+      }
+    }
+    return { type: "text", text: uri };
+  } catch {
+    return { type: "text", text: uri };
+  }
+}
 
 // src/logger.ts
 var import_fs = require("fs");
@@ -19785,7 +20357,11 @@ function setLogEnabled(v) {
 }
 function cleanOldLogs() {
   try {
-    const files = (0, import_fs.readdirSync)(LOG_DIR).filter((f) => f.endsWith(".log")).map((f) => ({ name: f, path: (0, import_path.join)(LOG_DIR, f), mtime: (0, import_fs.statSync)((0, import_path.join)(LOG_DIR, f)).mtime.getTime() })).sort((a, b) => b.mtime - a.mtime);
+    const files = (0, import_fs.readdirSync)(LOG_DIR).filter((f) => f.endsWith(".log")).map((f) => ({
+      name: f,
+      path: (0, import_path.join)(LOG_DIR, f),
+      mtime: (0, import_fs.statSync)((0, import_path.join)(LOG_DIR, f)).mtime.getTime()
+    })).sort((a, b) => b.mtime - a.mtime);
     for (let i = MAX_LOG_FILES; i < files.length; i++) {
       try {
         const { unlinkSync } = require("fs");
@@ -19867,6 +20443,7 @@ function sanitizeAssembled(obj, depth = 0) {
 }
 
 // src/event-handler.ts
+var QUESTION_TIMEOUT_MS = 6e4;
 var permissionOptions = [
   { optionId: "once", kind: "allow_once", name: "Allow once" },
   { optionId: "always", kind: "allow_always", name: "Always allow" },
@@ -19883,6 +20460,11 @@ var EventHandler = class {
   questionQueues = /* @__PURE__ */ new Map();
   started = false;
   messageBuffers = /* @__PURE__ */ new Map();
+  /** Index: sessionId → Set<messageId> for O(1) flush lookup. */
+  sessionBufferIndex = /* @__PURE__ */ new Map();
+  messageMetaCache = /* @__PURE__ */ new Map();
+  /** Track tool call counts per child session to detect completion. */
+  childToolCounts = /* @__PURE__ */ new Map();
   /**
    * Wrapper around connection.sessionUpdate that logs what's sent to the ACP client.
    * This is the single point where we record all outgoing traffic.
@@ -19893,7 +20475,15 @@ var EventHandler = class {
       this.flushMessageBuffer(params.sessionId, `boundary:${updateType}`);
       acpOut(`sessionUpdate.${updateType}`, {
         sessionId: params.sessionId.slice(0, 12),
-        ...updateType === "tool_call" || updateType === "tool_call_update" ? { toolCallId: params.update.toolCallId, tool: params.update.title, kind: params.update.kind, status: params.update.status } : updateType === "session_info_update" ? { title: params.update.title, _meta: params.update._meta } : {}
+        ...updateType === "tool_call" || updateType === "tool_call_update" ? {
+          toolCallId: params.update.toolCallId,
+          tool: params.update.title,
+          kind: params.update.kind,
+          status: params.update.status
+        } : updateType === "session_info_update" ? {
+          title: params.update.title,
+          _meta: params.update._meta
+        } : {}
       });
     }
     return this.connection.sessionUpdate(params);
@@ -19908,6 +20498,12 @@ var EventHandler = class {
     if (!buf) {
       buf = { sessionId, text: "", thought: "" };
       this.messageBuffers.set(messageId, buf);
+      const msgSet = this.sessionBufferIndex.get(sessionId);
+      if (msgSet) {
+        msgSet.add(messageId);
+      } else {
+        this.sessionBufferIndex.set(sessionId, /* @__PURE__ */ new Set([messageId]));
+      }
     }
     buf[kind] += delta;
   }
@@ -19917,8 +20513,11 @@ var EventHandler = class {
    * text/thought phase is complete.
    */
   flushMessageBuffer(sessionId, reason) {
-    for (const [messageId, buf] of this.messageBuffers) {
-      if (buf.sessionId !== sessionId) continue;
+    const msgIds = this.sessionBufferIndex.get(sessionId);
+    if (!msgIds) return;
+    for (const messageId of msgIds) {
+      const buf = this.messageBuffers.get(messageId);
+      if (!buf) continue;
       if (!buf.text && !buf.thought) {
         this.messageBuffers.delete(messageId);
         continue;
@@ -19943,11 +20542,46 @@ var EventHandler = class {
       }
       this.messageBuffers.delete(messageId);
     }
+    this.sessionBufferIndex.delete(sessionId);
   }
   /** Flush all remaining buffers (e.g. on stop) */
   flushAllBuffers() {
-    for (const [messageId, buf] of this.messageBuffers) {
-      this.flushMessageBuffer(buf.sessionId, "stop");
+    for (const sessionId of this.sessionBufferIndex.keys()) {
+      this.flushMessageBuffer(sessionId, "stop");
+    }
+  }
+  /**
+   * Get or cache message metadata (role + parts) for a message.
+   * Fetches from SDK only on first delta for a message, then serves from cache.
+   */
+  async getOrCacheMessageMeta(sessionID, messageID, cwd) {
+    const cached2 = this.messageMetaCache.get(messageID);
+    if (cached2) return cached2;
+    const message = await this.sdk.session.message({ sessionID, messageID, directory: cwd }, { throwOnError: true }).then((x) => x.data).catch(() => void 0);
+    if (!message) return void 0;
+    const parts = /* @__PURE__ */ new Map();
+    for (const p of message.parts) {
+      parts.set(p.id, { type: p.type, ignored: p.ignored });
+    }
+    const meta3 = { role: message.info.role, parts };
+    this.messageMetaCache.set(messageID, meta3);
+    if (this.messageMetaCache.size > 50) {
+      const oldest = this.messageMetaCache.keys().next().value;
+      if (oldest) this.messageMetaCache.delete(oldest);
+    }
+    return meta3;
+  }
+  /**
+   * Flush previous message buffer for a session when messageId changes.
+   */
+  flushPreviousBuffer(sessionId, currentMessageId) {
+    const msgIds = this.sessionBufferIndex.get(sessionId);
+    if (!msgIds) return;
+    for (const messageId of msgIds) {
+      if (messageId !== currentMessageId) {
+        this.flushMessageBuffer(sessionId, "new_message");
+        return;
+      }
     }
   }
   constructor(deps) {
@@ -19991,12 +20625,8 @@ var EventHandler = class {
    */
   resolveSession(sessionId) {
     const session = this.sessionManager.tryGet(sessionId);
-    if (session) return { sessionId: session.id, cwd: session.cwd };
-    const root = this.sessionManager.findRootSession(sessionId);
-    if (!root) return void 0;
-    const child = this.sessionManager.tryGet(sessionId);
-    if (child) return { sessionId: child.id, cwd: child.cwd };
-    return void 0;
+    if (!session) return void 0;
+    return { sessionId: session.id, cwd: session.cwd };
   }
   // ─── Event Handling ──────────────────────────────────────────────
   async handleEvent(event) {
@@ -20013,7 +20643,13 @@ var EventHandler = class {
         this.sessionManager.registerDiscovered(id, parentID, title);
         if (isNew) {
           ocEvent("session.created.child", { id, parentID, title });
-          await this.announceChildSession(id, parentID, title);
+          const agentMatch = title?.match(/@(\w+)\s+subagent/);
+          const agentType = agentMatch?.[1];
+          const description = title?.replace(/\s*\(@\w+\s+subagent\)\s*$/, "") ?? title;
+          await this.announceChildSession(id, parentID, title, {
+            agentType,
+            description
+          });
         }
         return;
       }
@@ -20058,11 +20694,16 @@ var EventHandler = class {
             const filepath = typeof metadata["filepath"] === "string" ? metadata["filepath"] : "";
             const diff = typeof metadata["diff"] === "string" ? metadata["diff"] : "";
             if (filepath && diff) {
-              this.connection.writeTextFile({
-                sessionId,
-                path: filepath,
-                content: ""
-              });
+              const fileResult = await this.sdk.file.read({ path: filepath, directory }).then((x) => x.data).catch(() => void 0);
+              const original = typeof fileResult?.content === "string" ? fileResult.content : "";
+              const newContent = applyPatch(original, diff);
+              if (newContent !== false) {
+                this.connection.writeTextFile({
+                  sessionId,
+                  path: filepath,
+                  content: newContent
+                });
+              }
             }
           }
           await this.sdk.permission.reply({
@@ -20086,26 +20727,50 @@ var EventHandler = class {
         if (!resolved) return;
         const directory = resolved.cwd;
         const sessionId = resolved.sessionId;
-        ocEvent("question.asked", { id: q.id, sessionID: q.sessionID, questions: q.questions.length });
+        ocEvent("question.asked", {
+          id: q.id,
+          sessionID: q.sessionID,
+          questions: q.questions.length
+        });
         const prev = this.questionQueues.get(q.sessionID) ?? Promise.resolve();
         const next = prev.then(async () => {
-          const res = await this.connection.extMethod("questionAsked", {
-            sessionId,
-            questionId: q.id,
-            questions: q.questions
-          }).catch(() => void 0);
-          if (!res || !res.answers) {
+          const extResult = await Promise.race([
+            this.connection.extMethod("questionAsked", {
+              sessionId,
+              questionId: q.id,
+              questions: q.questions,
+              ...q.tool && { tool: q.tool }
+            }),
+            new Promise(
+              (_, reject) => setTimeout(() => reject(new Error("questionAsked timeout")), QUESTION_TIMEOUT_MS)
+            )
+          ]).catch((err) => {
+            console.error("[event-handler] extMethod questionAsked failed:", err?.message ?? err);
+            return void 0;
+          });
+          if (!extResult || !extResult.answers) {
             await this.sdk.question.reject({ requestID: q.id, directory }).catch(() => {
             });
             ocEvent("question.rejected", { requestID: q.id });
             return;
           }
+          const answers = extResult.answers;
+          if (!Array.isArray(answers) || !answers.every((a) => Array.isArray(a) && a.every((v) => typeof v === "string"))) {
+            console.error("[event-handler] invalid answers shape from client:", JSON.stringify(answers));
+            await this.sdk.question.reject({ requestID: q.id, directory }).catch(() => {
+            });
+            ocEvent("question.rejected", {
+              requestID: q.id,
+              reason: "invalid_answers"
+            });
+            return;
+          }
           await this.sdk.question.reply({
             requestID: q.id,
             directory,
-            answers: res.answers
+            answers
           });
-          ocEvent("question.reply", { requestID: q.id, answers: res.answers });
+          ocEvent("question.reply", { requestID: q.id, answers });
         }).catch((err) => {
           console.error("[event-handler] question handling error:", err);
         }).finally(() => {
@@ -20131,24 +20796,12 @@ var EventHandler = class {
         const resolved = this.resolveSession(props.sessionID);
         if (!resolved) return;
         const sessionId = resolved.sessionId;
-        const currentBufKey = [...this.messageBuffers.keys()].find(
-          (k) => this.messageBuffers.get(k)?.sessionId === sessionId && k !== props.messageID
-        );
-        if (currentBufKey) {
-          this.flushMessageBuffer(sessionId, "new_message");
-        }
-        const message = await this.sdk.session.message(
-          {
-            sessionID: props.sessionID,
-            messageID: props.messageID,
-            directory: resolved.cwd
-          },
-          { throwOnError: true }
-        ).then((x) => x.data).catch(() => void 0);
-        if (!message || message.info.role !== "assistant") return;
-        const part = message.parts.find((p) => p.id === props.partID);
-        if (!part) return;
-        if (part.type === "text" && props.field === "text" && part.ignored !== true) {
+        this.flushPreviousBuffer(sessionId, props.messageID);
+        const meta3 = await this.getOrCacheMessageMeta(props.sessionID, props.messageID, resolved.cwd);
+        if (!meta3 || meta3.role !== "assistant") return;
+        const partMeta = meta3.parts.get(props.partID);
+        if (!partMeta) return;
+        if (partMeta.type === "text" && props.field === "text" && partMeta.ignored !== true) {
           this.accumulateDelta(props.messageID, sessionId, "text", props.delta);
           await this.sendToClient({
             sessionId,
@@ -20161,7 +20814,7 @@ var EventHandler = class {
           });
           return;
         }
-        if (part.type === "reasoning" && props.field === "text") {
+        if (partMeta.type === "reasoning" && props.field === "text") {
           this.accumulateDelta(props.messageID, sessionId, "thought", props.delta);
           await this.sendToClient({
             sessionId,
@@ -20182,19 +20835,20 @@ var EventHandler = class {
    * Announce a child session to the ACP client.
    *
    * Sends a session_info_update with the child's own sessionId,
-   * and _meta containing the parent relationship so the client
-   * can display it as a linked sub-session.
+   * and _meta containing structured metadata about the subagent.
    */
-  async announceChildSession(childSessionId, parentSessionId, title) {
+  async announceChildSession(childSessionId, parentSessionId, title, meta3) {
     await this.sendToClient({
       sessionId: childSessionId,
       update: {
         sessionUpdate: "session_info_update",
-        title,
+        title: title ?? "Subagent",
         updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
         _meta: {
           parentSessionId,
-          isSubagent: true
+          isSubagent: true,
+          ...meta3?.agentType && { agentType: meta3.agentType },
+          ...meta3?.description && { description: meta3.description }
         }
       }
     }).catch(() => {
@@ -20204,6 +20858,19 @@ var EventHandler = class {
   async handleToolPart(sessionId, part) {
     if (!this.toolStarts.has(part.callID)) {
       this.toolStarts.add(part.callID);
+      const session = this.sessionManager.tryGet(sessionId);
+      if (session?.parentID) {
+        const tracker = this.childToolCounts.get(sessionId);
+        if (tracker) {
+          tracker.total++;
+        } else {
+          this.childToolCounts.set(sessionId, {
+            completed: 0,
+            total: 1,
+            startTime: Date.now()
+          });
+        }
+      }
       await this.sendToClient({
         sessionId,
         update: {
@@ -20255,6 +20922,27 @@ var EventHandler = class {
       case "completed": {
         this.toolStarts.delete(part.callID);
         this.bashSnapshots.delete(part.callID);
+        if (part.tool === "task" && part.state.metadata) {
+          const childSessionId = typeof part.state.metadata["sessionId"] === "string" ? part.state.metadata["sessionId"] : void 0;
+          if (childSessionId && this.sessionManager.tryGet(childSessionId)) {
+            const tracker = this.childToolCounts.get(childSessionId);
+            await this.sendChildSessionCompleted(
+              childSessionId,
+              sessionId,
+              tracker?.completed ?? 0,
+              tracker ? Date.now() - tracker.startTime : 0
+            ).catch(() => {
+            });
+            this.childToolCounts.delete(childSessionId);
+          }
+        }
+        const session = this.sessionManager.tryGet(sessionId);
+        if (session?.parentID) {
+          const tracker = this.childToolCounts.get(sessionId);
+          if (tracker) {
+            tracker.completed++;
+          }
+        }
         const kind = toToolKind(part.tool);
         const content = [
           {
@@ -20269,6 +20957,26 @@ var EventHandler = class {
           const newText = typeof input["newString"] === "string" ? input["newString"] : typeof input["content"] === "string" ? input["content"] : "";
           content.push({ type: "diff", path: filePath, oldText, newText });
         }
+        if (part.tool === "todowrite") {
+          try {
+            const todos = JSON.parse(part.state.output);
+            if (Array.isArray(todos)) {
+              await this.sendToClient({
+                sessionId,
+                update: {
+                  sessionUpdate: "plan",
+                  entries: todos.map((todo) => ({
+                    priority: "medium",
+                    status: todo.status === "cancelled" ? "completed" : todo.status,
+                    content: todo.content
+                  }))
+                }
+              }).catch(() => {
+              });
+            }
+          } catch {
+          }
+        }
         await this.sendToClient({
           sessionId,
           update: {
@@ -20317,6 +21025,32 @@ var EventHandler = class {
       }
     }
   }
+  /**
+   * Notify the ACP client that a child session has completed.
+   */
+  async sendChildSessionCompleted(childSessionId, parentSessionId, toolCallCount, durationMs) {
+    const child = this.sessionManager.tryGet(childSessionId);
+    const title = child?.title ?? "Subagent";
+    const agentMatch = title.match(/@(\w+)\s+subagent/);
+    const agentType = agentMatch?.[1];
+    const description = title.replace(/\s*\(@\w+\s+subagent\)\s*$/, "");
+    await this.sendToClient({
+      sessionId: childSessionId,
+      update: {
+        sessionUpdate: "session_info_update",
+        title,
+        status: "completed",
+        _meta: {
+          parentSessionId,
+          isSubagent: true,
+          toolCallCount,
+          durationMs,
+          ...agentType && { agentType },
+          ...description && { description }
+        }
+      }
+    });
+  }
   bashOutput(part) {
     if (part.tool !== "bash") return;
     if (!("metadata" in part.state) || !part.state.metadata || typeof part.state.metadata !== "object") return;
@@ -20334,13 +21068,55 @@ function simpleHash(str) {
   return hash2.toString(36);
 }
 
+// src/auth-provider.ts
+var AuthProviderManager = class {
+  sdk;
+  constructor(sdk) {
+    this.sdk = sdk;
+  }
+  async listProviders(directory) {
+    ocCall("provider.list", { directory });
+    const res = await this.sdk.provider.list({ directory });
+    return res.data;
+  }
+  async authMethods(directory) {
+    ocCall("provider.auth", { directory });
+    const res = await this.sdk.provider.auth({ directory });
+    return res.data;
+  }
+  async setApiKey(providerID, auth) {
+    ocCall("auth.set", { providerID });
+    const res = await this.sdk.auth.set({ providerID, auth });
+    return res.data;
+  }
+  async removeAuth(providerID) {
+    ocCall("auth.remove", { providerID });
+    const res = await this.sdk.auth.remove({ providerID });
+    return res.data;
+  }
+  async oauthAuthorize(providerID, method, inputs, directory) {
+    ocCall("provider.oauth.authorize", { providerID, method });
+    const res = await this.sdk.provider.oauth.authorize({ providerID, method, inputs, directory });
+    return res.data;
+  }
+  async oauthCallback(providerID, method, code, directory) {
+    ocCall("provider.oauth.callback", { providerID, method });
+    const res = await this.sdk.provider.oauth.callback({ providerID, method, code, directory });
+    return res.data;
+  }
+};
+
 // src/agent.ts
+function isApiKeyError(err) {
+  return err instanceof Error && err.name === "AI_LoadAPIKeyError";
+}
 var Agent = class {
   connection;
   config;
   sdk;
   sessionManager;
   eventHandler;
+  authProvider;
   /**
    * Wrapper around connection.sessionUpdate that logs what's sent to the ACP client.
    */
@@ -20349,7 +21125,12 @@ var Agent = class {
     if (updateType !== "agent_message_chunk" && updateType !== "agent_thought_chunk") {
       acpOut(`sessionUpdate.${updateType}`, {
         sessionId: params.sessionId.slice(0, 12),
-        ...updateType === "tool_call" || updateType === "tool_call_update" ? { toolCallId: params.update.toolCallId, tool: params.update.title, kind: params.update.kind, status: params.update.status } : {}
+        ...updateType === "tool_call" || updateType === "tool_call_update" ? {
+          toolCallId: params.update.toolCallId,
+          tool: params.update.title,
+          kind: params.update.kind,
+          status: params.update.status
+        } : {}
       });
     }
     return this.connection.sessionUpdate(params);
@@ -20358,6 +21139,7 @@ var Agent = class {
     this.config = config2;
     this.sdk = config2.sdk;
     this.sessionManager = new SessionManager(config2.sdk);
+    this.authProvider = new AuthProviderManager(config2.sdk);
   }
   init(connection) {
     this.connection = connection;
@@ -20369,8 +21151,22 @@ var Agent = class {
     this.eventHandler.start();
   }
   // ─── Protocol Lifecycle ───────────────────────────────────────────
-  async initialize(_params) {
-    acpIn("initialize", { protocolVersion: _params.protocolVersion });
+  async initialize(params) {
+    acpIn("initialize", { protocolVersion: params.protocolVersion });
+    const authMethod = {
+      description: "Run `opencode auth login` in the terminal",
+      name: "Login with opencode",
+      id: "opencode-login"
+    };
+    if (params.clientCapabilities?._meta?.["terminal-auth"] === true) {
+      authMethod._meta = {
+        "terminal-auth": {
+          command: "opencode",
+          args: ["auth", "login"],
+          label: "OpenCode Login"
+        }
+      };
+    }
     return {
       protocolVersion: 1,
       agentCapabilities: {
@@ -20379,76 +21175,159 @@ var Agent = class {
         promptCapabilities: { embeddedContext: true, image: true },
         sessionCapabilities: { fork: {}, list: {}, resume: {} }
       },
-      authMethods: [
-        {
-          description: "Run `opencode auth login` in the terminal",
-          name: "Login with opencode",
-          id: "opencode-login"
-        }
-      ],
+      authMethods: [authMethod],
       agentInfo: {
         name: "Harmony-ACP",
         version: "0.1.0"
-      }
+      },
+      _meta: await this.buildProviderMeta()
     };
   }
   async authenticate(_params) {
     throw new Error("Authentication not implemented");
   }
+  // ─── Extension Methods ────────────────────────────────────────────
+  async extMethod(method, params) {
+    acpIn("extMethod", { method });
+    if (!method.startsWith("provider/")) {
+      throw new Error(`Unknown extMethod: ${method}`);
+    }
+    return this.handleProviderMethod(method, params);
+  }
+  async handleProviderMethod(method, params) {
+    const sessionId = params.sessionId;
+    const cwd = sessionId ? this.sessionManager.get(sessionId)?.cwd : this.config.cwd;
+    switch (method) {
+      case "provider/list": {
+        if (!cwd) throw new Error("Session not found");
+        const data = await this.authProvider.listProviders(cwd);
+        acpOut("extMethod.response", { method: "provider/list" });
+        return data;
+      }
+      case "provider/auth/methods": {
+        if (!cwd) throw new Error("Session not found");
+        const data = await this.authProvider.authMethods(cwd);
+        acpOut("extMethod.response", { method: "provider/auth/methods" });
+        return data;
+      }
+      case "provider/auth/set": {
+        const providerID = params.providerID;
+        const auth = params.auth;
+        if (!providerID) throw new Error("Missing required parameter: providerID");
+        if (!auth?.key) throw new Error("Missing required parameter: auth.key");
+        await this.authProvider.setApiKey(providerID, auth);
+        acpOut("extMethod.response", { method: "provider/auth/set", providerID });
+        return { success: true };
+      }
+      case "provider/auth/remove": {
+        const providerID = params.providerID;
+        if (!providerID) throw new Error("Missing required parameter: providerID");
+        await this.authProvider.removeAuth(providerID);
+        acpOut("extMethod.response", { method: "provider/auth/remove", providerID });
+        return { success: true };
+      }
+      case "provider/oauth/authorize": {
+        const providerID = params.providerID;
+        const oauthMethod = params.method;
+        if (!providerID) throw new Error("Missing required parameter: providerID");
+        const inputs = params.inputs;
+        const data = await this.authProvider.oauthAuthorize(providerID, oauthMethod ?? 0, inputs, cwd);
+        acpOut("extMethod.response", { method: "provider/oauth/authorize", providerID });
+        return data;
+      }
+      case "provider/oauth/callback": {
+        const providerID = params.providerID;
+        const oauthMethod = params.method;
+        const code = params.code;
+        if (!providerID) throw new Error("Missing required parameter: providerID");
+        await this.authProvider.oauthCallback(providerID, oauthMethod ?? 0, code, cwd);
+        acpOut("extMethod.response", { method: "provider/oauth/callback", providerID });
+        return { success: true };
+      }
+      default:
+        throw new Error(`Unknown provider extMethod: ${method}`);
+    }
+  }
+  async buildProviderMeta() {
+    try {
+      const data = await this.authProvider.listProviders(this.config.cwd);
+      if (!data?.all) return void 0;
+      const providers = data.all.map((p) => ({
+        id: p.id,
+        name: p.name,
+        connected: data.connected?.includes(p.id) ?? false
+      }));
+      return { providers };
+    } catch {
+      return void 0;
+    }
+  }
   // ─── Session Management ───────────────────────────────────────────
   async newSession(params) {
     acpIn("newSession", { cwd: params.cwd, mcpServers: params.mcpServers.length });
-    const directory = params.cwd;
-    ocCall("session.create", { directory });
-    const model = await this.defaultModel(directory);
-    const state = await this.sessionManager.create(
-      params.cwd,
-      params.mcpServers,
-      model
-    );
-    const sessionId = state.id;
-    const result = await this.loadSessionMode({
-      cwd: directory,
-      mcpServers: params.mcpServers,
-      sessionId
-    });
-    acpOut("newSession.response", { sessionId });
-    return {
-      sessionId,
-      configOptions: result.configOptions,
-      models: result.models,
-      modes: result.modes,
-      _meta: result._meta
-    };
+    try {
+      const directory = params.cwd;
+      ocCall("session.create", { directory });
+      const model = await this.defaultModel(directory);
+      const state = await this.sessionManager.create(params.cwd, params.mcpServers, model);
+      const sessionId = state.id;
+      const result = await this.loadSessionMode({
+        cwd: directory,
+        mcpServers: params.mcpServers,
+        sessionId
+      });
+      acpOut("newSession.response", { sessionId });
+      return {
+        sessionId,
+        configOptions: result.configOptions,
+        models: result.models,
+        modes: result.modes,
+        _meta: result._meta
+      };
+    } catch (e) {
+      if (isApiKeyError(e)) throw RequestError.authRequired();
+      throw e;
+    }
   }
   async loadSession(params) {
-    const directory = params.cwd;
-    const sessionId = params.sessionId;
-    const model = await this.defaultModel(directory);
-    await this.sessionManager.load(sessionId, params.cwd, params.mcpServers, model);
-    const result = await this.loadSessionMode({
-      cwd: directory,
-      mcpServers: params.mcpServers,
-      sessionId
-    });
-    const messages = await this.sdk.session.messages({ sessionID: sessionId, directory }).then((x) => x.data).catch(() => void 0);
-    const lastUser = messages?.findLast((m) => m.info.role === "user")?.info;
-    if (lastUser?.role === "user") {
-      result.models.currentModelId = `${lastUser.model.providerID}/${lastUser.model.modelID}`;
-      this.sessionManager.setModel(sessionId, {
-        providerID: lastUser.model.providerID,
-        modelID: lastUser.model.modelID
+    try {
+      const directory = params.cwd;
+      const sessionId = params.sessionId;
+      const model = await this.defaultModel(directory);
+      await this.sessionManager.load(sessionId, params.cwd, params.mcpServers, model);
+      const result = await this.loadSessionMode({
+        cwd: directory,
+        mcpServers: params.mcpServers,
+        sessionId
       });
-      if (result.modes?.availableModes.some((m) => m.id === lastUser.agent)) {
-        result.modes.currentModeId = lastUser.agent;
-        this.sessionManager.setMode(sessionId, lastUser.agent);
+      const messages = await this.sdk.session.messages({ sessionID: sessionId, directory }).then((x) => x.data).catch(() => void 0);
+      const lastUser = messages?.findLast((m) => m.info.role === "user")?.info;
+      if (lastUser?.role === "user") {
+        result.models.currentModelId = `${lastUser.model.providerID}/${lastUser.model.modelID}`;
+        this.sessionManager.setModel(sessionId, {
+          providerID: lastUser.model.providerID,
+          modelID: lastUser.model.modelID
+        });
+        if (result.modes?.availableModes.some((m) => m.id === lastUser.agent)) {
+          result.modes.currentModeId = lastUser.agent;
+          this.sessionManager.setMode(sessionId, lastUser.agent);
+        }
       }
+      for (const msg of messages ?? []) {
+        await this.processMessage(msg);
+        for (const part of msg.parts ?? []) {
+          if (part.type === "tool" && part.tool === "task" && part.state?.status === "completed" && part.state?.metadata?.sessionId) {
+            const childSessionId = part.state.metadata.sessionId;
+            await this.replayChildSession(childSessionId, sessionId, directory);
+          }
+        }
+      }
+      await this.sendUsageUpdate(sessionId, directory);
+      return result;
+    } catch (e) {
+      if (isApiKeyError(e)) throw RequestError.authRequired();
+      throw e;
     }
-    for (const msg of messages ?? []) {
-      await this.processMessage(msg);
-    }
-    await this.sendUsageUpdate(sessionId, directory);
-    return result;
   }
   async listSessions(params) {
     const limit = 100;
@@ -20470,38 +21349,48 @@ var Agent = class {
     return response;
   }
   async unstable_forkSession(params) {
-    const directory = params.cwd;
-    const mcpServers = params.mcpServers ?? [];
-    const model = await this.defaultModel(directory);
-    const forked = await this.sdk.session.fork({ sessionID: params.sessionId, directory }).then((x) => x.data);
-    if (!forked) throw new Error("Fork session returned no data");
-    const sessionId = forked.id;
-    await this.sessionManager.load(sessionId, directory, mcpServers, model);
-    const result = await this.loadSessionMode({
-      cwd: directory,
-      mcpServers,
-      sessionId
-    });
-    const messages = await this.sdk.session.messages({ sessionID: sessionId, directory }).then((x) => x.data).catch(() => void 0);
-    for (const msg of messages ?? []) {
-      await this.processMessage(msg);
+    try {
+      const directory = params.cwd;
+      const mcpServers = params.mcpServers ?? [];
+      const model = await this.defaultModel(directory);
+      const forked = await this.sdk.session.fork({ sessionID: params.sessionId, directory }).then((x) => x.data);
+      if (!forked) throw new Error("Fork session returned no data");
+      const sessionId = forked.id;
+      await this.sessionManager.load(sessionId, directory, mcpServers, model);
+      const result = await this.loadSessionMode({
+        cwd: directory,
+        mcpServers,
+        sessionId
+      });
+      const messages = await this.sdk.session.messages({ sessionID: sessionId, directory }).then((x) => x.data).catch(() => void 0);
+      for (const msg of messages ?? []) {
+        await this.processMessage(msg);
+      }
+      await this.sendUsageUpdate(sessionId, directory);
+      return result;
+    } catch (e) {
+      if (isApiKeyError(e)) throw RequestError.authRequired();
+      throw e;
     }
-    await this.sendUsageUpdate(sessionId, directory);
-    return result;
   }
   async unstable_resumeSession(params) {
-    const directory = params.cwd;
-    const sessionId = params.sessionId;
-    const mcpServers = params.mcpServers ?? [];
-    const model = await this.defaultModel(directory);
-    await this.sessionManager.load(sessionId, directory, mcpServers, model);
-    const result = await this.loadSessionMode({
-      cwd: directory,
-      mcpServers,
-      sessionId
-    });
-    await this.sendUsageUpdate(sessionId, directory);
-    return result;
+    try {
+      const directory = params.cwd;
+      const sessionId = params.sessionId;
+      const mcpServers = params.mcpServers ?? [];
+      const model = await this.defaultModel(directory);
+      await this.sessionManager.load(sessionId, directory, mcpServers, model);
+      const result = await this.loadSessionMode({
+        cwd: directory,
+        mcpServers,
+        sessionId
+      });
+      await this.sendUsageUpdate(sessionId, directory);
+      return result;
+    } catch (e) {
+      if (isApiKeyError(e)) throw RequestError.authRequired();
+      throw e;
+    }
   }
   // ─── Prompt Execution ─────────────────────────────────────────────
   async prompt(params) {
@@ -20514,7 +21403,7 @@ var Agent = class {
     if (!session.model) {
       this.sessionManager.setModel(session.id, model);
     }
-    const agent = session.modeId ?? "build";
+    const agent = session.modeId ?? await this.defaultAgent(directory);
     const parts = this.convertPromptParts(params.prompt);
     const cmd = this.parseCommand(parts);
     ocCall("session.prompt", { sessionID, agent, model: `${model.providerID}/${model.modelID}` });
@@ -20571,6 +21460,23 @@ var Agent = class {
         _meta: {}
       };
     }
+    if (cmd.name === "compact") {
+      await this.sdk.session.summarize(
+        {
+          sessionID,
+          directory,
+          providerID: model.providerID,
+          modelID: model.modelID
+        },
+        { throwOnError: true }
+      ).catch(() => {
+      });
+      await this.sendUsageUpdate(sessionID, directory);
+      return {
+        stopReason: "end_turn",
+        _meta: {}
+      };
+    }
     const response = await this.sdk.session.prompt({
       sessionID,
       model: { providerID: model.providerID, modelID: model.modelID },
@@ -20599,38 +21505,129 @@ var Agent = class {
   }
   // ─── Configuration ────────────────────────────────────────────────
   async setSessionMode(params) {
+    const session = this.sessionManager.get(params.sessionId);
+    const agents = await this.sdk.app.agents({ directory: session.cwd }).then((x) => x.data ?? []).catch(() => []);
+    const availableModes = agents.filter((a) => a.mode !== "subagent" && !a.hidden);
+    if (!availableModes.some((a) => a.name === params.modeId)) {
+      throw new Error(`Agent not found: ${params.modeId}`);
+    }
     this.sessionManager.setMode(params.sessionId, params.modeId);
   }
   async unstable_setSessionModel(params) {
     const session = this.sessionManager.get(params.sessionId);
-    const [providerID, modelID] = params.modelId.split("/");
-    this.sessionManager.setModel(params.sessionId, { providerID, modelID });
+    const providers = await this.sdk.config.providers({ directory: session.cwd }).then((x) => x.data?.providers ?? []).catch(() => []);
+    const selection = parseModelSelection(params.modelId, providers);
+    this.sessionManager.setModel(params.sessionId, selection.model);
+    this.sessionManager.setVariant(params.sessionId, selection.variant);
+    const currentProvider = providers.find((p) => p.id === selection.model.providerID);
+    const currentModelInfo = currentProvider?.models?.[selection.model.modelID];
+    const availableVariants = currentModelInfo?.variants ? Object.keys(currentModelInfo.variants) : [];
+    return {
+      _meta: buildVariantMeta(selection.model, selection.variant, availableVariants)
+    };
   }
   async setSessionConfigOption(params) {
     const session = this.sessionManager.get(params.sessionId);
-    if (params.configId === "model" && typeof params.value === "string") {
-      const [providerID, modelID] = params.value.split("/");
-      this.sessionManager.setModel(params.sessionId, { providerID, modelID });
-    } else if (params.configId === "mode" && typeof params.value === "string") {
+    const providers = await this.sdk.config.providers({ directory: session.cwd }).then((x) => x.data?.providers ?? []).catch(() => []);
+    const sortedProviders = [...providers].sort(
+      (a, b) => a.name.toLowerCase() < b.name.toLowerCase() ? -1 : a.name.toLowerCase() > b.name.toLowerCase() ? 1 : 0
+    );
+    if (params.configId === "model") {
+      if (typeof params.value !== "string") throw RequestError.invalidParams("model value must be a string");
+      const selection = parseModelSelection(params.value, providers);
+      this.sessionManager.setModel(params.sessionId, selection.model);
+      this.sessionManager.setVariant(params.sessionId, selection.variant);
+    } else if (params.configId === "mode") {
+      if (typeof params.value !== "string") throw RequestError.invalidParams("mode value must be a string");
+      const agents2 = await this.sdk.app.agents({ directory: session.cwd }).then((x) => x.data ?? []).catch(() => []);
+      const availableModes2 = agents2.filter((a) => a.mode !== "subagent" && !a.hidden);
+      if (!availableModes2.some((a) => a.name === params.value)) {
+        throw RequestError.invalidParams(JSON.stringify({ error: `Mode not found: ${params.value}` }));
+      }
       this.sessionManager.setMode(params.sessionId, params.value);
+    } else {
+      throw RequestError.invalidParams(JSON.stringify({ error: `Unknown config option: ${params.configId}` }));
+    }
+    const updatedSession = this.sessionManager.get(params.sessionId);
+    const model = updatedSession.model ?? await this.defaultModel(session.cwd);
+    const currentProvider = sortedProviders.find((p) => p.id === model.providerID);
+    const currentModelInfo = currentProvider?.models?.[model.modelID];
+    const availableVariants = currentModelInfo?.variants ? Object.keys(currentModelInfo.variants) : [];
+    const variant = updatedSession.variant;
+    const currentModelId = formatModelIdWithVariant(model, variant, availableVariants);
+    const availableModels = sortedProviders.flatMap(
+      (provider) => Object.values(provider.models).flatMap((modelInfo) => {
+        const base = {
+          modelId: `${provider.id}/${modelInfo.id}`,
+          name: `${provider.name}/${modelInfo.name}`
+        };
+        if (!modelInfo.variants) return [base];
+        const variants = Object.keys(modelInfo.variants).filter((v) => v !== "default");
+        return [
+          base,
+          ...variants.map((v) => ({
+            modelId: `${provider.id}/${modelInfo.id}/${v}`,
+            name: `${provider.name}/${modelInfo.name} (${v})`
+          }))
+        ];
+      })
+    );
+    const agents = await this.sdk.app.agents({ directory: session.cwd }).then((x) => x.data ?? []).catch(() => []);
+    const availableModes = agents.filter((a) => a.mode !== "subagent" && !a.hidden).map((a) => ({ id: a.name, name: a.name, description: a.description }));
+    const currentModeId = updatedSession.modeId ?? availableModes[0]?.id;
+    const configOptions = [
+      {
+        id: "model",
+        name: "Model",
+        category: "model",
+        type: "select",
+        currentValue: currentModelId,
+        options: availableModels.map((m) => ({ value: m.modelId, name: m.name }))
+      }
+    ];
+    if (currentModeId && availableModes.length > 0) {
+      configOptions.push({
+        id: "mode",
+        name: "Session Mode",
+        category: "mode",
+        type: "select",
+        currentValue: currentModeId,
+        options: availableModes.map((m) => ({
+          value: m.id,
+          name: m.name,
+          ...m.description ? { description: m.description } : {}
+        }))
+      });
     }
-    const model = this.sessionManager.getModel(params.sessionId) ?? await this.defaultModel(session.cwd);
-    const currentModelId = `${model.providerID}/${model.modelID}`;
-    return {
-      configOptions: [
-        {
-          id: "model",
-          name: "Model",
-          category: "model",
-          type: "select",
-          currentValue: currentModelId,
-          options: []
-          // TODO: populate from providers
-        }
-      ]
-    };
+    return { configOptions };
   }
   // ─── Internal Helpers ─────────────────────────────────────────────
+  /**
+   * Replay a child subagent session by fetching its messages and sending
+   * them to the ACP client. Registers the child with the session manager.
+   */
+  async replayChildSession(childSessionId, parentSessionId, directory) {
+    if (this.sessionManager.tryGet(childSessionId)) return;
+    const childMessages = await this.sdk.session.messages({ sessionID: childSessionId, directory }).then((x) => x.data).catch(() => void 0);
+    if (!childMessages?.length) return;
+    const title = `Subagent (${childSessionId.slice(0, 8)})`;
+    this.sessionManager.registerDiscovered(childSessionId, parentSessionId, title);
+    await this.sendToClient({
+      sessionId: childSessionId,
+      update: {
+        sessionUpdate: "session_info_update",
+        title,
+        _meta: {
+          parentSessionId,
+          isSubagent: true
+        }
+      }
+    }).catch(() => {
+    });
+    for (const msg of childMessages) {
+      await this.processMessage({ ...msg, info: { ...msg.info, sessionID: childSessionId } });
+    }
+  }
   async defaultModel(cwd) {
     const configured = this.config.defaultModel;
     if (configured) return configured;
@@ -20649,65 +21646,137 @@ var Agent = class {
         return { providerID: "opencode", modelID: models[0] };
       }
     }
-    const allModels = providers.flatMap(
-      (p) => Object.keys(p.models).map((m) => ({ providerID: p.id, modelID: m }))
-    );
+    const allModels = providers.flatMap((p) => Object.keys(p.models).map((m) => ({ providerID: p.id, modelID: m })));
     if (allModels.length > 0) return allModels[0];
     return { providerID: "opencode", modelID: "big-pickle" };
   }
+  async defaultAgent(cwd) {
+    const agents = await this.sdk.app.agents({ directory: cwd }).then((x) => x.data ?? []).catch(() => []);
+    const primary = agents.filter((a) => a.mode !== "subagent" && !a.hidden);
+    return primary.length > 0 ? primary[0].name : "build";
+  }
   async loadSessionMode(params) {
     const model = await this.defaultModel(params.cwd);
     const providers = await this.sdk.config.providers({ directory: params.cwd }).then((x) => x.data?.providers ?? []).catch(() => []);
-    const availableModels = providers.flatMap(
-      (provider) => Object.keys(provider.models).map((modelId) => ({
-        modelId: `${provider.id}/${modelId}`,
-        name: `${provider.name}/${provider.models[modelId].name}`
-      }))
+    const sortedProviders = [...providers].sort(
+      (a, b) => a.name.toLowerCase() < b.name.toLowerCase() ? -1 : a.name.toLowerCase() > b.name.toLowerCase() ? 1 : 0
+    );
+    const availableModels = sortedProviders.flatMap(
+      (provider) => Object.values(provider.models).flatMap((modelInfo) => {
+        const base = {
+          modelId: `${provider.id}/${modelInfo.id}`,
+          name: `${provider.name}/${modelInfo.name}`
+        };
+        if (!modelInfo.variants) return [base];
+        const variants = Object.keys(modelInfo.variants).filter((v) => v !== "default");
+        return [
+          base,
+          ...variants.map((v) => ({
+            modelId: `${provider.id}/${modelInfo.id}/${v}`,
+            name: `${provider.name}/${modelInfo.name} (${v})`
+          }))
+        ];
+      })
+    );
+    const currentProvider = sortedProviders.find((p) => p.id === model.providerID);
+    const currentModelInfo = currentProvider?.models[model.modelID];
+    const availableVariants = currentModelInfo?.variants ? Object.keys(currentModelInfo.variants) : [];
+    const variant = this.sessionManager.getVariant(params.sessionId);
+    if (variant && !availableVariants.includes(variant)) {
+      this.sessionManager.setVariant(params.sessionId, void 0);
+    }
+    const currentModelId = formatModelIdWithVariant(model, variant, availableVariants);
+    const agents = await this.sdk.app.agents({ directory: params.cwd }).then((x) => x.data ?? []).catch(() => []);
+    const availableModes = agents.filter((a) => a.mode !== "subagent" && !a.hidden).map((a) => ({ id: a.name, name: a.name, description: a.description }));
+    const currentModeId = this.sessionManager.getMode(params.sessionId) ?? (availableModes.length > 0 ? availableModes[0].id : void 0);
+    if (currentModeId && !this.sessionManager.getMode(params.sessionId)) {
+      this.sessionManager.setMode(params.sessionId, currentModeId);
+    }
+    const modes = currentModeId ? { availableModes, currentModeId } : void 0;
+    await Promise.all(
+      params.mcpServers.map(async (server) => {
+        const config2 = "url" in server ? {
+          url: server.url,
+          type: "remote",
+          headers: (server.headers ?? []).reduce(
+            (acc, h) => {
+              acc[h.name] = h.value;
+              return acc;
+            },
+            {}
+          )
+        } : {
+          type: "local",
+          command: [server.command, ...server.args],
+          environment: (server.env ?? []).reduce(
+            (acc, v) => {
+              acc[v.name] = v.value;
+              return acc;
+            },
+            {}
+          )
+        };
+        await this.sdk.mcp.add({ directory: params.cwd, name: server.name, config: config2 }).catch(() => {
+        });
+      })
     );
-    const currentModelId = `${model.providerID}/${model.modelID}`;
-    for (const server of params.mcpServers) {
-      const config2 = "type" in server ? { url: server.url, type: "remote", headers: {} } : { type: "local", command: [server.command, ...server.args] };
-      await this.sdk.mcp.add({ directory: params.cwd, name: server.name, config: config2 }).catch(() => {
-      });
-    }
     const commands = await this.sdk.command.list({ directory: params.cwd }).then((x) => x.data ?? []).catch(() => []);
+    const availableCommands = commands.map((c) => ({
+      name: c.name,
+      description: c.description ?? ""
+    }));
+    if (!availableCommands.some((c) => c.name === "compact")) {
+      availableCommands.push({ name: "compact", description: "compact the session" });
+    }
     setTimeout(() => {
       this.sendToClient({
         sessionId: params.sessionId,
         update: {
           sessionUpdate: "available_commands_update",
-          availableCommands: commands.map((c) => ({
-            name: c.name,
-            description: c.description ?? ""
-          }))
+          availableCommands
         }
       }).catch(() => {
       });
     }, 0);
+    const configOptions = [
+      {
+        id: "model",
+        name: "Model",
+        category: "model",
+        type: "select",
+        currentValue: currentModelId,
+        options: availableModels.map((m) => ({
+          value: m.modelId,
+          name: m.name
+        }))
+      }
+    ];
+    if (modes) {
+      configOptions.push({
+        id: "mode",
+        name: "Session Mode",
+        category: "mode",
+        type: "select",
+        currentValue: modes.currentModeId,
+        options: modes.availableModes.map((m) => ({
+          value: m.id,
+          name: m.name,
+          ...m.description ? { description: m.description } : {}
+        }))
+      });
+    }
     return {
       sessionId: params.sessionId,
       models: { currentModelId, availableModels },
-      modes: void 0,
-      // TODO: implement mode loading
-      configOptions: [
-        {
-          id: "model",
-          name: "Model",
-          category: "model",
-          type: "select",
-          currentValue: currentModelId,
-          options: availableModels.map((m) => ({
-            value: m.modelId,
-            name: m.name
-          }))
-        }
-      ],
-      _meta: {}
+      modes,
+      configOptions,
+      _meta: buildVariantMeta(model, variant, availableVariants)
     };
   }
   async processMessage(message) {
     if (message.info.role !== "assistant" && message.info.role !== "user") return;
     const sessionId = message.info.sessionID;
+    const messageChunk = message.info.role === "user" ? "user_message_chunk" : "agent_message_chunk";
     for (const part of message.parts) {
       if (part.type === "tool") {
         await this.replayToolPart(sessionId, part);
@@ -20716,7 +21785,7 @@ var Agent = class {
         await this.sendToClient({
           sessionId,
           update: {
-            sessionUpdate: message.info.role === "user" ? "user_message_chunk" : "agent_message_chunk",
+            sessionUpdate: messageChunk,
             messageId: message.info.id,
             content: {
               type: "text",
@@ -20726,6 +21795,59 @@ var Agent = class {
           }
         }).catch(() => {
         });
+      } else if (part.type === "file" && part.url) {
+        const url2 = part.url;
+        const filename = part.filename ?? "file";
+        const mime = part.mime || "application/octet-stream";
+        if (url2.startsWith("file://")) {
+          await this.sendToClient({
+            sessionId,
+            update: {
+              sessionUpdate: messageChunk,
+              messageId: message.info.id,
+              content: { type: "resource_link", uri: url2, name: filename, mimeType: mime }
+            }
+          }).catch(() => {
+          });
+        } else if (url2.startsWith("data:")) {
+          const base64Match = url2.match(/^data:([^;]+);base64,(.*)$/);
+          const dataMime = base64Match?.[1];
+          const base64Data = base64Match?.[2] ?? "";
+          const effectiveMime = dataMime || mime;
+          if (effectiveMime.startsWith("image/")) {
+            await this.sendToClient({
+              sessionId,
+              update: {
+                sessionUpdate: messageChunk,
+                messageId: message.info.id,
+                content: {
+                  type: "image",
+                  mimeType: effectiveMime,
+                  data: base64Data,
+                  uri: (0, import_url2.pathToFileURL)(filename).href
+                }
+              }
+            }).catch(() => {
+            });
+          } else {
+            const isText = effectiveMime.startsWith("text/") || effectiveMime === "application/json";
+            const fileUri = (0, import_url2.pathToFileURL)(filename).href;
+            const resource = isText ? {
+              uri: fileUri,
+              mimeType: effectiveMime,
+              text: Buffer.from(base64Data, "base64").toString("utf-8")
+            } : { uri: fileUri, mimeType: effectiveMime, blob: base64Data };
+            await this.sendToClient({
+              sessionId,
+              update: {
+                sessionUpdate: messageChunk,
+                messageId: message.info.id,
+                content: { type: "resource", resource }
+              }
+            }).catch(() => {
+            });
+          }
+        }
       } else if (part.type === "reasoning" && part.text) {
         await this.sendToClient({
           sessionId,
@@ -20756,9 +21878,7 @@ var Agent = class {
     switch (part.state.status) {
       case "completed": {
         const kind = toToolKind(part.tool);
-        const content = [
-          { type: "content", content: { type: "text", text: part.state.output } }
-        ];
+        const content = [{ type: "content", content: { type: "text", text: part.state.output } }];
         if (kind === "edit") {
           const input = part.state.input;
           content.push({
@@ -20768,6 +21888,26 @@ var Agent = class {
             newText: typeof input["newString"] === "string" ? input["newString"] : typeof input["content"] === "string" ? input["content"] : ""
           });
         }
+        if (part.tool === "todowrite") {
+          try {
+            const todos = JSON.parse(part.state.output);
+            if (Array.isArray(todos)) {
+              await this.sendToClient({
+                sessionId,
+                update: {
+                  sessionUpdate: "plan",
+                  entries: todos.map((todo) => ({
+                    priority: "medium",
+                    status: todo.status === "cancelled" ? "completed" : todo.status,
+                    content: todo.content
+                  }))
+                }
+              }).catch(() => {
+              });
+            }
+          } catch {
+          }
+        }
         await this.sendToClient({
           sessionId,
           update: {
@@ -20813,14 +21953,32 @@ var Agent = class {
     const msg = lastAssistant.info;
     if (!msg.providerID || !msg.modelID) return;
     const totalCost = assistantMessages.reduce((sum, m) => sum + m.info.cost, 0);
+    const children = this.sessionManager.getChildren(sessionId);
+    let childCost = 0;
+    for (const childId of children) {
+      const childMessages = await this.sdk.session.messages({ sessionID: childId, directory }).then((x) => x.data).catch(() => void 0);
+      if (childMessages) {
+        childCost += childMessages.filter((m) => m.info.role === "assistant").reduce((sum, m) => sum + (m.info.cost ?? 0), 0);
+      }
+    }
+    const providers = await this.sdk.config.providers({ directory }).then((x) => x.data?.providers ?? []).catch(() => []);
+    const provider = providers.find((p) => p.id === msg.providerID);
+    const model = provider?.models[msg.modelID];
+    const size = model?.limit?.context ?? 0;
     await this.sendToClient({
       sessionId,
       update: {
         sessionUpdate: "usage_update",
         used: msg.tokens.input + (msg.tokens.cache?.read ?? 0),
-        size: 0,
-        // TODO: get from model config
-        cost: { amount: totalCost, currency: "USD" }
+        size,
+        cost: { amount: totalCost + childCost, currency: "USD" },
+        ...childCost > 0 && {
+          _meta: {
+            parentCost: totalCost,
+            childCost,
+            childSessionCount: children.length
+          }
+        }
       }
     }).catch(() => {
     });
@@ -20856,11 +22014,26 @@ var Agent = class {
           const resource = part.resource;
           if ("text" in resource && resource.text) {
             result.push({ type: "text", text: resource.text });
+          } else if ("blob" in resource && resource.blob && resource.mimeType) {
+            const parsed = parseUri(resource.uri ?? "");
+            const filename = parsed.type === "file" ? parsed.filename : "file";
+            result.push({
+              type: "file",
+              url: `data:${resource.mimeType};base64,${resource.blob}`,
+              filename,
+              mime: resource.mimeType
+            });
           }
           break;
         }
-        case "resource_link":
+        case "resource_link": {
+          const parsed = parseUri(part.uri);
+          if (parsed.type === "file") {
+            if (part.name) parsed.filename = part.name;
+            result.push(parsed);
+          }
           break;
+        }
       }
     }
     return result;
@@ -20921,6 +22094,38 @@ var Agent = class {
     };
   }
 };
+function formatModelIdWithVariant(model, variant, availableVariants) {
+  const base = `${model.providerID}/${model.modelID}`;
+  if (!variant || !availableVariants.includes(variant)) return base;
+  return `${base}/${variant}`;
+}
+function buildVariantMeta(model, variant, availableVariants) {
+  return {
+    opencode: {
+      modelId: `${model.providerID}/${model.modelID}`,
+      variant: variant ?? null,
+      availableVariants
+    }
+  };
+}
+function parseModelSelection(modelId, providers) {
+  const segments = modelId.split("/");
+  const providerID = segments[0];
+  const rest = segments.slice(1).join("/");
+  const provider = providers.find((p) => p.id === providerID);
+  if (!provider) return { model: { providerID, modelID: rest } };
+  if (provider.models[rest]) return { model: { providerID, modelID: rest } };
+  const lastSlash = rest.lastIndexOf("/");
+  if (lastSlash > 0) {
+    const candidateBase = rest.slice(0, lastSlash);
+    const candidateVariant = rest.slice(lastSlash + 1);
+    const baseInfo = provider.models[candidateBase];
+    if (baseInfo?.variants && candidateVariant in baseInfo.variants) {
+      return { model: { providerID, modelID: candidateBase }, variant: candidateVariant };
+    }
+  }
+  return { model: { providerID, modelID: rest } };
+}
 
 // src/index.ts
 function parseArgs(args) {