@adhdev/daemon-core 0.6.55 → 0.6.56

package/dist/index.d.ts

@@ -2575,6 +2575,8 @@ interface CliScripts {
     /** Lightweight status detection (high-frequency polling) → AgentStatus string */
     detectStatus?: (input: {
         tail: string;
+        screenText?: string;
+        rawBuffer?: string;
     }) => string | null;
     /** Parse approval modal from PTY output → ModalInfo | null */
     parseApproval?: (input: {
@@ -2603,6 +2605,8 @@ interface CliProviderModule {
     name: string;
     category: 'cli';
     binary: string;
+    sendDelayMs?: number;
+    sendKey?: string;
     spawn: {
         command: string;
         args: string[];
@@ -2659,6 +2663,7 @@ declare class ProviderCliAdapter implements CliAdapter {
     private approvalExitTimeout;
     private settleTimer;
     private settledBuffer;
+    private submitPendingUntil;
     private resizeSuppressUntil;
     private statusHistory;
     private cliScripts;
@@ -2673,6 +2678,8 @@ declare class ProviderCliAdapter implements CliAdapter {
     private setStatus;
     private readonly timeouts;
     private readonly approvalKeys;
+    private readonly sendDelayMs;
+    private readonly sendKey;
     constructor(provider: CliProviderModule, workingDir: string, extraArgs?: string[]);
     /** Inject CLI scripts after construction (e.g. when resolved by ProviderLoader) */
     setCliScripts(scripts: CliScripts): void;
@@ -2957,6 +2964,7 @@ declare class DevServer {
     private readBody;
     /** GET /api/cli/status — list all running CLI/ACP instances with state */
     private handleCliStatus;
+    private findCliTarget;
     /** POST /api/cli/launch — launch a CLI agent { type, workingDir?, args? } */
     private handleCliLaunch;
     /** POST /api/cli/send — send message to a running CLI { type, text } */

package/dist/index.js

@@ -592,240 +592,67 @@ var init_logger = __esm({
 });
 
 // src/cli-adapters/terminal-screen.ts
-function clamp(value, min, max) {
-  return Math.max(min, Math.min(max, value));
+function loadTerminalCtor() {
+  if (!TerminalCtor) {
+    const mod = require("@xterm/xterm");
+    TerminalCtor = mod.Terminal || mod.default?.Terminal || mod.default;
+    if (!TerminalCtor) {
+      throw new Error("@xterm/xterm Terminal export not found");
+    }
+  }
+  return TerminalCtor;
 }
-var TerminalScreen;
+var TerminalCtor, TerminalScreen;
 var init_terminal_screen = __esm({
   "src/cli-adapters/terminal-screen.ts"() {
     "use strict";
+    TerminalCtor = null;
     TerminalScreen = class {
       rows;
       cols;
-      cursorRow = 0;
-      cursorCol = 0;
-      savedRow = 0;
-      savedCol = 0;
-      lines;
+      terminal;
       constructor(rows = 40, cols = 120) {
-        this.rows = rows;
-        this.cols = cols;
-        this.lines = this.makeLines(rows, cols);
+        this.rows = Math.max(1, rows | 0);
+        this.cols = Math.max(1, cols | 0);
+        this.terminal = this.createTerminal();
       }
       reset(rows = this.rows, cols = this.cols) {
-        this.rows = rows;
-        this.cols = cols;
-        this.cursorRow = 0;
-        this.cursorCol = 0;
-        this.savedRow = 0;
-        this.savedCol = 0;
-        this.lines = this.makeLines(rows, cols);
+        this.rows = Math.max(1, rows | 0);
+        this.cols = Math.max(1, cols | 0);
+        this.terminal.dispose();
+        this.terminal = this.createTerminal();
       }
       resize(rows, cols) {
-        const nextRows = Math.max(1, rows | 0);
-        const nextCols = Math.max(1, cols | 0);
-        const next = this.makeLines(nextRows, nextCols);
-        const copyRows = Math.min(this.rows, nextRows);
-        const copyCols = Math.min(this.cols, nextCols);
-        for (let r = 0; r < copyRows; r++) {
-          for (let c = 0; c < copyCols; c++) {
-            next[r][c] = this.lines[r][c];
-          }
-        }
-        this.rows = nextRows;
-        this.cols = nextCols;
-        this.lines = next;
-        this.cursorRow = clamp(this.cursorRow, 0, this.rows - 1);
-        this.cursorCol = clamp(this.cursorCol, 0, this.cols - 1);
-        this.savedRow = clamp(this.savedRow, 0, this.rows - 1);
-        this.savedCol = clamp(this.savedCol, 0, this.cols - 1);
+        this.rows = Math.max(1, rows | 0);
+        this.cols = Math.max(1, cols | 0);
+        this.terminal.resize(this.cols, this.rows);
       }
       write(data) {
-        let i = 0;
-        while (i < data.length) {
-          const ch = data[i];
-          if (ch === "\x1B") {
-            const consumed = this.consumeEscape(data, i);
-            i = consumed > i ? consumed : i + 1;
-            continue;
-          }
-          if (ch === "\r") {
-            this.cursorCol = 0;
-            i++;
-            continue;
-          }
-          if (ch === "\n") {
-            this.newLine();
-            i++;
-            continue;
-          }
-          if (ch === "\b") {
-            this.cursorCol = Math.max(0, this.cursorCol - 1);
-            i++;
-            continue;
-          }
-          if (ch === "	") {
-            const nextStop = Math.min(this.cols - 1, this.cursorCol + (8 - (this.cursorCol % 8 || 8)));
-            while (this.cursorCol < nextStop) this.putChar(" ");
-            i++;
-            continue;
-          }
-          if (ch >= " " && ch !== "\x7F") {
-            this.putChar(ch);
-          }
-          i++;
-        }
+        if (!data) return;
+        this.terminal.write(data);
       }
       getText() {
-        const raw = this.lines.map((line) => line.join("").replace(/\s+$/, ""));
-        let start = 0;
-        let end = raw.length;
-        while (start < end && raw[start] === "") start++;
-        while (end > start && raw[end - 1] === "") end--;
-        return raw.slice(start, end).join("\n");
-      }
-      consumeEscape(data, start) {
-        const next = data[start + 1];
-        if (!next) return start + 1;
-        if (next === "[") {
-          let end = start + 2;
-          while (end < data.length && !/[@-~]/.test(data[end])) end++;
-          if (end >= data.length) return data.length;
-          this.applyCsi(data.slice(start + 2, end), data[end]);
-          return end + 1;
-        }
-        if (next === "]") {
-          let end = start + 2;
-          while (end < data.length) {
-            if (data[end] === "\x07") return end + 1;
-            if (data[end] === "\x1B" && data[end + 1] === "\\") return end + 2;
-            end++;
-          }
-          return data.length;
-        }
-        if (next === "7") {
-          this.savedRow = this.cursorRow;
-          this.savedCol = this.cursorCol;
-          return start + 2;
-        }
-        if (next === "8") {
-          this.cursorRow = this.savedRow;
-          this.cursorCol = this.savedCol;
-          return start + 2;
-        }
-        return start + 2;
-      }
-      applyCsi(paramText, finalChar) {
-        const privateMode = paramText.startsWith("?");
-        const normalized = privateMode ? paramText.slice(1) : paramText;
-        const params = normalized.length > 0 ? normalized.split(";").map((p) => parseInt(p || "0", 10) || 0) : [0];
-        switch (finalChar) {
-          case "A":
-            this.cursorRow = clamp(this.cursorRow - (params[0] || 1), 0, this.rows - 1);
-            return;
-          case "B":
-            this.cursorRow = clamp(this.cursorRow + (params[0] || 1), 0, this.rows - 1);
-            return;
-          case "C":
-            this.cursorCol = clamp(this.cursorCol + (params[0] || 1), 0, this.cols - 1);
-            return;
-          case "D":
-            this.cursorCol = clamp(this.cursorCol - (params[0] || 1), 0, this.cols - 1);
-            return;
-          case "E":
-            this.cursorRow = clamp(this.cursorRow + (params[0] || 1), 0, this.rows - 1);
-            this.cursorCol = 0;
-            return;
-          case "F":
-            this.cursorRow = clamp(this.cursorRow - (params[0] || 1), 0, this.rows - 1);
-            this.cursorCol = 0;
-            return;
-          case "G":
-            this.cursorCol = clamp((params[0] || 1) - 1, 0, this.cols - 1);
-            return;
-          case "H":
-          case "f": {
-            const row = (params[0] || 1) - 1;
-            const col = (params[1] || 1) - 1;
-            this.cursorRow = clamp(row, 0, this.rows - 1);
-            this.cursorCol = clamp(col, 0, this.cols - 1);
-            return;
-          }
-          case "J": {
-            const mode = params[0] || 0;
-            if (mode === 2 || mode === 3) {
-              this.reset(this.rows, this.cols);
-            } else if (mode === 0) {
-              this.clearToEndOfScreen();
-            } else if (mode === 1) {
-              this.clearToStartOfScreen();
-            }
-            return;
-          }
-          case "K": {
-            const mode = params[0] || 0;
-            if (mode === 2) this.clearLine(this.cursorRow, 0, this.cols - 1);
-            else if (mode === 1) this.clearLine(this.cursorRow, 0, this.cursorCol);
-            else this.clearLine(this.cursorRow, this.cursorCol, this.cols - 1);
-            return;
-          }
-          case "m":
-            return;
-          case "s":
-            this.savedRow = this.cursorRow;
-            this.savedCol = this.cursorCol;
-            return;
-          case "u":
-            this.cursorRow = this.savedRow;
-            this.cursorCol = this.savedCol;
-            return;
-          case "h":
-          case "l":
-            if (privateMode && (normalized === "1049" || normalized === "47")) {
-              this.reset(this.rows, this.cols);
-            }
-            return;
-          default:
-            return;
-        }
-      }
-      putChar(ch) {
-        if (this.cursorRow < 0 || this.cursorRow >= this.rows) return;
-        if (this.cursorCol < 0) this.cursorCol = 0;
-        if (this.cursorCol >= this.cols) this.newLine();
-        this.lines[this.cursorRow][this.cursorCol] = ch;
-        this.cursorCol++;
-        if (this.cursorCol >= this.cols) this.newLine();
-      }
-      newLine() {
-        this.cursorCol = 0;
-        if (this.cursorRow >= this.rows - 1) {
-          this.lines.shift();
-          this.lines.push(Array.from({ length: this.cols }, () => " "));
-        } else {
-          this.cursorRow++;
-        }
-      }
-      clearLine(row, start, end) {
-        if (row < 0 || row >= this.rows) return;
-        for (let c = clamp(start, 0, this.cols - 1); c <= clamp(end, 0, this.cols - 1); c++) {
-          this.lines[row][c] = " ";
-        }
-      }
-      clearToEndOfScreen() {
-        this.clearLine(this.cursorRow, this.cursorCol, this.cols - 1);
-        for (let r = this.cursorRow + 1; r < this.rows; r++) {
-          this.clearLine(r, 0, this.cols - 1);
-        }
-      }
-      clearToStartOfScreen() {
-        for (let r = 0; r < this.cursorRow; r++) {
-          this.clearLine(r, 0, this.cols - 1);
-        }
-        this.clearLine(this.cursorRow, 0, this.cursorCol);
-      }
-      makeLines(rows, cols) {
-        return Array.from({ length: rows }, () => Array.from({ length: cols }, () => " "));
+        const buffer = this.terminal.buffer.active;
+        const start = Math.max(0, buffer.viewportY || 0);
+        const end = Math.max(start, Math.min(buffer.length || 0, start + this.rows));
+        const lines = [];
+        for (let i = start; i < end; i++) {
+          const line = buffer.getLine(i);
+          lines.push(line ? line.translateToString(true) : "");
+        }
+        let first = 0;
+        let last = lines.length;
+        while (first < last && !lines[first]?.trim()) first++;
+        while (last > first && !lines[last - 1]?.trim()) last--;
+        return lines.slice(first, last).join("\n");
+      }
+      createTerminal() {
+        const Terminal = loadTerminalCtor();
+        return new Terminal({
+          cols: this.cols,
+          rows: this.rows,
+          scrollback: 2e3
+        });
       }
     };
   }
@@ -965,6 +792,8 @@ var init_provider_cli_adapter = __esm({
         };
         const rawKeys = provider.approvalKeys;
         this.approvalKeys = rawKeys && typeof rawKeys === "object" ? rawKeys : {};
+        this.sendDelayMs = typeof provider.sendDelayMs === "number" ? Math.max(0, provider.sendDelayMs) : 0;
+        this.sendKey = typeof provider.sendKey === "string" && provider.sendKey.length > 0 ? provider.sendKey : "\r";
         this.cliScripts = provider.scripts || {};
         const scriptNames = Object.keys(this.cliScripts).filter((k) => typeof this.cliScripts[k] === "function");
         if (scriptNames.length > 0) {
@@ -1007,6 +836,7 @@ var init_provider_cli_adapter = __esm({
       // Output settle debounce — fires after PTY output goes quiet
       settleTimer = null;
       settledBuffer = "";
+      submitPendingUntil = 0;
       // Resize redraw suppression
       resizeSuppressUntil = 0;
       // Debug: status transition history
@@ -1033,6 +863,8 @@ var init_provider_cli_adapter = __esm({
       timeouts;
       // Provider approval key mapping
       approvalKeys;
+      sendDelayMs;
+      sendKey;
       /** Inject CLI scripts after construction (e.g. when resolved by ProviderLoader) */
       setCliScripts(scripts) {
         this.cliScripts = scripts;
@@ -1135,6 +967,9 @@ var init_provider_cli_adapter = __esm({
       // ─── Output Handling ────────────────────────────
       handleOutput(rawData) {
         if (Date.now() < this.resizeSuppressUntil) return;
+        if (rawData.includes("\x1B[6n") || rawData.includes("\x1B[?6n")) {
+          this.ptyProcess?.write("\x1B[1;1R");
+        }
         this.terminalScreen.write(rawData);
         const cleanData = stripAnsi(rawData);
         if (this.isWaitingForResponse && cleanData) {
@@ -1179,11 +1014,15 @@ var init_provider_cli_adapter = __esm({
       }
       scheduleSettle() {
         if (this.settleTimer) clearTimeout(this.settleTimer);
+        const delay = Math.max(
+          this.timeouts.outputSettle,
+          this.submitPendingUntil > Date.now() ? this.submitPendingUntil - Date.now() + this.timeouts.outputSettle : 0
+        );
         this.settleTimer = setTimeout(() => {
           this.settleTimer = null;
           this.settledBuffer = this.recentOutputBuffer;
           this.evaluateSettled();
-        }, this.timeouts.outputSettle);
+        }, delay);
       }
       evaluateSettled() {
         const tail = this.settledBuffer;
@@ -1273,7 +1112,11 @@ var init_provider_cli_adapter = __esm({
       runDetectStatus(text) {
         if (!this.cliScripts?.detectStatus) return null;
         try {
-          return this.cliScripts.detectStatus({ tail: text.slice(-500) });
+          return this.cliScripts.detectStatus({
+            tail: text.slice(-500),
+            screenText: this.terminalScreen.getText(),
+            rawBuffer: this.accumulatedRawBuffer
+          });
         } catch (e) {
           LOG.warn("CLI", `[${this.cliType}] detectStatus error: ${e.message}`);
           return null;
@@ -1383,10 +1226,21 @@ ${data.message || ""}`.trim();
         this.responseBuffer = "";
         this.setStatus("generating", "sendMessage");
         this.onStatusChange?.();
-        this.ptyProcess.write(text + "\r");
-        this.responseTimeout = setTimeout(() => {
-          if (this.isWaitingForResponse) this.finishResponse();
-        }, this.timeouts.maxResponse);
+        this.ptyProcess.write(text);
+        const submit = () => {
+          if (!this.ptyProcess) return;
+          this.submitPendingUntil = 0;
+          this.ptyProcess.write(this.sendKey);
+          this.responseTimeout = setTimeout(() => {
+            if (this.isWaitingForResponse) this.finishResponse();
+          }, this.timeouts.maxResponse);
+        };
+        if (this.sendDelayMs > 0) {
+          this.submitPendingUntil = Date.now() + this.sendDelayMs;
+          setTimeout(submit, this.sendDelayMs);
+        } else {
+          submit();
+        }
       }
       getPartialResponse() {
         if (!this.isWaitingForResponse) return "";
@@ -1469,10 +1323,14 @@ ${data.message || ""}`.trim();
           messages: this.messages.slice(-20),
           structuredMessages: this.structuredMessages.slice(-20),
           messageCount: this.messages.length,
+          screenText: this.terminalScreen.getText().slice(-4e3),
           startupBuffer: this.startupBuffer.slice(-4e3),
           recentOutputBuffer: this.recentOutputBuffer.slice(-500),
           settledBuffer: this.settledBuffer.slice(-500),
           accumulatedBufferLength: this.accumulatedBuffer.length,
+          accumulatedRawBufferLength: this.accumulatedRawBuffer.length,
+          rawBufferPreview: this.accumulatedRawBuffer.slice(-1e3),
+          responseBuffer: this.responseBuffer.slice(-1e3),
           isWaitingForResponse: this.isWaitingForResponse,
           activeModal: this.activeModal,
           lastApprovalResolvedAt: this.lastApprovalResolvedAt,
@@ -8137,7 +7995,8 @@ var CliProviderInstance = class {
       return { ...m, content };
     });
     const partial = this.adapter.getPartialResponse();
-    if (adapterStatus.status === "generating" && partial) {
+    const shouldAppendRawPartial = !parsedStatus;
+    if (shouldAppendRawPartial && adapterStatus.status === "generating" && partial) {
       const cleaned = partial.trim();
       if (cleaned && cleaned !== "(generating...)") {
         recentMessages.push({
@@ -13236,7 +13095,7 @@ var DevServer = class _DevServer {
     lines.push("| Function | Input | Return |");
     lines.push("|---|---|---|");
     lines.push("| `parseOutput` | `{ buffer, rawBuffer, recentBuffer, screenText, messages, partialResponse }` | `{ id, status, title, messages, activeModal }` |");
-    lines.push("| `detectStatus` | `{ tail }` | `idle`, `generating`, `waiting_approval`, or `error` |");
+    lines.push("| `detectStatus` | `{ tail, screenText, rawBuffer }` | `idle`, `generating`, `waiting_approval`, or `error` |");
     lines.push("| `parseApproval` | `{ buffer, rawBuffer, tail }` | `{ message, buttons }` or `null` |");
     lines.push("");
     lines.push("## Rules");
@@ -13249,6 +13108,7 @@ var DevServer = class _DevServer {
     lines.push("7. Use `rawBuffer` only when ANSI/control-sequence artifacts matter. Do not depend on raw escape noise unless necessary.");
     lines.push("8. Keep exports compatible with the existing `scripts.js` router (`module.exports = function ...`).");
     lines.push("9. Do not rewrite unrelated provider config. Only touch the scripts needed for this task unless a tiny supporting change is required.");
+    lines.push("10. When the verification API returns `instanceId`, keep using that exact instance for follow-up `send`, `resolve`, `raw`, and `stop` calls. Do not assume type-only routing is safe if multiple sessions exist.");
     lines.push("");
     lines.push("## Task");
     lines.push(`Edit files in \`${providerDir}\` to implement: **${functions.join(", ")}**`);
@@ -13269,25 +13129,38 @@ var DevServer = class _DevServer {
     lines.push(`curl -sS http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/status`);
     lines.push("```");
     lines.push("");
-    lines.push("### 3. Send a rich test prompt");
+    lines.push("Extract the current `instanceId` from the launch or status response and keep using it below.");
+    lines.push("");
+    lines.push("### 3. Send a realistic approval-triggering prompt");
     lines.push("```bash");
     lines.push(`curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/send \\`);
     lines.push('  -H "Content-Type: application/json" \\');
-    lines.push(`  -d '{"type":"${type}","text":"Write a short python snippet, include a markdown table, and briefly explain what you did."}'`);
+    lines.push(`  -d '{"type":"${type}","instanceId":"<INSTANCE_ID>","text":"Create a file at tmp/adhdev_provider_fix_test.py that prints the current working directory and the squares of 1 through 5, then run python3 tmp/adhdev_provider_fix_test.py and tell me the exact output."}'`);
     lines.push("```");
     lines.push("");
-    lines.push("### 4. If approval appears, resolve it");
+    lines.push("### 4. If approval appears, resolve it until the CLI reaches idle");
     lines.push("```bash");
     lines.push(`curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/resolve \\`);
     lines.push('  -H "Content-Type: application/json" \\');
-    lines.push(`  -d '{"type":"${type}","buttonIndex":0}'`);
+    lines.push(`  -d '{"type":"${type}","instanceId":"<INSTANCE_ID>","buttonIndex":0}'`);
+    lines.push(`curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/raw \\`);
+    lines.push('  -H "Content-Type: application/json" \\');
+    lines.push(`  -d '{"type":"${type}","instanceId":"<INSTANCE_ID>","keys":"1"}'`);
+    lines.push("```");
+    lines.push("");
+    lines.push("Use `resolve` when the parsed modal buttons are correct. Use `raw` when the CLI expects a literal keystroke like `1`, `y`, or Enter. Repeat until idle.");
+    lines.push("");
+    lines.push("### 5. Verify the side effects outside the CLI");
+    lines.push("```bash");
+    lines.push("test -f tmp/adhdev_provider_fix_test.py");
+    lines.push("python3 tmp/adhdev_provider_fix_test.py");
     lines.push("```");
     lines.push("");
-    lines.push("### 5. Stop the CLI when finished");
+    lines.push("### 6. Stop the CLI when finished");
     lines.push("```bash");
     lines.push(`curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/stop \\`);
     lines.push('  -H "Content-Type: application/json" \\');
-    lines.push(`  -d '{"type":"${type}"}'`);
+    lines.push(`  -d '{"type":"${type}","instanceId":"<INSTANCE_ID>"}'`);
     lines.push("```");
     lines.push("");
     lines.push("## Required Validation");
@@ -13295,7 +13168,9 @@ var DevServer = class _DevServer {
     lines.push("2. Confirm `parseOutput` produces a stable transcript without duplicating past turns when the PTY redraws.");
     lines.push("3. Confirm the latest assistant message streams through `partialResponse` while generation is in progress.");
     lines.push("4. Confirm approval parsing returns meaningful button labels when the CLI requests permission.");
-    lines.push("5. Re-run the debug endpoints after edits. Do NOT finish until the parsed result looks correct.");
+    lines.push("5. Confirm the Python file was actually created and executed, not just described in chat text.");
+    lines.push("6. Confirm the final assistant transcript includes the exact Python output, including the working directory line and the five square numbers.");
+    lines.push("7. Re-run the debug endpoints after edits. Do NOT finish until the parsed result looks correct.");
     lines.push("");
     if (userComment) {
       lines.push("## \u26A0\uFE0F User Instructions (HIGH PRIORITY)");
@@ -13417,6 +13292,14 @@ data: ${JSON.stringify(msg.data)}
     }));
     this.json(res, 200, { instances: result, count: result.length });
   }
+  findCliTarget(type, instanceId) {
+    if (!this.instanceManager) return null;
+    const cliStates = this.instanceManager.collectAllStates().filter((s) => s.category === "cli" || s.category === "acp");
+    if (instanceId) return cliStates.find((s) => s.instanceId === instanceId) || null;
+    if (!type) return cliStates[cliStates.length - 1] || null;
+    const matches = cliStates.filter((s) => s.type === type);
+    return matches[matches.length - 1] || null;
+  }
   /** POST /api/cli/launch — launch a CLI agent { type, workingDir?, args? } */
   async handleCliLaunch(req, res) {
     if (!this.cliManager) {
@@ -13448,10 +13331,7 @@ data: ${JSON.stringify(msg.data)}
       this.json(res, 400, { error: "text required" });
       return;
     }
-    const allStates = this.instanceManager.collectAllStates();
-    const target = allStates.find(
-      (s) => (s.category === "cli" || s.category === "acp") && (instanceId ? s.instanceId === instanceId : s.type === type)
-    );
+    const target = this.findCliTarget(type, instanceId);
     if (!target) {
       this.json(res, 404, { error: `No running instance found for: ${type || instanceId}` });
       return;
@@ -13471,10 +13351,7 @@ data: ${JSON.stringify(msg.data)}
     }
     const body = await this.readBody(req);
     const { type, instanceId } = body;
-    const allStates = this.instanceManager.collectAllStates();
-    const target = allStates.find(
-      (s) => (s.category === "cli" || s.category === "acp") && (instanceId ? s.instanceId === instanceId : s.type === type)
-    );
+    const target = this.findCliTarget(type, instanceId);
     if (!target) {
       this.json(res, 404, { error: `No running instance found for: ${type || instanceId}` });
       return;
@@ -13529,11 +13406,9 @@ data: ${JSON.stringify(msg.data)}
       this.json(res, 503, { error: "InstanceManager not available" });
       return;
     }
-    const allStates = this.instanceManager.collectAllStates();
-    const target = allStates.find(
-      (s) => (s.category === "cli" || s.category === "acp") && s.type === type
-    );
+    const target = this.findCliTarget(type);
     if (!target) {
+      const allStates = this.instanceManager.collectAllStates();
       this.json(res, 404, { error: `No running instance for: ${type}`, available: allStates.filter((s) => s.category === "cli" || s.category === "acp").map((s) => s.type) });
       return;
     }
@@ -13580,21 +13455,25 @@ data: ${JSON.stringify(msg.data)}
       this.json(res, 503, { error: "CliManager not available" });
       return;
     }
-    let adapter = null;
-    for (const [, a] of this.cliManager.adapters) {
-      if (type && a.cliType === type) {
-        adapter = a;
-        break;
-      }
+    if (!this.instanceManager) {
+      this.json(res, 503, { error: "InstanceManager not available" });
+      return;
     }
-    if (!adapter) {
+    const target = this.findCliTarget(type, instanceId);
+    if (!target) {
       this.json(res, 404, { error: `No running adapter for: ${type || instanceId}` });
       return;
     }
+    const instance = this.instanceManager.getInstance(target.instanceId);
+    const adapter = instance?.getAdapter?.() || instance?.adapter;
+    if (!adapter) {
+      this.json(res, 404, { error: `Adapter not found for instance: ${target.instanceId}` });
+      return;
+    }
     try {
       if (typeof adapter.resolveModal === "function") {
         adapter.resolveModal(buttonIndex);
-        this.json(res, 200, { resolved: true, type, buttonIndex });
+        this.json(res, 200, { resolved: true, type: target.type, instanceId: target.instanceId, buttonIndex });
       } else {
         this.json(res, 400, { error: "resolveModal not available on this adapter" });
       }
@@ -13614,21 +13493,25 @@ data: ${JSON.stringify(msg.data)}
       this.json(res, 503, { error: "CliManager not available" });
       return;
     }
-    let adapter = null;
-    for (const [, a] of this.cliManager.adapters) {
-      if (type && a.cliType === type) {
-        adapter = a;
-        break;
-      }
+    if (!this.instanceManager) {
+      this.json(res, 503, { error: "InstanceManager not available" });
+      return;
     }
-    if (!adapter) {
+    const target = this.findCliTarget(type, instanceId);
+    if (!target) {
       this.json(res, 404, { error: `No running adapter for: ${type || instanceId}` });
       return;
     }
+    const instance = this.instanceManager.getInstance(target.instanceId);
+    const adapter = instance?.getAdapter?.() || instance?.adapter;
+    if (!adapter) {
+      this.json(res, 404, { error: `Adapter not found for instance: ${target.instanceId}` });
+      return;
+    }
     try {
       if (typeof adapter.writeRaw === "function") {
         adapter.writeRaw(keys);
-        this.json(res, 200, { sent: true, type, keysLength: keys.length });
+        this.json(res, 200, { sent: true, type: target.type, instanceId: target.instanceId, keysLength: keys.length });
       } else {
         this.json(res, 400, { error: "writeRaw not available on this adapter" });
       }