@dmsdc-ai/aigentry-telepty 0.1.23 → 0.1.25

package/cli.js

@@ -725,23 +725,26 @@ async function main() {
     let lastInjectTextTime = 0;
     const MAX_RECONNECT_DELAY = 30000;
 
-    function connectDaemonWs() {
+    async function connectDaemonWs() {
+      // Re-register session BEFORE WebSocket connect (daemon rejects WS if session unknown)
+      if (reconnectAttempts > 0) {
+        try {
+          await fetchWithAuth(`${DAEMON_URL}/api/sessions/register`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ session_id: sessionId, command, cwd: process.cwd() })
+          });
+        } catch (e) {
+          // Registration may fail if session already exists or daemon not ready
+        }
+      }
+
       daemonWs = new WebSocket(wsUrl);
 
-      daemonWs.on('open', async () => {
+      daemonWs.on('open', () => {
         wsReady = true;
         if (reconnectAttempts > 0) {
           console.error(`\n\x1b[32m⚡ Reconnected to daemon. Inject restored.\x1b[0m`);
-          // Re-register session on reconnect
-          try {
-            await fetchWithAuth(`${DAEMON_URL}/api/sessions/register`, {
-              method: 'POST',
-              headers: { 'Content-Type': 'application/json' },
-              body: JSON.stringify({ session_id: sessionId, command, cwd: process.cwd() })
-            });
-          } catch (e) {
-            // Registration may fail if session already exists, that's fine
-          }
         }
         reconnectAttempts = 0;
       });
@@ -978,6 +981,11 @@ async function main() {
       args.splice(replyToIndex, 2);
     }
 
+    // Extract --reply-expected flag
+    const replyExpectedIndex = args.indexOf('--reply-expected');
+    const replyExpected = replyExpectedIndex !== -1;
+    if (replyExpected) args.splice(replyExpectedIndex, 1);
+
     const sessionId = args[1]; const prompt = args.slice(2).join(' ');
     if (!sessionId || !prompt) { console.error('❌ Usage: telepty inject [--no-enter] [--from <id>] [--reply-to <id>] <session_id> "<prompt text>"'); process.exit(1); }
     try {
@@ -990,6 +998,7 @@ async function main() {
       const body = { prompt, no_enter: noEnter };
       if (fromId) body.from = fromId;
       if (replyTo) body.reply_to = replyTo;
+      if (replyExpected) body.reply_expected = true;
 
       const res = await fetchWithAuth(`http://${target.host}:${PORT}/api/sessions/${encodeURIComponent(target.id)}/inject`, {
         method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body)
@@ -1015,8 +1024,7 @@ async function main() {
       if (!replyTo) { console.error(`❌ No pending reply-to found for session '${mySessionId}'`); process.exit(1); }
       const target = await resolveSessionTarget(replyTo);
       if (!target) { console.error(`❌ Session '${replyTo}' was not found on any discovered host.`); process.exit(1); }
-      const fullPrompt = `[from: ${mySessionId}] [reply-to: ${mySessionId}] ${replyText}`;
-      const body = { prompt: fullPrompt, from: mySessionId, reply_to: mySessionId };
+      const body = { prompt: replyText, from: mySessionId, reply_to: mySessionId };
       const res = await fetchWithAuth(`http://${target.host}:${PORT}/api/sessions/${encodeURIComponent(target.id)}/inject`, {
         method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body)
       });

package/daemon.js

@@ -530,10 +530,20 @@ app.post('/api/sessions/:id/inject', (req, res) => {
   if (!resolvedId) return res.status(404).json({ error: 'Session not found', requested: requestedId });
   const session = sessions[resolvedId];
   const id = resolvedId;
-  const { prompt, no_enter, auto_submit, from, reply_to } = req.body;
+  const { prompt, no_enter, auto_submit, thread_id, reply_expected } = req.body;
+  let { from, reply_to } = req.body;
   if (!prompt) return res.status(400).json({ error: 'prompt is required' });
+  // reply_to defaults to from when omitted
+  if (from && !reply_to) reply_to = from;
   if (from) session.lastInjectFrom = from;
   if (reply_to) session.lastInjectReplyTo = reply_to;
+  if (thread_id) session.lastThreadId = thread_id;
+
+  // Auto-prepend [from:] [reply-to:] header if from is set and not already in prompt
+  let finalPrompt = prompt;
+  if (from && !prompt.startsWith('[from:')) {
+    finalPrompt = `[from: ${from}] [reply-to: ${reply_to}] ${prompt}`;
+  }
   const inject_id = crypto.randomUUID();
   try {
     // Always inject text WITHOUT \r first, then send \r separately after delay
@@ -554,13 +564,13 @@ app.post('/api/sessions/:id/inject', (req, res) => {
     let submitResult = null;
     if (!no_enter && session.type === 'wrapped') {
       // Wrapped sessions: send text+\r in single message to bypass allow bridge prompt-ready gate
-      if (!writeToSession(prompt + '\r')) {
+      if (!writeToSession(finalPrompt + '\r')) {
         return res.status(503).json({ error: 'Wrap process is not connected' });
       }
       submitResult = { strategy: 'combined_cr' };
       console.log(`[INJECT+SUBMIT] Combined \\r for ${id}`);
     } else {
-      if (!writeToSession(prompt)) {
+      if (!writeToSession(finalPrompt)) {
         return res.status(503).json({ error: 'Wrap process is not connected' });
       }
       // Spawned sessions: send \r separately after delay (proven split_cr strategy)
@@ -583,6 +593,8 @@ app.post('/api/sessions/:id/inject', (req, res) => {
       content: prompt,
       from: from || null,
       reply_to: reply_to || null,
+      thread_id: thread_id || null,
+      reply_expected: !!reply_expected,
       timestamp: new Date().toISOString()
     });
     busClients.forEach(client => {

package/package.json

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