@dmsdc-ai/aigentry-telepty 0.5.1 → 0.5.3

package/CHANGELOG.md

@@ -4,6 +4,20 @@ All notable changes to `@dmsdc-ai/aigentry-telepty` are documented here.
 
 ## [Unreleased]
 
+## [0.5.2] - 2026-06-06
+
+### Fixed — submit handshake confirmation (#507-B / #508)
+
+- **`--submit` Enter sometimes did not register in a CLI's TUI** (the recurring
+  "Enter 안눌림" bug). `inject --submit` wrote the carriage return but did not
+  confirm the target actually consumed it, so under timing pressure the submit
+  could be dropped and the injected prompt left sitting unsubmitted. **Fix:** a
+  submit-gate handshake in `src/submit-gate.js` confirms the submit landed, with
+  `cli.js` / `daemon.js` wiring the gate into the inject path. Landed on `main`
+  at commit `2a21265`. This release ships that already-tested fix (npm 0.5.1
+  still served the pre-fix code; the running daemon must be restarted separately
+  to pick it up). (telepty#512)
+
 ## [0.5.1] - 2026-05-30
 
 ### Fixed — daemon never started (CRITICAL, regresses 0.5.0)

package/cli.js

@@ -17,6 +17,13 @@ const { getRuntimeInfo } = require('./runtime-info');
 const { formatHostLabel, groupSessionsByHost, pickSessionTarget } = require('./session-routing');
 const { buildSharedContextPrompt, createSharedContextDescriptor, ensureSharedContextFile } = require('./shared-context');
 const { runInteractiveSkillInstaller } = require('./skill-installer');
+const {
+  detectTerminalProgram,
+  formatSessionTerminal,
+  enrichSessionIdle,
+  formatSessionStatusWithIdle,
+  printSessionInfo
+} = require('./src/cli/session-view');
 const { resolveWindowsExecutable } = require('./src/win-resolve-executable');
 const { decideVersionAction } = require('./src/version-handshake');
 const crossMachine = require('./cross-machine');
@@ -176,62 +183,6 @@ async function getDaemonMeta(host = REMOTE_HOST) {
   }
 }
 
-function detectTerminalProgram(env = process.env) {
-  const rawTermProgram = typeof env.TERM_PROGRAM === 'string' ? env.TERM_PROGRAM.trim() : '';
-  if (rawTermProgram) {
-    return rawTermProgram;
-  }
-
-  if (env.TMUX) {
-    return 'tmux';
-  }
-
-  const term = typeof env.TERM === 'string' ? env.TERM.toLowerCase() : '';
-  if (term.includes('kitty')) return 'kitty';
-  if (term.includes('ghostty')) return 'ghostty';
-  if (term.includes('tmux')) return 'tmux';
-
-  return null;
-}
-
-function formatSessionTerminal(session) {
-  const terminal = session.terminal || session.termProgram || null;
-  const term = session.term || null;
-  if (terminal && term) {
-    return `${terminal} (${term})`;
-  }
-  return terminal || term || 'unknown';
-}
-
-function formatSessionHealth(session) {
-  const status = session.healthStatus || 'UNKNOWN';
-  const reason = session.healthReason || null;
-  if (reason && reason !== status) {
-    return `${status} (${reason})`;
-  }
-  return status;
-}
-
-function enrichSessionIdle(session, nowMs = Date.now()) {
-  const idleSeconds = typeof session.idleSeconds === 'number'
-    ? session.idleSeconds
-    : lifecycle.computeIdleSeconds(session.lastActivityAt, nowMs);
-  return {
-    ...session,
-    idleSeconds,
-    idle_seconds: idleSeconds
-  };
-}
-
-function formatSessionStatusWithIdle(session) {
-  const base = formatSessionHealth(session);
-  const idleSeconds = typeof session.idleSeconds === 'number' ? session.idleSeconds : null;
-  if (idleSeconds !== null && idleSeconds > 60) {
-    return `${base} 💤 idle (${lifecycle.formatIdleDuration(idleSeconds)})`;
-  }
-  return base;
-}
-
 function formatApiError(data, fallback = 'Request failed.') {
   if (!data) {
     return fallback;
@@ -352,39 +303,6 @@ function ensureRemoteSharedReference(peerName, descriptor, message = '') {
   };
 }
 
-function printSessionInfo(session, options = {}) {
-  const host = options.host || session.host || '127.0.0.1';
-  console.log('\x1b[1mSession Info:\x1b[0m');
-  console.log(`  - ID: \x1b[36m${session.id}\x1b[0m`);
-  console.log(`    Host: ${formatHostLabel(host)}`);
-  console.log(`    Command: ${session.command}`);
-  console.log(`    Type: ${session.type || 'unknown'}`);
-  console.log(`    Status: ${formatSessionHealth(session)}`);
-  console.log(`    Terminal: ${session.terminal || session.termProgram || 'unknown'}`);
-  console.log(`    TERM: ${session.term || 'n/a'}`);
-  console.log(`    CWD: ${session.cwd}`);
-  console.log(`    Clients: ${session.active_clients ?? 0}`);
-  if (session.createdAt) {
-    console.log(`    Started: ${new Date(session.createdAt).toLocaleString()}`);
-  }
-  if (session.lastActivityAt) {
-    console.log(`    Last Activity: ${new Date(session.lastActivityAt).toLocaleString()}`);
-  }
-  if (typeof session.idleSeconds === 'number') {
-    console.log(`    Idle: ${session.idleSeconds}s`);
-  }
-  if (session.semantic && session.semantic.phase) {
-    console.log(`    Phase: ${session.semantic.phase}`);
-  }
-  if (session.semantic && session.semantic.current_task) {
-    console.log(`    Current Task: ${session.semantic.current_task}`);
-  }
-  if (session.semantic && session.semantic.blocker) {
-    console.log(`    Blocker: ${session.semantic.blocker}`);
-  }
-  console.log('');
-}
-
 function resolveTeleptyEntryPoint() {
   // After npm upgrade, process.argv[1] still points to the OLD version's cli.js.
   // Resolve the current telepty binary from PATH, which npm updates on install.
@@ -1355,6 +1273,10 @@ async function main() {
     let wsReady = false;
     let reconnectAttempts = 0;
     let reconnectTimer = null;
+    // BUG-C: the daemon mints a per-owner token on each owner claim/reclaim and pushes it here.
+    // We echo it on the teardown DELETE so the daemon can tell our (current-owner) exit apart
+    // from a stale/displaced owner's exit and avoid the shared-fate teardown.
+    let currentOwnerToken = null;
     let lastInjectTextTime = 0;
     const MAX_RECONNECT_DELAY = 30000;
 
@@ -1400,6 +1322,10 @@ async function main() {
       daemonWs.on('message', (message) => {
         try {
           const msg = JSON.parse(message);
+          if (msg.type === 'owner_token') {
+            currentOwnerToken = msg.token || null;
+            return;
+          }
           if (msg.type === 'inject') {
             const chunks = [];
             const rawData = typeof msg.data === 'string' ? msg.data : String(msg.data ?? '');
@@ -1512,7 +1438,12 @@ async function main() {
       // Purge bridge mailbox on clean exit (undelivered messages are stale)
       try { bridgeMailbox.purge(bridgeTarget); } catch {}
       process.stdout.write(`\x1b]0;\x07`);
-      fetchWithAuth(`${DAEMON_URL}/api/sessions/${encodeURIComponent(sessionId)}`, { method: 'DELETE' }).catch(() => {});
+      // BUG-C: carry our owner token so the daemon destroys only on the CURRENT owner's exit;
+      // a stale/displaced owner's DELETE (mismatched token) must not tear down the live owner.
+      const deleteUrl = currentOwnerToken
+        ? `${DAEMON_URL}/api/sessions/${encodeURIComponent(sessionId)}?owner_token=${encodeURIComponent(currentOwnerToken)}`
+        : `${DAEMON_URL}/api/sessions/${encodeURIComponent(sessionId)}`;
+      fetchWithAuth(deleteUrl, { method: 'DELETE' }).catch(() => {});
       if (reconnectTimer) clearTimeout(reconnectTimer);
       try {
         daemonWs.close();
@@ -1954,43 +1885,26 @@ async function main() {
         }
         const submitBody = {
           injected_body: injectPrompt || '',
-          retries: 1,
+          retries: submitRetries,
           retry_delay_ms: 500,
           ...(submitForce ? { force: true } : {}),
         };
-        const RETRY_DELAY_MS = 300;
-        const RETRY_SAFE_REASONS = new Set([
-          'gated_dispatch_unconsumed',
-          'gate_timeout',
-          'no_prompt_symbol_seen',
-        ]);
-        const maxAttempts = 1 + submitRetries;
         let submitRes = null;
         let submitData = null;
         let attemptsMade = 0;
         let lastError = null;
-        for (let attempt = 0; attempt < maxAttempts; attempt++) {
-          if (attempt > 0) {
-            await new Promise((r) => setTimeout(r, RETRY_DELAY_MS));
-          }
-          attemptsMade = attempt + 1;
-          try {
-            submitRes = await fetchWithAuth(`${daemonUrl(target.host)}/api/sessions/${encodeURIComponent(target.id)}/submit`, {
-              method: 'POST',
-              headers: { 'Content-Type': 'application/json' },
-              body: JSON.stringify(submitBody),
-            });
-            submitData = await submitRes.json();
-          } catch (submitErr) {
-            lastError = submitErr;
-            submitRes = null;
-            submitData = null;
-            break;
-          }
-          if (submitRes.ok) break;
-          if (submitRes.status !== 504) break;
-          const retryReason = submitData && typeof submitData.reason === 'string' ? submitData.reason : null;
-          if (!RETRY_SAFE_REASONS.has(retryReason)) break;
+        try {
+          attemptsMade = 1;
+          submitRes = await fetchWithAuth(`${daemonUrl(target.host)}/api/sessions/${encodeURIComponent(target.id)}/submit`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify(submitBody),
+          });
+          submitData = await submitRes.json();
+        } catch (submitErr) {
+          lastError = submitErr;
+          submitRes = null;
+          submitData = null;
         }
         if (lastError) {
           console.error(`⚠️  Submit failed: ${lastError.message}`);
@@ -2002,16 +1916,16 @@ async function main() {
             ? ' (dispatched-after-gate-timeout)'
             : '';
           const attemptsNote = submitData.attempts > 1 ? ` (${submitData.attempts} attempts)` : '';
-          const retryNote = attemptsMade > 1 ? ` [retry ${attemptsMade - 1}/${submitRetries}]` : '';
           const forcedNote = submitData.forced ? ' [forced]' : '';
-          console.log(`✅ Submitted via ${submitData.strategy}${attemptsNote}${gateNote}${lateNote}${retryNote}${forcedNote}.`);
+          console.log(`✅ Submitted via ${submitData.strategy}${attemptsNote}${gateNote}${lateNote}${forcedNote}.`);
         } else if (submitRes && submitRes.status === 504) {
           // Soft failure: REPL never readied. Orchestrator scripts depend on
           // exit 0 here — surface a clear remediation hint but do not exit
           // non-zero.
           const reason = (submitData && submitData.reason) || 'gate_timeout';
           const lastState = (submitData && submitData.last_state) || 'unknown';
-          const retriesNote = attemptsMade > 1 ? ` after ${attemptsMade} attempts` : '';
+          const daemonAttempts = submitData && Number.isFinite(Number(submitData.attempts)) ? Number(submitData.attempts) : attemptsMade;
+          const retriesNote = daemonAttempts > 1 ? ` after ${daemonAttempts} attempts` : '';
           const hint = submitForce
             ? ''
             : ` Try \`telepty inject --submit --submit-force ${target.id} ...\` or manual \`telepty send-key ${target.id} enter\`.`;