@volter/supercode-terminal 0.2.63 → 0.2.65

package/index.d.ts

@@ -253,6 +253,6 @@ 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;
-export function restoreComposerInput(host: TmuxTerminalHost | PtyTerminalHost | PaneServerHost, sessionId: string, kind: string, text: string): Promise<{ restored: boolean; reason?: string; remaining?: string }>;
+export function restoreComposerInput(host: TmuxTerminalHost | PtyTerminalHost | PaneServerHost, sessionId: string, kind: string, text: string, options?: { pasted?: string | null }): 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

@@ -1723,9 +1723,15 @@ const COMPOSER_READY = Object.freeze({
  * and anchoring on column 0 instead would read a drawn-in prompt as absent.
  */
 function composerLine(screen, caret) {
-  return screen.split('\n').some((line) => caret.test(line.trim()));
+  // Read as text: a capture keeps its escapes (the daemon's readiness wait reads one), and Grok draws its composer
+  // line after a reset (`ESC[0m❯`), so a caret test on the raw line never matched and Grok never read as ready
+  // (yuerans, 2026-10-06: `open --new grok --input` dropped its brief; mail to an idle Grok waited for ever).
+  return screen.split('\n').some((line) => caret.test(line.replace(ANSI_SEQUENCE, '').trim()));
 }
 
+/** A terminal escape sequence: CSI (`ESC[…x`), OSC (`ESC]…BEL` or `ESC]…ESC\\`), or a two-character escape. */
+const ANSI_SEQUENCE = /\u001b\[[0-?]*[ -\/]*[@-~]|\u001b\][^\u0007\u001b]*(?:\u0007|\u001b\\)|\u001b[@-Z\\-_]/gu;
+
 /**
  * Is the program of this kind showing its idle composer — ready to be given a
  * first message — on this captured screen?
@@ -1844,22 +1850,26 @@ function composerMatches(value, wanted) {
 }
 
 /** Claude collapses a multi-line paste to `[Pasted text #N +K lines]`, and its composer then shows that placeholder,
- * never the text. It stands for `text` when K is the pasted text's line breaks (the trimmed text's, or the sent
- * payload's with its closing newline): a placeholder whose count differs is another paste. */
-function pastePlaceholderMatches(composer, text) {
-  const placeholder=/^\[Pasted text #\d+ \+(\d+) lines?\]$/u.exec(String(composer??'').trim());
-  if(!placeholder)return false;
+ * never the text. The placeholder (as shown) when it can stand for `text`: K is the pasted text's line breaks (the
+ * trimmed text's, or the sent payload's with its closing newline). Which paste it is, #N, only the paste itself
+ * tells: a caller holds the placeholder its own paste produced and accepts no other. */
+function pastePlaceholder(composer, text) {
+  const shown=String(composer??'').trim();
+  const placeholder=/^\[Pasted text #\d+ \+(\d+) lines?\]$/u.exec(shown);
+  if(!placeholder)return null;
   const breaks=value=>(value.match(/\n/gu)??[]).length;
-  return [breaks(String(text).trim()),breaks(`${text}\n`)].includes(Number(placeholder[1]));
+  return [breaks(String(text).trim()),breaks(`${text}\n`)].includes(Number(placeholder[1]))?shown: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) {
+ * Never Enter, Escape, or Ctrl-C: restoration must not submit or stop work.
+ * `pasted`: the `[Pasted text #N …]` placeholder this input's own paste produced. Only that one is cleared: another
+ * of the same size is a person's own paste. */
+export async function restoreComposerInput(host, sessionId, kind, text, { pasted = null } = {}) {
   const read=async()=>composerText(kind,await host.capture(sessionId,{preserveEscapes:true}));
   let remaining=await read();
   if(remaining==='')return {restored:true};
-  if(!composerMatches(remaining,String(text).trim())&&!pastePlaceholderMatches(remaining,text))return {restored:false,reason:'composer-changed-or-unreadable'};
+  if(!composerMatches(remaining,String(text).trim())&&!(pasted&&remaining.trim()===pasted))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};
@@ -1886,15 +1896,23 @@ export async function deliverComposerInput(host, sessionId, kind, text, { deadli
   const read=async()=>composerText(kind,await capture());
   const expired=()=>signal?.aborted||Date.now()>=deadlineMs;
   let touched=false;
+  // The placeholder this paste produced: the first one seen after pasting into a composer read empty twice. From then
+  // on only that one (its #N) is this text, and only that one is restored away.
+  let pasted=null;
   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};}
+    try{restored=await restoreComposerInput(host,sessionId,kind,text,{pasted});}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();
-  const holds=composer=>composerMatches(composer,wanted)||pastePlaceholderMatches(composer,text);
+  const holds=composer=>{
+    if(composerMatches(composer,wanted))return true;
+    const placeholder=pastePlaceholder(composer,text);
+    if(placeholder&&touched&&pasted===null)pasted=placeholder;
+    return placeholder!==null&&placeholder===pasted;
+  };
   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);

package/package.json

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