@volter/supercode-terminal 0.2.53 → 0.2.55

package/index.d.ts

@@ -252,6 +252,7 @@ export type {
 export type { TerminalInputDelivery, TmuxCommand, TmuxWindowSize };
 
 /** The bounded live composer text, or null for an unrecognized screen. */
-export function composerText(kind: string, screen: string | undefined): string | null;
-/** False means unconfirmed and may leave a draft; never blindly resend. */
-export function deliverComposerInput(host: TmuxTerminalHost | PtyTerminalHost | PaneServerHost, sessionId: string, kind: string, text: string, options?: { deadlineMs?: number; signal?: AbortSignal }): Promise<{ delivered: boolean; reason?: string; delivery?: TerminalInputDelivery }>;
+export function composerText(kind: string, screen: string | undefined, options?: { allowBusy?: boolean }): string | null;
+export function restoreComposerInput(host: TmuxTerminalHost | PtyTerminalHost | PaneServerHost, sessionId: string, kind: string, text: string): Promise<{ restored: boolean; reason?: string; remaining?: string }>;
+/** Failed input is restored or returns an explicit cleanup obligation; never blindly resend. */
+export function deliverComposerInput(host: TmuxTerminalHost | PtyTerminalHost | PaneServerHost, sessionId: string, kind: string, text: string, options?: { deadlineMs?: number; signal?: AbortSignal }): Promise<{ delivered: boolean; reason?: string; restored?: boolean; cleanup_required?: boolean; cleanup_reason?: string; cleanup_remaining?: string; delivery?: TerminalInputDelivery }>;

package/index.mjs

@@ -1738,12 +1738,13 @@ export function composerHoldsDraft(kind, screen) {
 /** Read only a bounded, live Claude/Codex composer, never a prompt in scrollback.
  * Unknown layouts and collapsed pastes are deliberately unconfirmed.
  */
-export function composerText(kind, screen) {
+export function composerText(kind, screen, { allowBusy = false } = {}) {
   if (kind !== 'claude-code' && kind !== 'codex') return null;
   const lines = String(screen ?? '').split('\n').map(styledCells);
   const plain = lines.map((cells) => cells.map((cell) => cell.char).join(''));
+  if (!allowBusy && composerBusy(screen)) return null;
   const rule = /^\s*[─━]{4,}\s*$/u;
-  const footer = /^\s*(?:\? for shortcuts\b|⚠\s+\d+\s+warnings?\s+·\s+f2 to view\s*$|[^\n]+ · (?:~(?:[\\/]|(?=\s|$))|[\\/]|[A-Z]:[\\/])[^\n]*$|.*← for agents\s*$|.*\bcontext(?:\s+\d+%)?\s+left\b)/iu;
+  const footer = /^\s*(?:.*\btab to queue (?:a )?message\b.*$|\? for shortcuts\b|⚠\s+\d+\s+warnings?\s+·\s+f2 to view\s*$|[^\n]+ · (?:~(?:[\\/]|(?=\s|$))|[\\/]|[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;
@@ -1790,44 +1791,92 @@ function composerMatches(value, wanted) {
   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.
- */
-export async function deliverComposerInput(host, sessionId, kind, text, { deadlineMs = Date.now() + 10_000, signal } = {}) {
-  const read = async () => composerText(kind, await host.capture(sessionId, { preserveEscapes: true }));
-  const expired = () => signal?.aborted || Date.now() >= deadlineMs;
-  const failed = (reason) => ({ delivered: false, reason });
-  if (expired()) return failed('deadline');
-  const before = await read();
-  if (before !== '') return failed(before === null ? 'no-composer' : 'draft');
-  const wanted = String(text).trim();
-  if (!wanted || /[\x00-\x08\x0b-\x1f\x7f]/u.test(text)) return failed('unsupported-text');
-  if (expired()) return failed('deadline');
-  const delivery = await host.sendInput(sessionId, `${text}\n`, { submitMode: 'none', deadlineMs });
-  // A dropped paste must never be followed by Enter. Give the editor time to render it.
-  let pasted = false;
-  for (let attempt = 0; attempt < 10 && !expired(); attempt += 1) {
+/** Busy evidence must come from the live UI bottom, not a fleet label or a
+ * quoted phrase in the transcript. */
+function composerBusyEvidence(screen) {
+  const bottom=String(screen??'').split('\n').map(line=>styledCells(line).map(cell=>cell.char).join('')).filter(line=>line.trim()).slice(-8);
+  for (const row of bottom) {
+    const match=/\b(?:esc to (?:interrupt|cancel)|tab to queue (?:a )?message)\b/iu.exec(row);
+    if (match) return { indicator: match[0], row: row.trim().slice(0, 240) };
+  }
+  return null;
+}
+function composerBusy(screen) { return composerBusyEvidence(screen) !== null; }
+
+/** Undo only text this input wrote, including when a turn started meanwhile.
+ * Never Enter, Escape, or Ctrl-C: restoration must not submit or stop work. */
+export async function restoreComposerInput(host, sessionId, kind, text) {
+  const read=async()=>composerText(kind,await host.capture(sessionId,{preserveEscapes:true}),{allowBusy:true});
+  let remaining=await read();
+  if(remaining==='')return {restored:true};
+  if(!composerMatches(remaining,String(text).trim()))return {restored:false,reason:'composer-changed-or-unreadable'};
+  const lines=remaining.split('\n').length+2;
+  for(let line=0;line<lines;line++) {
+    if(await read()!==remaining)return {restored:false,reason:'composer-changed',remaining};
+    await host.sendInput(sessionId,'\u0005\u0015',{submitMode:'none'});
     await sleep(100);
-    const current = await read();
-    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 (!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 });
-    for (let poll = 0; poll < 10 && !expired(); poll += 1) {
+    let after=await read();
+    if(after==='')return {restored:true};
+    if(after===null||!remaining.includes(after))return {restored:false,reason:'composer-changed',remaining};
+    remaining=after;
+    if(await read()!==remaining)return {restored:false,reason:'composer-changed',remaining};
+    await host.sendInput(sessionId,'\u007f',{submitMode:'none'});
+    await sleep(100);after=await read();
+    if(after==='')return {restored:true};
+    if(after===null||!remaining.replace(/\n/g,'').includes(after.replace(/\n/g,'')))return {restored:false,reason:'composer-changed',remaining};
+    remaining=after;
+  }
+  return {restored:false,reason:'restore-unconfirmed',remaining};
+}
+
+/** Paste only into a stable idle composer. A failed paste is restored; an
+ * unreadable/concurrently changed composer returns an explicit repair obligation. */
+export async function deliverComposerInput(host, sessionId, kind, text, { deadlineMs = Date.now() + 10_000, signal } = {}) {
+  const capture=()=>host.capture(sessionId,{preserveEscapes:true});
+  const read=async()=>composerText(kind,await capture(),{allowBusy:true});
+  const expired=()=>signal?.aborted||Date.now()>=deadlineMs;
+  let touched=false;
+  const failed=async (reason, evidence={})=>{
+    if(!touched)return {delivered:false,reason,...evidence};
+    let restored;
+    try{restored=await restoreComposerInput(host,sessionId,kind,text);}catch(error){restored={restored:false,reason:error.message};}
+    return {delivered:false,reason,...evidence,restored:restored.restored,cleanup_required:!restored.restored,cleanup_reason:restored.reason,cleanup_remaining:restored.remaining};
+  };
+  if(expired())return failed('deadline');
+  const wanted=String(text).trim();
+  if(!wanted||/[\x00-\x08\x0b-\x1f\x7f]/u.test(text))return failed('unsupported-text');
+  for(let check=0;check<2;check++) {
+    const screen=await capture(),before=composerText(kind,screen);
+    if(composerBusy(screen))return failed('busy-composer',{phase:'before-paste',busy:composerBusyEvidence(screen)});
+    if(before!=='')return failed(before===null?'no-composer':'draft');
+    if(check===0)await sleep(200);
+  }
+  if(expired())return failed('deadline');
+  try {
+    touched=true;
+    const delivery=await host.sendInput(sessionId,`${text}\n`,{submitMode:'none',deadlineMs});
+    let pasted=false;
+    for(let attempt=0;attempt<10&&!expired();attempt++) {
       await sleep(100);
-      const current = await read();
-      if (current === '') return { delivered: true, delivery };
-      if (!composerMatches(current, wanted)) return failed('submission-unconfirmed');
+      if(composerMatches(await read(),wanted)){pasted=true;break;}
     }
-  }
-  return failed('submit-unconfirmed');
+    if(!pasted)return failed('paste-unconfirmed');
+    for(let attempt=0;attempt<3;attempt++) {
+      if(expired())return failed('deadline');
+      const screen=await capture();
+      if(composerBusy(screen))return failed('busy-composer',{phase:'before-submit',busy:composerBusyEvidence(screen)});
+      if(!composerMatches(composerText(kind,screen),wanted))return failed('composer-changed');
+      if(expired())return failed('deadline');
+      await host.sendInput(sessionId,'\r',{submitMode:'single',deadlineMs});
+      for(let poll=0;poll<10&&!expired();poll++) {
+        await sleep(100);
+        const current=await read();
+        if(current==='')return {delivered:true,delivery};
+        if(!composerMatches(current,wanted))return failed('submission-unconfirmed');
+      }
+    }
+    return failed('submit-unconfirmed');
+  }catch(error){return failed(error?.message??String(error));}
 }
 
 /** The carets each kind draws at the start of its composer line (Claude on Windows draws `>`). */

package/package.json

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