@dmsdc-ai/aigentry-telepty 0.1.55 → 0.1.57

package/cli.js

@@ -667,9 +667,11 @@ async function main() {
       process.exit(1);
     }
 
-    // Default session ID = command name
+    // Default session ID = {folder}-{cli} (e.g. aigentry-dustcraw-claude)
     if (!sessionId) {
-      sessionId = path.basename(command);
+      const folder = path.basename(process.cwd());
+      const cli = path.basename(command).replace(/\..*$/, '');
+      sessionId = `${folder}-${cli}`;
     }
 
     await ensureDaemonRunning({ requiredCapabilities: ['wrapped-sessions'] });
@@ -1151,6 +1153,61 @@ async function main() {
     return;
   }
 
+  if (cmd === 'session' && args[1] === 'start') {
+    // Generate kitty session file and launch
+    const configArg = args.find(a => a.startsWith('--config='));
+    const configPath = configArg ? configArg.split('=').slice(1).join('=') : null;
+    const cliArg = args.find(a => a.startsWith('--cli='));
+    const cli = cliArg ? cliArg.split('=')[1] : 'claude --dangerously-skip-permissions';
+    const projectsDir = args.find(a => a.startsWith('--dir=')) ? args.find(a => a.startsWith('--dir=')).split('=')[1] : process.cwd();
+
+    // Discover project folders (subdirectories with .git)
+    let projects;
+    if (configPath) {
+      projects = JSON.parse(fs.readFileSync(configPath, 'utf8')).projects;
+    } else {
+      projects = fs.readdirSync(projectsDir, { withFileTypes: true })
+        .filter(d => d.isDirectory() && fs.existsSync(path.join(projectsDir, d.name, '.git')))
+        .map(d => ({ name: d.name, cwd: path.join(projectsDir, d.name) }));
+    }
+
+    if (projects.length === 0) {
+      console.error('❌ No git projects found in', projectsDir);
+      process.exit(1);
+    }
+
+    // Generate kitty session file
+    const sessionFile = path.join(os.tmpdir(), `telepty-session-${Date.now()}.conf`);
+    let conf = '# Auto-generated telepty session\n';
+    projects.forEach((p, i) => {
+      const name = p.name;
+      const cwd = p.cwd || path.join(projectsDir, name);
+      const sessionId = `${name}-${cli.split(' ')[0]}`;
+      if (i === 0) {
+        conf += `new_tab ${name}\n`;
+      } else {
+        conf += `\nnew_tab ${name}\n`;
+      }
+      conf += `layout tall\n`;
+      conf += `cd ${cwd}\n`;
+      conf += `title ${name}\n`;
+      conf += `launch --type=window telepty allow --id ${sessionId} ${cli}\n`;
+    });
+
+    fs.writeFileSync(sessionFile, conf);
+    console.log(`✅ Kitty session file: ${sessionFile}`);
+    console.log(`   ${projects.length} projects, CLI: ${cli}`);
+    console.log(`\n   Launch: kitty --session ${sessionFile}\n`);
+
+    // Auto-launch if --launch flag
+    if (args.includes('--launch')) {
+      const { spawn } = require('child_process');
+      spawn('kitty', ['--session', sessionFile], { detached: true, stdio: 'ignore' }).unref();
+      console.log('🚀 Kitty launched.');
+    }
+    return;
+  }
+
   if (cmd === 'deliberate') {
     await ensureDaemonRunning();
     const subCmd = args[1];

package/daemon.js

@@ -589,7 +589,7 @@ function sendViaKitty(sessionId, text) {
   }
 
   try {
-    // Split text and CR — send-text for content, send-key for Enter
+    // Split text and CR — send-text for both (send-key corrupts keyboard protocol)
     const hasCr = text.endsWith('\r') || text.endsWith('\n');
     const textOnly = hasCr ? text.slice(0, -1) : text;
     if (textOnly.length > 0) {
@@ -601,7 +601,7 @@ function sendViaKitty(sessionId, text) {
     if (hasCr) {
       // Delay before sending Return — CLI needs time to process text input
       execSync('sleep 0.5', { timeout: 2000 });
-      execSync(`kitty @ --to unix:${socket} send-key --match id:${windowId} Return`, {
+      execSync(`kitty @ --to unix:${socket} send-text --match id:${windowId} $'\\r'`, {
         timeout: 3000, stdio: ['pipe', 'pipe', 'pipe']
       });
     }
@@ -797,7 +797,7 @@ app.post('/api/sessions/:id/inject', (req, res) => {
         setTimeout(() => {
           if (wid && sock) {
             try {
-              require('child_process').execSync(`kitty @ --to unix:${sock} send-key --match id:${wid} Return`, {
+              require('child_process').execSync(`kitty @ --to unix:${sock} send-text --match id:${wid} $'\\r'`, {
                 timeout: 3000, stdio: ['pipe', 'pipe', 'pipe']
               });
               require('child_process').execSync(`kitty @ --to unix:${sock} set-tab-title --match id:${wid} '⚡ telepty :: ${id}'`, {
@@ -942,14 +942,21 @@ app.delete('/api/sessions/:id', (req, res) => {
 function busAutoRoute(msg) {
   const eventType = msg.type || msg.kind;
   const isRoutable = (eventType === 'turn_request' || eventType === 'deliberation_route_turn') && (msg.target || msg.target_session_id);
-  if (!isRoutable) return;
+  if (!isRoutable) {
+    // Log all bus messages for debugging (excluding health checks)
+    if (eventType && eventType !== 'session_health') {
+      console.log(`[BUS] Event: ${eventType} (not routable)`);
+    }
+    return;
+  }
 
   const rawTarget = (msg.target || msg.target_session_id).split('@')[0];
-  console.log(`[BUS-ROUTE] Received ${eventType}: target=${rawTarget}`);
+  const turnId = (msg.payload && msg.payload.turn_id) || null;
+  console.log(`[BUS-ROUTE] ${eventType}: target=${rawTarget} turn=${turnId} msg_id=${msg.message_id || 'none'}`);
   const targetId = resolveSessionAlias(rawTarget);
   const targetSession = targetId ? sessions[targetId] : null;
   if (!targetSession) {
-    console.log(`[BUS-ROUTE] Target ${rawTarget} not found`);
+    console.log(`[BUS-ROUTE] Target ${rawTarget} not found among: ${Object.keys(sessions).join(', ')}`);
     return;
   }
 
@@ -970,7 +977,7 @@ function busAutoRoute(msg) {
       });
       setTimeout(() => {
         try {
-          require('child_process').execSync(`kitty @ --to unix:${sock} send-key --match id:${wid} Return`, {
+          require('child_process').execSync(`kitty @ --to unix:${sock} send-text --match id:${wid} $'\\r'`, {
             timeout: 3000, stdio: ['pipe', 'pipe', 'pipe']
           });
         } catch {}
@@ -1002,6 +1009,8 @@ function busAutoRoute(msg) {
     source_host: MACHINE_ID,
     target_agent: targetId,
     source_type: 'bus_auto_route',
+    turn_id: (msg.payload && msg.payload.turn_id) || null,
+    original_message_id: msg.message_id || null,
     delivered,
     timestamp: new Date().toISOString()
   });

package/package.json

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