@dmsdc-ai/aigentry-telepty 0.1.39 → 0.1.41

package/cli.js

@@ -705,7 +705,9 @@ async function main() {
     let promptReady = true;  // assume ready initially for first inject
     const injectQueue = [];
 
+    let queueFlushTimer = null;
     function flushInjectQueue() {
+      if (queueFlushTimer) { clearTimeout(queueFlushTimer); queueFlushTimer = null; }
       if (injectQueue.length === 0) return;
       const batch = injectQueue.splice(0);
       let delay = 0;
@@ -715,6 +717,15 @@ async function main() {
       }
       promptReady = false;
     }
+    function scheduleQueueFlush() {
+      if (queueFlushTimer) return;
+      queueFlushTimer = setTimeout(() => {
+        queueFlushTimer = null;
+        if (injectQueue.length > 0) {
+          flushInjectQueue();
+        }
+      }, 3000);
+    }
 
     // Connect to daemon WebSocket with auto-reconnect
     const wsUrl = `ws://${REMOTE_HOST}:${PORT}/api/sessions/${encodeURIComponent(sessionId)}?token=${encodeURIComponent(TOKEN)}`;
@@ -767,6 +778,7 @@ async function main() {
               }
             } else {
               injectQueue.push(msg.data);
+              scheduleQueueFlush();
             }
           } else if (msg.type === 'resize') {
             child.resize(msg.cols, msg.rows);

package/daemon.js

@@ -193,7 +193,14 @@ app.post('/api/sessions/spawn', (req, res) => {
 app.post('/api/sessions/register', (req, res) => {
   const { session_id, command, cwd = process.cwd() } = req.body;
   if (!session_id) return res.status(400).json({ error: 'session_id is required' });
-  if (sessions[session_id]) return res.status(409).json({ error: `Session ID '${session_id}' is already active.` });
+  // Idempotent: allow re-registration (update command/cwd, keep clients)
+  if (sessions[session_id]) {
+    const existing = sessions[session_id];
+    if (command) existing.command = command;
+    if (cwd) existing.cwd = cwd;
+    console.log(`[REGISTER] Re-registered session ${session_id} (updated metadata)`);
+    return res.status(200).json({ session_id, type: 'wrapped', command: existing.command, cwd: existing.cwd, reregistered: true });
+  }
 
   const sessionRecord = {
     id: session_id,
@@ -632,43 +639,30 @@ app.post('/api/sessions/:id/inject', (req, res) => {
     }
 
     let submitResult = null;
-    if (session.type === 'wrapped' && !no_enter) {
-      // Hybrid: text via WS (allow bridge handles it), Enter via kitty send-key
-      if (!writeToSession(finalPrompt)) {
-        return res.status(503).json({ error: 'Wrap process is not connected' });
-      }
+    if (!writeToSession(finalPrompt)) {
+      return res.status(503).json({ error: 'Wrap process is not connected' });
+    }
+
+    if (!no_enter) {
+      // Universal split_cr: text first, \r after delay
+      // Allow bridge 0.1.40+ has 3s queue flush timeout, so \r always gets delivered
       setTimeout(() => {
-        // Try kitty send-key Return (reliable for all CLIs)
-        const windowId = findKittyWindowId(findKittySocket(), id);
-        if (windowId) {
-          try {
-            const { execSync } = require('child_process');
-            execSync(`kitty @ --to unix:${findKittySocket()} send-key --match id:${windowId} Return`, {
-              timeout: 3000, stdio: ['pipe', 'pipe', 'pipe']
-            });
-            console.log(`[INJECT+SUBMIT] WS text + kitty Return for ${id} (window ${windowId})`);
-            // Restore tab title after inject (Claude Code overwrites it)
-            try {
-              execSync(`kitty @ --to unix:${findKittySocket()} set-tab-title --match id:${windowId} '⚡ telepty :: ${id}'`, {
+        const ok = writeToSession('\r');
+        console.log(`[INJECT+SUBMIT] Split \\r for ${id}: ${ok ? 'success' : 'failed'}`);
+        // Restore kitty tab title (optional, no-op if not kitty)
+        try {
+          const sock = findKittySocket();
+          if (sock) {
+            if (!session.kittyWindowId) session.kittyWindowId = findKittyWindowId(sock, id);
+            if (session.kittyWindowId) {
+              require('child_process').execSync(`kitty @ --to unix:${sock} set-tab-title --match id:${session.kittyWindowId} '⚡ telepty :: ${id}'`, {
                 timeout: 2000, stdio: ['pipe', 'pipe', 'pipe']
               });
-            } catch {}
-          } catch {
-            writeToSession('\r');
-            console.log(`[INJECT+SUBMIT] WS text + WS \\r fallback for ${id}`);
+            }
           }
-        } else {
-          writeToSession('\r');
-          console.log(`[INJECT+SUBMIT] WS text + WS \\r (no kitty window) for ${id}`);
-        }
-      }, 500);
-      submitResult = { deferred: true, strategy: 'ws_text_kitty_return' };
-    } else if (session.type === 'wrapped') {
-      // no_enter=true for wrapped
-      if (!writeToSession(finalPrompt)) {
-        return res.status(503).json({ error: 'Wrap process is not connected' });
-      }
-      submitResult = { strategy: 'ws_no_enter' };
+        } catch {}
+      }, 300);
+      submitResult = { deferred: true, strategy: 'split_cr' };
     } else {
       if (!writeToSession(finalPrompt)) {
         return res.status(503).json({ error: 'Wrap process is not connected' });

package/package.json

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