@volter/supercode-terminal 0.2.46 → 0.2.48

package/index.mjs

@@ -1545,9 +1545,12 @@ export class SupercodeTerminalController {
     const abort = new AbortController();
     const task = (async () => {
       const deadline = Date.now() + 5 * 60_000;
+      let readySince = null;
       while (!abort.signal.aborted && Date.now() < deadline) {
         const content = await this.#host.capture(sessionId, { preserveEscapes: true });
-        if (composerReadyForInput(harness, content) === true) {
+        const ready = composerReadyForInput(harness, content) === true;
+        readySince = ready ? (readySince ?? Date.now()) : null;
+        if (ready && Date.now() - readySince >= 1_000) {
           if (harness !== 'claude-code' && harness !== 'codex') {
             await this.#host.sendInput(sessionId, input, { submitMode: 'single', deadlineMs: Date.now() + 10_000 });
             return;
@@ -1736,14 +1739,18 @@ export function composerText(kind, screen) {
   const lines = String(screen ?? '').split('\n').map(styledCells);
   const plain = lines.map((cells) => cells.map((cell) => cell.char).join(''));
   const rule = /^\s*[─━]{4,}\s*$/u;
+  const footer = /^\s*(?:\? for shortcuts\b|[^\n]+ · (?:~[\\/]|[\\/]|[A-Z]:[\\/])[^\n]+$|.*← for agents\s*$|.*\bcontext(?:\s+\d+%)?\s+left\b)/iu;
   const caret = kind === 'codex' ? /^\s*›(?:\s|$)/u : /^\s*[❯>](?:\s|$)/u;
   for (let row = plain.length - 1; row >= 0; row -= 1) {
     if (!caret.test(plain[row])) continue;
     let end = row + 1;
-    while (end < plain.length && !rule.test(plain[end]) &&
-      !/^\s*(?:\? for shortcuts|.*\bcontext left\b)/u.test(plain[end])) end += 1;
+    while (end < plain.length && !(kind === 'codex' ? footer.test(plain[end]) : rule.test(plain[end]))) end += 1;
     // Claude encloses the editor in rules; Codex ends it at its shortcut/context footer.
     if (end === plain.length) return null;
+    // Startup can draw a caret before loading finishes or a modal opens. A rule
+    // alone is not Codex's ready editor; require its footer at the live bottom.
+    if (kind === 'codex' && (plain.slice(end + 1).some((line) => line.trim()) ||
+      plain.some((line) => /\bmodel:\s+loading\b/iu.test(line)))) return null;
     if (kind === 'claude-code' && (row === 0 || !rule.test(plain[row - 1]))) return null;
     const first = plain[row].match(caret)[0].length;
     const value = lines.slice(row, end).map((cells, index) => cells
@@ -1754,6 +1761,30 @@ export function composerText(kind, screen) {
   return null;
 }
 
+/** Match screen rows against the original text. A visual row boundary can be
+ * a hard newline, a word wrap (one space), or a wrap inside a word. Never erase
+ * whitespace within rows: a changed or partially pasted draft stays unconfirmed.
+ */
+function composerMatches(value, wanted) {
+  if (value === null) return false;
+  let offsets = new Set([0]);
+  const rows = value.split('\n');
+  for (let row = 0; row < rows.length; row += 1) {
+    const next = new Set();
+    for (const offset of offsets) {
+      if (!wanted.startsWith(rows[row], offset)) continue;
+      const end = offset + rows[row].length;
+      if (row === rows.length - 1) next.add(end);
+      else {
+        next.add(end);
+        if (wanted[end] === ' ' || wanted[end] === '\n') next.add(end + 1);
+      }
+    }
+    offsets = next;
+  }
+  return offsets.has(wanted.length);
+}
+
 /** Paste once, then submit only text read back from the live composer.
  * False means unconfirmed, and can leave a draft: callers must not blindly resend.
  */
@@ -1773,14 +1804,14 @@ export async function deliverComposerInput(host, sessionId, kind, text, { deadli
   for (let attempt = 0; attempt < 10 && !expired(); attempt += 1) {
     await sleep(100);
     const current = await read();
-    if (current === wanted) { pasted = true; break; }
+    if (composerMatches(current, wanted)) { pasted = true; break; }
     if (current !== '') return failed('paste-unconfirmed');
   }
   if (!pasted) return failed('paste-unconfirmed');
   for (let attempt = 0; attempt < 3; attempt += 1) {
     // Re-read immediately before each Enter, including the first one.
     if (expired()) return failed('deadline');
-    if (await read() !== wanted) return failed('composer-changed');
+    if (!composerMatches(await read(), wanted)) return failed('composer-changed');
     if (expired()) return failed('deadline');
     // A keystream Enter has no hidden delay or retry between the read and the write.
     await host.sendInput(sessionId, '\r', { submitMode: 'single', deadlineMs });
@@ -1788,7 +1819,7 @@ export async function deliverComposerInput(host, sessionId, kind, text, { deadli
       await sleep(100);
       const current = await read();
       if (current === '') return { delivered: true, delivery };
-      if (current !== wanted) return failed('submission-unconfirmed');
+      if (!composerMatches(current, wanted)) return failed('submission-unconfirmed');
     }
   }
   return failed('submit-unconfirmed');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-terminal",
-  "version": "0.2.46",
+  "version": "0.2.48",
   "type": "module",
   "description": "Optional leak-safe terminal and tmux host adapter for Volter Harness frontends",
   "exports": {