@dmsdc-ai/aigentry-telepty 0.1.94 → 0.1.96

package/daemon.js

@@ -561,11 +561,9 @@ async function deliverInjectionToSession(id, session, prompt, options = {}) {
     return { success: false, ...injectFailure };
   }
 
-  // Build the payload: text + CR for non-aterm sessions (aterm handles Enter internally)
-  const payload = (!options.noEnter && session.type !== 'aterm')
-    ? prompt + '\r'
-    : prompt;
-
+  // Mailbox payload is TEXT ONLY — CR is sent separately after a delay.
+  // Reason: combining text+CR in one write triggers bracketed paste mode in modern
+  // terminals. CLIs ignore \r inside paste brackets, so Enter never fires.
   const from = options.from || 'daemon';
   const msgId = `${from}:${Date.now()}:${crypto.randomUUID().slice(0, 8)}`;
 
@@ -574,7 +572,7 @@ async function deliverInjectionToSession(id, session, prompt, options = {}) {
       msg_id: msgId,
       from,
       to: id,
-      payload,
+      payload: prompt,
       created_at: Math.floor(now / 1000),
       attempt: 0,
     });
@@ -584,13 +582,25 @@ async function deliverInjectionToSession(id, session, prompt, options = {}) {
       mailboxNotifier.notify(id);
     }
 
-    // Deliver synchronously — ensures text is written before inject returns success.
-    // Mailbox gives us persistence/retry, but the initial delivery must complete
-    // before the HTTP response so --submit timing and CR delivery are reliable.
+    // Deliver text synchronously — ensures text is written before inject returns success.
     try {
       await mailboxDelivery.tick();
     } catch {}
 
+    // Send CR separately after delay (outside paste brackets)
+    if (!options.noEnter && session.type !== 'aterm') {
+      const submitDelay = session.type === 'wrapped' ? 500 : 300;
+      setTimeout(async () => {
+        const submitResult = await writeDataToSession(id, session, '\r');
+        if (!submitResult.success) {
+          emitInjectFailureEvent(id, submitResult.code, submitResult.error, {
+            phase: 'submit',
+            source: options.source || 'inject'
+          }, session);
+        }
+      }, submitDelay);
+    }
+
     session.lastActivityAt = new Date(now).toISOString();
     return {
       success: true,
@@ -598,7 +608,7 @@ async function deliverInjectionToSession(id, session, prompt, options = {}) {
       queued: ack.queued,
       pending: ack.pending,
       strategy: 'mailbox',
-      submit: options.noEnter ? 'skipped' : 'included'
+      submit: options.noEnter ? 'skipped' : 'deferred'
     };
   } catch (err) {
     console.error(`[MAILBOX] Enqueue failed for ${id}: ${err.message}`);
@@ -1567,15 +1577,24 @@ app.get('/api/sessions/:id/screen', (req, res) => {
   // Strip ANSI escape sequences for clean text
   function stripAnsi(str) {
     return str
-      .replace(/[[0-9;]*[a-zA-Z]/g, '')      // CSI sequences
-      .replace(/][^]*/g, '')          // OSC sequences (BEL terminated)
-      .replace(/][^]*\\/g, '')  // OSC sequences (ST terminated)
-      .replace(/[()][AB012]/g, '')              // Character set selection
-      .replace(/[>=<]/g, '')                    // Keypad mode
-      .replace(/[[?]?[0-9;]*[hlsurm]/g, '') // Mode set/reset
-      .replace(/[[0-9;]*[ABCDHJ]/g, '')       // Cursor movement
-      .replace(/[[0-9;]*[KG]/g, '')           // Line clearing
-      .replace(/\r/g, '');                         // Carriage returns
+      // Replace cursor-forward (ESC[NC, ESC[C) with N spaces to preserve whitespace
+      .replace(/\[(\d*)C/g, (_, n) => ' '.repeat(Number(n) || 1))
+      // CSI sequences: ESC [ ? (optional) params final_byte
+      .replace(/\[\??[0-9;]*[a-zA-Z@`]/g, '')
+      // OSC sequences: ESC ] ... BEL
+      .replace(/\][^]*/g, '')
+      // OSC sequences: ESC ] ... ST (ESC \)
+      .replace(/\][^]*\\/g, '')
+      // Character set selection: ESC ( / ) + charset
+      .replace(/[()][AB012]/g, '')
+      // Keypad and other 2-char ESC sequences
+      .replace(/[>=<78DMEHcNOZ~}|]/g, '')
+      // DCS / PM / APC sequences
+      .replace(/^_][^]*\\/g, '')
+      // Any remaining bare ESC + single char
+      .replace(/./g, '')
+      // Carriage returns
+      .replace(/\r/g, '');
   }
 
   const cleaned = raw ? fullOutput : stripAnsi(fullOutput);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dmsdc-ai/aigentry-telepty",
-  "version": "0.1.94",
+  "version": "0.1.96",
   "main": "daemon.js",
   "bin": {
     "aigentry-telepty": "install.js",