@dmsdc-ai/aigentry-telepty 0.1.74 → 0.1.76

package/daemon.js

@@ -342,13 +342,17 @@ app.post('/api/sessions/register', (req, res) => {
     if (backend) existing.backend = backend;
     if (cmux_workspace_id) existing.cmuxWorkspaceId = cmux_workspace_id;
     if (cmux_surface_id) existing.cmuxSurfaceId = cmux_surface_id;
-    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 });
+    if (req.body.delivery_type) existing.type = req.body.delivery_type;
+    if (req.body.delivery_endpoint) existing.deliveryEndpoint = req.body.delivery_endpoint;
+    if (req.body.delivery_type === 'aterm') existing.ready = true;
+    console.log(`[REGISTER] Re-registered session ${session_id} (type: ${existing.type}, updated metadata)`);
+    return res.status(200).json({ session_id, type: existing.type, command: existing.command, cwd: existing.cwd, reregistered: true });
   }
 
+  const { delivery_type, delivery_endpoint } = req.body;
   const sessionRecord = {
     id: session_id,
-    type: 'wrapped',
+    type: delivery_type || 'wrapped',
     ptyProcess: null,
     ownerWs: null,
     command: command || 'wrapped',
@@ -356,12 +360,13 @@ app.post('/api/sessions/register', (req, res) => {
     backend: backend || 'kitty',
     cmuxWorkspaceId: cmux_workspace_id || null,
     cmuxSurfaceId: cmux_surface_id || null,
+    deliveryEndpoint: delivery_endpoint || null,
     createdAt: new Date().toISOString(),
     lastActivityAt: new Date().toISOString(),
     clients: new Set(),
     isClosing: false,
     outputRing: [],
-    ready: false,
+    ready: delivery_type === 'aterm',  // aterm sessions are always ready (aterm manages readiness)
       };
   // Check for existing session with same base alias and emit replaced event
   const baseAlias = session_id.replace(/-\d+$/, '');
@@ -421,7 +426,8 @@ app.get('/api/sessions', (req, res) => {
       lastActivityAt: session.lastActivityAt || null,
       idleSeconds,
       active_clients: session.clients.size,
-      ready: session.ready || false
+      ready: session.ready || false,
+      deliveryEndpoint: session.deliveryEndpoint || null
     };
   });
   if (idleGt !== null) {
@@ -884,7 +890,19 @@ app.post('/api/sessions/:id/inject', (req, res) => {
     // Always inject text WITHOUT \r first, then send \r separately after delay
     // This two-step approach works for ALL CLIs (claude, codex, gemini)
     function writeToSession(data) {
-      if (session.type === 'wrapped') {
+      if (session.type === 'aterm' && session.deliveryEndpoint) {
+        // Route to aterm PtyManager — fire-and-forget, aterm handles delivery
+        try {
+          const url = session.deliveryEndpoint;
+          fetch(url, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ text: data, session_id: id }),
+            signal: AbortSignal.timeout(5000)
+          }).catch(() => {});
+          return true;
+        } catch { return false; }
+      } else if (session.type === 'wrapped') {
         if (session.ownerWs && session.ownerWs.readyState === 1) {
           session.ownerWs.send(JSON.stringify({ type: 'inject', data }));
           return true;
@@ -897,7 +915,17 @@ app.post('/api/sessions/:id/inject', (req, res) => {
     }
 
     let submitResult = null;
-    if (session.type === 'wrapped') {
+    if (session.type === 'aterm' && session.deliveryEndpoint) {
+      // aterm sessions: deliver text + CR via aterm PtyManager endpoint
+      const wsOk = writeToSession(finalPrompt);
+      if (!wsOk) {
+        return res.status(503).json({ error: 'aterm endpoint not reachable' });
+      }
+      if (!no_enter) {
+        setTimeout(() => writeToSession('\r'), 300);
+        submitResult = { deferred: true, strategy: 'aterm_endpoint' };
+      }
+    } else if (session.type === 'wrapped') {
       // For wrapped sessions: try cmux send (daemon-level auto-detect),
       // then kitty send-text (bypasses allow bridge queue),
       // then WS as fallback, then submit via consistent path for CR.
@@ -938,26 +966,24 @@ app.post('/api/sessions/:id/inject', (req, res) => {
         }
       }
       if (!cmuxOk && !kittyOk) {
-        // WS path: allow-bridge has its own prompt-ready queue
-        const wsOk = writeToSession(finalPrompt);
+        // WS path: combine text + CR into single message.
+        // This guarantees CR delivery regardless of allow-bridge version —
+        // old allow-bridges with broken idle queue won't split text and CR.
+        const wsPayload = no_enter ? finalPrompt : finalPrompt + '\r';
+        const wsOk = writeToSession(wsPayload);
         if (!wsOk) {
           return res.status(503).json({ error: 'Process not connected' });
         }
         deliveryPath = 'ws';
-        if (!session.ready) {
-          console.log(`[INJECT] WS (not ready, allow-bridge will queue) for ${id}`);
-        } else {
-          console.log(`[INJECT] WS fallback for ${id}`);
-        }
+        console.log(`[INJECT] WS ${no_enter ? '(no-enter)' : '(text+CR combined)'} for ${id}`);
       }
 
-      if (!no_enter) {
+      if (!no_enter && deliveryPath !== 'ws') {
+        // CR only needed for cmux/kitty paths (WS already included CR in payload)
         setTimeout(() => {
           let submitted = false;
 
-          // Use the SAME path that delivered text for CR to guarantee ordering
           if (deliveryPath === 'cmux') {
-            // cmux: send-key return via same surface
             if (session.backend === 'cmux') {
               submitted = terminalBackend.cmuxSendEnter(id);
               if (submitted) console.log(`[INJECT] cmux submit for ${id}`);
@@ -967,7 +993,6 @@ app.post('/api/sessions/:id/inject', (req, res) => {
               if (submitted) console.log(`[INJECT] cmux session-level submit for ${id}`);
             }
           } else if (deliveryPath === 'kitty') {
-            // kitty: send-text CR via same window (not osascript!)
             if (wid && sock) {
               try {
                 require('child_process').execSync(`kitty @ --to unix:${sock} send-text --match id:${wid} $'\\r'`, {
@@ -980,32 +1005,10 @@ app.post('/api/sessions/:id/inject', (req, res) => {
               }
             }
           }
-          // deliveryPath === 'ws' or any fallback:
-          // Try terminal-level submit first (bypasses PTY ICRNL which converts CR→LF)
-          // This matters for cmux/kitty sessions where text went via WS but
-          // the application expects CR(13) not LF(10) from Enter.
-          if (!submitted && session.backend === 'cmux') {
-            submitted = terminalBackend.cmuxSendEnter(id);
-            if (submitted) console.log(`[INJECT] cmux submit (fallback) for ${id}`);
-          }
-          if (!submitted && session.backend === 'cmux' && session.cmuxWorkspaceId) {
-            submitted = submitViaCmux(id);
-            if (submitted) console.log(`[INJECT] cmux session-level submit (fallback) for ${id}`);
-          }
-          if (!submitted && wid && sock) {
-            try {
-              require('child_process').execSync(`kitty @ --to unix:${sock} send-text --match id:${wid} $'\\r'`, {
-                timeout: 3000, stdio: ['pipe', 'pipe', 'pipe']
-              });
-              submitted = true;
-              console.log(`[INJECT] kitty submit (fallback) for ${id}`);
-            } catch {
-              session.kittyWindowId = null;
-            }
-          }
+          // Final fallback for cmux/kitty paths
           if (!submitted) {
             writeToSession('\r');
-            console.log(`[INJECT] WS submit for ${id}`);
+            console.log(`[INJECT] WS submit fallback for ${id}`);
           }
 
           // Update tab title (kitty-specific, safe to fail)

package/package.json

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