clideck 1.31.3 → 1.31.5

package/README.md

@@ -26,7 +26,7 @@ the main problem with using multiple agents is not starting them. it is managing
 
 Terminal multiplexers are great at panes. clideck is about conversations.
 
-A pane grid is flat. agent work usually is not. projects, roles, previews, timestamps, notifications, resume, and sometimes a bit of routing between specialists all fit more naturally into a chat app layout. it also maps naturally to mobile, so the same mental model works on desktop and phone.
+A pane grid is flat. agent work usually is not. projects, previews, timestamps, notifications, resume, and sometimes a bit of routing between specialists all fit more naturally into a chat app layout. it also maps naturally to mobile, so the same mental model works on desktop and phone.
 
 ## Quick start
 

package/codex-hooks.js

@@ -18,7 +18,7 @@ function readHooksFile(path) {
   if (!existsSync(path)) return { hooks: {} };
   const parsed = JSON.parse(readFileSync(path, 'utf8'));
   if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
-    throw new Error('Invalid ~/.codex/hooks.json shape');
+    throw new Error('Invalid Codex hooks.json shape');
   }
   if (!parsed.hooks || typeof parsed.hooks !== 'object' || Array.isArray(parsed.hooks)) parsed.hooks = {};
   return parsed;
@@ -33,8 +33,8 @@ function stripClideckHooks(groups) {
     .filter(group => group.hooks.length);
 }
 
-function installCodexHooks(home, nodePath, helperPath, port) {
-  const hooksPath = join(home, '.codex', 'hooks.json');
+function installCodexHooks(codexHome, nodePath, helperPath, port) {
+  const hooksPath = join(codexHome, 'hooks.json');
   const doc = readHooksFile(hooksPath);
 
   for (const [event, route] of Object.entries(EVENTS)) {
@@ -53,8 +53,8 @@ function installCodexHooks(home, nodePath, helperPath, port) {
   writeFileSync(hooksPath, JSON.stringify(doc, null, 2) + '\n');
 }
 
-function removeCodexHooks(home) {
-  const hooksPath = join(home, '.codex', 'hooks.json');
+function removeCodexHooks(codexHome) {
+  const hooksPath = join(codexHome, 'hooks.json');
   if (!existsSync(hooksPath)) return;
   const doc = readHooksFile(hooksPath);
 
@@ -73,9 +73,9 @@ function removeCodexHooks(home) {
   }
 }
 
-function codexHooksHealthy(home, helperPath, port) {
+function codexHooksHealthy(codexHome, helperPath, port) {
   try {
-    const doc = readHooksFile(join(home, '.codex', 'hooks.json'));
+    const doc = readHooksFile(join(codexHome, 'hooks.json'));
     for (const [event, route] of Object.entries(EVENTS)) {
       const groups = Array.isArray(doc.hooks?.[event]) ? doc.hooks[event] : [];
       const expected = commandFor(process.execPath.replace(/\\/g, '/'), helperPath, port, route);

package/config.js

@@ -32,52 +32,13 @@ list your fidings please.`,
   },
 ];
 
-const STARTER_ROLES = [
-  {
-    id: 'starter-role-programmer',
-    name: 'Programmer',
-    instructions: `You are the main programmer of this project.
-Do you not apply workarounds or bandaids, prefer pure solutions.
-NEVER use plan tool/mode, start to build immediatly and ask questions along the way if any.
-Check if any external findings are valid before applying changes, the reviewer doesnt always updated with the full scope.
-When you done with changes, list concisely what you did.
-
-Learn the project quickly if exist. Go over the structure, code and functionality.
-Let me know when you are ready.`,
-  },
-  {
-    id: 'starter-role-reviewer',
-    name: 'Reviewer',
-    instructions: `You are the code reviewer in this project.
-Your task is check the coder output and list critical / logical design flow issues, ugly workarounds or functionalty you just dont understand why its there. Do not waste time and list insignificunt findings.
-
-If you didnt find anything, response with no findings.
-
-You never write code!.
-
-Quickly learn the project if exist. Go over the structure, code and functionality and let me know when you are ready.`,
-  },
-  {
-    id: 'starter-role-product-manager',
-    name: 'Product manager',
-    instructions: `You are the product manager of this project, you should understand why we do what we do and what is the best way to do it. You dont care about technical limitations or directions, the only thing matter to you is the user UI/UX and how this agents team will ship a top notch, professional deliveries.
-Do not allow the team to round angles and skip small stuff that will basly impact the user.
-
-You never write code!
-You dont use your plan tool/mode - instead you are planning immediatly as you go.
-
-Go over the project if exist and understand from the code, documentations and readme what is it and why we do it.
-
-Let me know when you are ready`,
-  },
-];
-
 const DEFAULTS = {
   defaultPath: join(os.homedir(), 'Documents'),
   commands: [
     {
       id: '1', label: 'Shell', icon: 'terminal', command: defaultShell, enabled: true,
       defaultPath: '', isAgent: false, canResume: false, resumeCommand: null, sessionIdPattern: null,
+      env: {},
     },
   ],
   confirmClose: true,
@@ -88,7 +49,6 @@ const DEFAULTS = {
   defaultTheme: 'catppuccin-mocha',
   defaultShell,
   prompts: [],
-  roles: [],
   projects: [],
 };
 
@@ -155,6 +115,7 @@ function migrate(cfg) {
     if (cmd.resumeCommand === undefined)    cmd.resumeCommand = preset?.resumeCommand || null;
     if (cmd.sessionIdPattern === undefined) cmd.sessionIdPattern = preset?.sessionIdPattern || null;
     if (cmd.outputMarker === undefined)     cmd.outputMarker = preset?.outputMarker || null;
+    if (!cmd.env || typeof cmd.env !== 'object' || Array.isArray(cmd.env)) cmd.env = {};
     // Claude Code telemetry is built-in, always on
     if (preset?.telemetryEnabled === true) cmd.telemetryEnabled = true;
     else if (preset?.presetId === 'claude-code') cmd.telemetryEnabled = true;
@@ -181,11 +142,11 @@ function migrate(cfg) {
         isAgent: preset.isAgent, canResume: preset.canResume,
         resumeCommand: preset.resumeCommand, sessionIdPattern: preset.sessionIdPattern,
         outputMarker: preset.outputMarker || null,
+        env: {},
       });
     }
   }
   if (!cfg.projects) cfg.projects = [];
-  if (!cfg.roles) cfg.roles = [];
   return cfg;
 }
 
@@ -194,7 +155,6 @@ function load() {
     return {
       ...deepCopy(DEFAULTS),
       prompts: deepCopy(STARTER_PROMPTS),
-      roles: deepCopy(STARTER_ROLES),
     };
   }
   try {

package/handlers.js

@@ -19,7 +19,8 @@ function clientPresets() {
 }
 function filterClientCommands(commands) {
   const allowedPresetIds = new Set(clientPresets().map(p => p.presetId));
-  return (commands || []).filter(cmd => !cmd.presetId || allowedPresetIds.has(cmd.presetId));
+  const knownPresetIds = new Set(presets.map(p => p.presetId));
+  return (commands || []).filter(cmd => !cmd.presetId || allowedPresetIds.has(cmd.presetId) || !knownPresetIds.has(cmd.presetId));
 }
 const transcript = require('./transcript');
 const plugins = require('./plugin-loader');
@@ -70,6 +71,35 @@ function getInstalledVersion(bin) {
   return '';
 }
 
+function presetForCommand(cmd) {
+  if (cmd?.presetId) {
+    const preset = presets.find(p => p.presetId === cmd.presetId);
+    if (preset) return preset;
+  }
+  const bin = binName(cmd?.command);
+  return presets.find(p => binName(p.command) === bin);
+}
+
+function commandEnv(cmd) {
+  return cmd?.env && typeof cmd.env === 'object' && !Array.isArray(cmd.env) ? cmd.env : {};
+}
+
+function expandHomePath(value) {
+  const text = String(value || '').trim();
+  if (!text) return '';
+  if (text === '~') return os.homedir();
+  if (text.startsWith('~/') || text.startsWith('~\\')) return join(os.homedir(), text.slice(2));
+  return text;
+}
+
+function configRootFor(preset, cmd) {
+  const env = commandEnv(cmd);
+  if (preset?.presetId === 'claude-code') return expandHomePath(env.CLAUDE_CONFIG_DIR) || join(os.homedir(), '.claude');
+  if (preset?.presetId === 'codex') return expandHomePath(env.CODEX_HOME) || join(os.homedir(), '.codex');
+  if (preset?.presetId === 'gemini-cli') return join(expandHomePath(env.GEMINI_CLI_HOME) || os.homedir(), '.gemini');
+  return os.homedir();
+}
+
 function checkRemoteUpdate(ws) {
   const now = Date.now();
   if (remoteUpdateCache && now - remoteUpdateCheckedAt < REMOTE_UPDATE_INTERVAL) {
@@ -154,11 +184,11 @@ function codexHooksFeatureEnabled(content) {
   return false;
 }
 
-function codexConfigLooksHealthy(content, port) {
+function codexConfigLooksHealthy(content, port, codexHome) {
   if (!content.includes('[otel]') || !content.includes(`localhost:${port}`)) return false;
   const codexHookPath = join(__dirname, 'bin', 'codex-hook.js').replace(/\\/g, '/');
   if (!codexHooksFeatureEnabled(content)) return false;
-  if (!codexHooksHealthy(os.homedir(), codexHookPath, port)) return false;
+  if (!codexHooksHealthy(codexHome, codexHookPath, port)) return false;
   const notifyLine = content.match(/^\s*notify\s*=\s*\[(.+)\]\s*$/m)?.[1] || '';
   if (!notifyLine.includes('notify-helper')) return false;
   const quoted = [...notifyLine.matchAll(/"([^"]+)"/g)].map(m => m[1]);
@@ -167,7 +197,6 @@ function codexConfigLooksHealthy(content, port) {
 }
 
 function detectTelemetryConfig(c) {
-  const home = os.homedir();
   const port = String(PORT);
   let changed = false;
   const attemptedRepairs = new Set();
@@ -175,14 +204,13 @@ function detectTelemetryConfig(c) {
   for (let pass = 0; pass < 2; pass++) {
     let repairedAny = false;
     for (const cmd of c.commands || []) {
-      const bin = binName(cmd.command);
-      const preset = presets.find(p => binName(p.command) === bin);
+      const preset = presetForCommand(cmd);
       if (!preset) continue;
       let detected = false;
       let reason = '';
       if (preset.presetId === 'claude-code') {
         try {
-          const s = JSON.parse(readFileSync(join(home, '.claude', 'settings.json'), 'utf8'));
+          const s = JSON.parse(readFileSync(join(configRootFor(preset, cmd), 'settings.json'), 'utf8'));
           const hooks = s.hooks || {};
           detected = hasExistingHook(hooks.UserPromptSubmit, 'claude-hook.js', 'start')
                   && hasExistingHook(hooks.Stop, 'claude-hook.js', 'stop')
@@ -193,13 +221,14 @@ function detectTelemetryConfig(c) {
         } catch {}
       } else if (preset.presetId === 'codex') {
         try {
-          const content = readFileSync(join(home, '.codex', 'config.toml'), 'utf8');
-          detected = codexConfigLooksHealthy(content, port);
+          const codexHome = configRootFor(preset, cmd);
+          const content = readFileSync(join(codexHome, 'config.toml'), 'utf8');
+          detected = codexConfigLooksHealthy(content, port, codexHome);
           if (!detected) reason = 'Needs re-patch';
         } catch {}
       } else if (preset.presetId === 'gemini-cli') {
         try {
-          const s = JSON.parse(readFileSync(join(home, '.gemini', 'settings.json'), 'utf8'));
+          const s = JSON.parse(readFileSync(join(configRootFor(preset, cmd), 'settings.json'), 'utf8'));
           const hooks = s.hooks || {};
           detected = hasExistingHook(hooks.BeforeAgent, 'gemini-hook.js', 'start')
                   && hasExistingHook(hooks.AfterAgent, 'gemini-hook.js', 'stop')
@@ -214,9 +243,9 @@ function detectTelemetryConfig(c) {
       if (preset.available && preset.minVersion && !preset.versionOk) {
         detected = false;
         reason = `Update required (${preset.minVersion}+)`;
-      } else if (!detected && cmd.telemetryEnabled && preset.telemetryAutoSetup && preset.available && preset.versionOk && !attemptedRepairs.has(preset.presetId)) {
-        attemptedRepairs.add(preset.presetId);
-        const repaired = applyTelemetryConfig(preset);
+      } else if (!detected && cmd.telemetryEnabled && preset.telemetryAutoSetup && preset.available && preset.versionOk && !attemptedRepairs.has(cmd.id || preset.presetId)) {
+        attemptedRepairs.add(cmd.id || preset.presetId);
+        const repaired = applyTelemetryConfig(preset, cmd);
         if (repaired.success) {
           repairedAny = true;
           continue;
@@ -360,11 +389,12 @@ function onConnection(ws) {
       }
 
       case 'telemetry.autosetup': {
-        const preset = presets.find(p => p.presetId === msg.presetId);
+        const targetCmd = msg.commandId ? cfg.commands.find(c => c.id === msg.commandId) : null;
+        const preset = targetCmd ? presetForCommand(targetCmd) : presets.find(p => p.presetId === msg.presetId);
         if (!preset?.telemetryAutoSetup) break;
-        const result = applyTelemetryConfig(preset);
+        const result = applyTelemetryConfig(preset, targetCmd);
         for (const cmd of cfg.commands) {
-          if (binName(cmd.command) === binName(preset.command)) {
+          if (targetCmd ? cmd.id === targetCmd.id : presetForCommand(cmd)?.presetId === preset.presetId) {
             cmd.telemetryEnabled = result.success;
             cmd.telemetryStatus = result.success ? { ok: true } : { ok: false, error: result.message };
             // Enable the agent when setup succeeds, disable if it fails
@@ -375,7 +405,8 @@ function onConnection(ws) {
         sessions.broadcast({ type: 'config', config: configForClient() });
         ws.send(JSON.stringify({
           type: 'telemetry.autosetup.result',
-          presetId: msg.presetId,
+          presetId: preset.presetId,
+          commandId: msg.commandId || null,
           success: result.success,
           output: result.message,
         }));
@@ -383,18 +414,19 @@ function onConnection(ws) {
       }
 
       case 'telemetry.configure': {
-        const preset = presets.find(p => p.presetId === msg.presetId);
+        const targetCmd = msg.commandId ? cfg.commands.find(c => c.id === msg.commandId) : null;
+        const preset = targetCmd ? presetForCommand(targetCmd) : presets.find(p => p.presetId === msg.presetId);
         if (!preset) break;
         const enable = !!msg.enable;
         let result;
         if (enable) {
-          result = applyTelemetryConfig(preset);
+          result = applyTelemetryConfig(preset, targetCmd);
         } else {
-          result = removeTelemetryConfig(preset);
+          result = removeTelemetryConfig(preset, targetCmd);
         }
         // Update all matching commands in config
         for (const cmd of cfg.commands) {
-          if (binName(cmd.command) === binName(preset.command)) {
+          if (targetCmd ? cmd.id === targetCmd.id : presetForCommand(cmd)?.presetId === preset.presetId) {
             cmd.telemetryEnabled = enable && result.success;
             cmd.telemetryStatus = enable
               ? (result.success ? { ok: true } : { ok: false, error: result.message })
@@ -576,13 +608,12 @@ function onConnection(ws) {
 }
 
 // Deterministic telemetry config writers per agent — no AI, no YOLO
-function applyTelemetryConfig(preset) {
+function applyTelemetryConfig(preset, cmd = null) {
   const port = String(PORT);
-  const home = os.homedir();
 
   try {
     if (preset.presetId === 'claude-code') {
-      const configPath = join(home, '.claude', 'settings.json');
+      const configPath = join(configRootFor(preset, cmd), 'settings.json');
       let settings = {};
       if (existsSync(configPath)) {
         try { settings = JSON.parse(readFileSync(configPath, 'utf8')); } catch {}
@@ -608,11 +639,12 @@ function applyTelemetryConfig(preset) {
       settings.hooks = hooks;
       mkdirSync(dirname(configPath), { recursive: true });
       writeFileSync(configPath, JSON.stringify(settings, null, 2) + '\n');
-      return { success: true, message: 'Added hooks to ~/.claude/settings.json — Claude will ask for one-time approval' };
+      return { success: true, message: `Added hooks to ${configPath} — Claude will ask for one-time approval` };
     }
 
     if (preset.presetId === 'codex') {
-      const configPath = join(home, '.codex', 'config.toml');
+      const codexHome = configRootFor(preset, cmd);
+      const configPath = join(codexHome, 'config.toml');
       let content = '';
       if (existsSync(configPath)) content = readFileSync(configPath, 'utf8');
       const hasOtel = content.includes('[otel]');
@@ -620,7 +652,7 @@ function applyTelemetryConfig(preset) {
       const hasNotify = /^\s*notify\s*=.*notify-helper/m.test(content);
       const hasWrongOtel = content.includes(`endpoint = "http://localhost:${port}/v1/logs"`);
       const codexHookPath = join(__dirname, 'bin', 'codex-hook.js').replace(/\\/g, '/');
-      const hasHooks = codexHooksFeatureEnabled(content) && codexHooksHealthy(home, codexHookPath, port);
+      const hasHooks = codexHooksFeatureEnabled(content) && codexHooksHealthy(codexHome, codexHookPath, port);
       if (hasOtel && hasCurrentOtel && hasNotify && !hasWrongOtel && hasHooks) {
         return { success: true, message: 'Already configured' };
       }
@@ -630,12 +662,12 @@ function applyTelemetryConfig(preset) {
       if (!valid.ok) return { success: false, message: valid.error };
       mkdirSync(dirname(configPath), { recursive: true });
       writeFileSync(configPath, nextContent);
-      installCodexHooks(home, process.execPath.replace(/\\/g, '/'), codexHookPath, port);
+      installCodexHooks(codexHome, process.execPath.replace(/\\/g, '/'), codexHookPath, port);
       return { success: true, message: 'Configured. If Codex shows "2 hooks need review", open /hooks and approve the CliDeck hooks once.' };
     }
 
     if (preset.presetId === 'gemini-cli') {
-      const configPath = join(home, '.gemini', 'settings.json');
+      const configPath = join(configRootFor(preset, cmd), 'settings.json');
       let settings = {};
       if (existsSync(configPath)) {
         try { settings = JSON.parse(readFileSync(configPath, 'utf8')); } catch {}
@@ -665,7 +697,7 @@ function applyTelemetryConfig(preset) {
       if (settings.telemetry?.target === 'local' && /localhost:\d+/.test(String(settings.telemetry?.otlpEndpoint || ''))) delete settings.telemetry;
       mkdirSync(dirname(configPath), { recursive: true });
       writeFileSync(configPath, JSON.stringify(settings, null, 2) + '\n');
-      return { success: true, message: 'Added CliDeck hooks to ~/.gemini/settings.json' };
+      return { success: true, message: `Added CliDeck hooks to ${configPath}` };
     }
 
     if (preset.presetId === 'opencode') {
@@ -684,12 +716,10 @@ function applyTelemetryConfig(preset) {
   }
 }
 
-function removeTelemetryConfig(preset) {
-  const home = os.homedir();
-
+function removeTelemetryConfig(preset, cmd = null) {
   try {
     if (preset.presetId === 'claude-code') {
-      const configPath = join(home, '.claude', 'settings.json');
+      const configPath = join(configRootFor(preset, cmd), 'settings.json');
       if (!existsSync(configPath)) return { success: true, message: 'No config file to clean' };
       let settings = {};
       try { settings = JSON.parse(readFileSync(configPath, 'utf8')); } catch {}
@@ -702,23 +732,24 @@ function removeTelemetryConfig(preset) {
       }
       if (!Object.keys(settings.hooks).length) delete settings.hooks;
       writeFileSync(configPath, JSON.stringify(settings, null, 2) + '\n');
-      return { success: true, message: 'Removed CliDeck hooks from ~/.claude/settings.json' };
+      return { success: true, message: `Removed CliDeck hooks from ${configPath}` };
     }
 
     if (preset.presetId === 'codex') {
-      const configPath = join(home, '.codex', 'config.toml');
+      const codexHome = configRootFor(preset, cmd);
+      const configPath = join(codexHome, 'config.toml');
       if (!existsSync(configPath)) return { success: true, message: 'No config file to clean' };
       let content = readFileSync(configPath, 'utf8');
       content = content.replace(/\n?\[otel\][^\[]*/, '');
       content = content.replace(/\n?notify\s*=\s*\[.*?notify-helper.*?\]\s*/g, '');
       content = content.replace(/\n?codex_hooks\s*=\s*(true|false)\s*/g, '\n');
       writeFileSync(configPath, content.trimEnd() + '\n');
-      removeCodexHooks(home);
-      return { success: true, message: 'Removed otel + CliDeck hooks from ~/.codex config' };
+      removeCodexHooks(codexHome);
+      return { success: true, message: `Removed otel + CliDeck hooks from ${configPath}` };
     }
 
     if (preset.presetId === 'gemini-cli') {
-      const configPath = join(home, '.gemini', 'settings.json');
+      const configPath = join(configRootFor(preset, cmd), 'settings.json');
       if (!existsSync(configPath)) return { success: true, message: 'No config file to clean' };
       let settings = {};
       try { settings = JSON.parse(readFileSync(configPath, 'utf8')); } catch {}
@@ -731,7 +762,7 @@ function removeTelemetryConfig(preset) {
       if (settings.hooks && !Object.keys(settings.hooks).length) delete settings.hooks;
       if (settings.telemetry?.target === 'local' && /localhost:\d+/.test(String(settings.telemetry?.otlpEndpoint || ''))) delete settings.telemetry;
       writeFileSync(configPath, JSON.stringify(settings, null, 2) + '\n');
-      return { success: true, message: 'Removed CliDeck hooks from ~/.gemini/settings.json' };
+      return { success: true, message: `Removed CliDeck hooks from ${configPath}` };
     }
 
     if (preset.presetId === 'opencode') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clideck",
-  "version": "1.31.3",
+  "version": "1.31.5",
   "description": "One screen for all your AI coding agents — run, monitor, and manage multiple CLI agents from a single browser tab",
   "main": "server.js",
   "bin": {

package/plugin-loader.js

@@ -207,13 +207,13 @@ function buildApi(pluginId, pluginDir, state) {
       const s = sessionsFn?.()?.get(id);
       if (!s) return null;
       const state = sessionStatus.get(id) || '';
-      return { id, name: s.name, cwd: s.cwd, commandId: s.commandId, presetId: s.presetId || 'shell', themeId: s.themeId, projectId: s.projectId, roleName: s.roleName || null, working: state.startsWith('1:') };
+      return { id, name: s.name, cwd: s.cwd, commandId: s.commandId, presetId: s.presetId || 'shell', themeId: s.themeId, projectId: s.projectId, working: state.startsWith('1:') };
     },
     getSessions() {
       const sessions = sessionsFn?.();
       if (!sessions) return [];
       return [...sessions].map(([id, s]) => ({
-        id, name: s.name, cwd: s.cwd, commandId: s.commandId, presetId: s.presetId || 'shell', themeId: s.themeId, projectId: s.projectId, roleName: s.roleName || null, working: (sessionStatus.get(id) || '').startsWith('1:'),
+        id, name: s.name, cwd: s.cwd, commandId: s.commandId, presetId: s.presetId || 'shell', themeId: s.themeId, projectId: s.projectId, working: (sessionStatus.get(id) || '').startsWith('1:'),
       }));
     },
 
@@ -232,7 +232,6 @@ function buildApi(pluginId, pluginDir, state) {
     inputToSession(id, data) { inputFn?.({ id, data }); },
     setAutoApproveMenu(id, enabled) { enabled ? autoApproveMenus.add(id) : autoApproveMenus.delete(id); },
 
-    getRoles() { return JSON.parse(JSON.stringify(getConfigFn?.()?.roles || [])); },
     getProjects() { return JSON.parse(JSON.stringify(getConfigFn?.()?.projects || [])); },
     getTranscript(id, n, order) { return transcript.getTurns(id, n || 20, order || 'end'); },
     detectMenu(lines, presetId) { return transcript.detectMenu(lines, presetId); },

package/public/js/app.js

@@ -16,6 +16,19 @@ import { renderPrompts } from './prompts.js';
 const shownAgentHealthToasts = new Set();
 let reconnectReplaySkip = null;
 
+function normalizeTerminalHistoryText(text) {
+  return `${text || ''}\n`.replace(/\r?\n/g, '\r\n');
+}
+
+function presetForCommand(cmd) {
+  if (cmd?.presetId) {
+    const byId = state.presets.find(p => p.presetId === cmd.presetId);
+    if (byId) return byId;
+  }
+  const bin = binName(cmd?.command);
+  return state.presets.find(p => binName(p.command) === bin);
+}
+
 function connect() {
   const wsProtocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
   state.ws = new WebSocket(`${wsProtocol}//${location.host}`);
@@ -67,7 +80,9 @@ function connect() {
           }
           msg.list.forEach(s => addTerminal(s.id, s.name, s.themeId, s.commandId, s.projectId, s.muted, s.lastPreview, s.presetId));
           if (!state.active || !state.terms.has(state.active)) {
-            if (msg.list.length) select(msg.list[0].id);
+            const savedActive = localStorage.getItem('clideck.activeSessionId');
+            const nextId = savedActive && liveIds.has(savedActive) ? savedActive : msg.list[0]?.id;
+            if (nextId) select(nextId);
           }
         }
         break;
@@ -110,7 +125,8 @@ function connect() {
       case 'session.history': {
         const entry = state.terms.get(msg.id);
         if (msg.replay && reconnectReplaySkip?.has(msg.id) && entry) break;
-        if (entry && !entry.queue(msg.text + '\n')) entry.term.write(msg.text + '\n');
+        const historyText = normalizeTerminalHistoryText(msg.text);
+        if (entry && !entry.queue(historyText)) entry.term.write(historyText);
         updatePreview(msg.id);
         break;
       }
@@ -209,7 +225,7 @@ function connect() {
         break;
       }
       case 'telemetry.autosetup.result': {
-        const toast = document.querySelector(`[data-setup-preset="${msg.presetId}"]`);
+        const toast = document.querySelector(msg.commandId ? `[data-command-id="${msg.commandId}"]` : `[data-setup-preset="${msg.presetId}"]`);
         if (!toast) break;
         const actionsEl = toast.querySelector('.setup-actions');
         if (msg.success) {
@@ -240,7 +256,7 @@ function connect() {
             toast.remove();
           };
         } else {
-          shownSetup.delete(msg.presetId);
+          shownSetup.delete(msg.commandId || msg.presetId);
           const btn = toast.querySelector('.auto-setup-btn');
           btn.textContent = 'Failed — configure manually';
           btn.className = 'auto-setup-btn flex-1 px-3 py-2 text-xs font-medium bg-red-600/20 text-red-400 border border-red-500/30 rounded-lg cursor-default';
@@ -469,11 +485,12 @@ function showTelemetrySetup(commandId, sessionId) {
   if (!cmd) return;
   // Skip if telemetry is already configured via settings
   if (cmd.telemetryEnabled && cmd.telemetryStatus?.ok) return;
-  const bin = binName(cmd.command);
-  const preset = state.presets.find(p => binName(p.command) === bin);
+  const preset = presetForCommand(cmd);
+  if (!preset) return;
   const setupRaw = preset.telemetrySetup || preset.pluginSetup;
-  if (!setupRaw || shownSetup.has(preset.presetId)) return;
-  shownSetup.add(preset.presetId);
+  const setupKey = commandId || preset.presetId;
+  if (!setupRaw || shownSetup.has(setupKey)) return;
+  shownSetup.add(setupKey);
 
   const port = location.port || '4000';
   const setupText = setupRaw.replace(/\{\{port\}\}/g, port);
@@ -512,7 +529,7 @@ function showTelemetrySetup(commandId, sessionId) {
     </div>`;
 
   toast.querySelectorAll('.dismiss-btn').forEach(b => b.onclick = () => {
-    shownSetup.delete(preset.presetId);
+    shownSetup.delete(setupKey);
     toast.remove();
   });
 
@@ -522,7 +539,7 @@ function showTelemetrySetup(commandId, sessionId) {
       autoBtn.disabled = true;
       autoBtn.innerHTML = `<svg class="w-3.5 h-3.5 inline animate-spin -mt-px mr-1.5" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5"><path d="M12 2a10 10 0 0 1 10 10"/></svg>Configuring…`;
       autoBtn.className = 'auto-setup-btn flex-1 px-3 py-2 text-xs font-medium bg-slate-700 text-slate-300 rounded-lg cursor-wait';
-      send({ type: 'telemetry.autosetup', presetId: preset.presetId });
+      send({ type: 'telemetry.autosetup', presetId: preset.presetId, commandId });
     };
   }