clideck 1.31.3 → 1.31.5

package/sessions.js

@@ -10,7 +10,7 @@ const opencodeBridge = require('./opencode-bridge');
 const plugins = require('./plugin-loader');
 
 const THEMES = require('./themes');
-const MAX_BUFFER = 200 * 1024;
+const MAX_BUFFER = 2 * 1024 * 1024;
 const { PORT, localUrl } = require('./runtime');
 const ANSI_RE = /\x1b\[[0-9;?]*[ -/]*[@-~]|\x1b\].*?(?:\x07|\x1b\\)|\x1b./g;
 const PRESETS = JSON.parse(require('fs').readFileSync(join(__dirname, 'agent-presets.json'), 'utf8'));
@@ -59,9 +59,26 @@ function broadcast(msg) {
 
 // --- Spawn a PTY and wire up a session ---
 
+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) {
+  const env = {};
+  if (!cmd?.env || typeof cmd.env !== 'object' || Array.isArray(cmd.env)) return env;
+  for (const [key, value] of Object.entries(cmd.env)) {
+    if (/^[A-Za-z_][A-Za-z0-9_]*$/.test(key)) env[key] = String(value ?? '');
+  }
+  return env;
+}
+
 function buildTelemetryEnv(id, cmd) {
-  const bin = binName(cmd.command);
-  const preset = PRESETS.find(p => binName(p.command) === bin);
+  const preset = presetForCommand(cmd);
   const telemetryEnabled = cmd.telemetryEnabled ?? (preset?.presetId === 'claude-code');
   const env = { CLIDECK_SESSION_ID: id, CLIDECK_PORT: String(PORT), CLIDECK_URL: localUrl() };
   if (!preset?.telemetryEnv || !telemetryEnabled) return env;
@@ -85,19 +102,19 @@ function isLightTheme(themeId) {
 function spawnSession(id, cmd, parts, cwd, name, themeId, commandId, savedToken, projectId, cols, rows) {
   const telemetryEnv = buildTelemetryEnv(id, cmd);
   const colorEnv = isLightTheme(themeId) ? { COLORFGBG: '0;15' } : { COLORFGBG: '15;0' };
+  const extraEnv = commandEnv(cmd);
   let term;
   try {
     term = pty.spawn(parts[0], parts.slice(1), {
       name: 'xterm-256color', cols: cols || 80, rows: rows || 24, cwd,
-      env: { ...process.env, ...telemetryEnv, ...colorEnv },
+      env: { ...process.env, ...extraEnv, ...telemetryEnv, ...colorEnv },
     });
   } catch (e) {
     return e;
   }
 
   const sessionIdRe = cmd.sessionIdPattern ? new RegExp(cmd.sessionIdPattern, 'i') : null;
-  const bin = binName(cmd.command);
-  const preset = PRESETS.find(p => binName(p.command) === bin);
+  const preset = presetForCommand(cmd);
   const session = { name, themeId, commandId, cwd, pty: term, chunks: [], chunksSize: 0, sessionToken: savedToken || null, projectId: projectId || null, presetId: preset?.presetId || 'shell', working: undefined };
   sessions.set(id, session);
   transcript.setFinalizeOnIdle(id, ['claude-code', 'codex', 'gemini-cli', 'opencode', 'clideck-agent'].includes(session.presetId) ? session.presetId : null);
@@ -105,32 +122,10 @@ function spawnSession(id, cmd, parts, cwd, name, themeId, commandId, savedToken,
   // Always watch telemetry-backed agents so OTLP fallback matching can attach
   // early events to this session even when the agent omits clideck.session_id.
   // The receiver itself decides whether to surface a setup prompt.
-  if (preset?.telemetryEnv) telemetry.watchSession(id, bin);
+  if (preset?.telemetryEnv) telemetry.watchSession(id, binName(cmd.command));
   if (preset?.bridge === 'opencode') opencodeBridge.watchSession(id, cwd);
 
-  function injectRolePrompt() {
-    if (!session.pendingRolePrompt) return;
-    transcript.recordInjectedInput(id, session.pendingRolePrompt);
-    term.write(session.pendingRolePrompt);
-    setTimeout(() => term.write('\r'), 150);
-    console.log(`Session ${id.slice(0, 8)}: injected role prompt`);
-    delete session.pendingRolePrompt;
-    delete session._rolePromptTimer;
-  }
-
   term.onData((data) => {
-    // Role prompts should be injected only when the agent is likely ready for
-    // input. For Codex, use the first OTLP startup event instead of a blind
-    // fixed startup delay; other agents keep the existing delayed path.
-    if (session.pendingRolePrompt && !session._rolePromptTimer) {
-      if (session.presetId === 'codex') {
-        if (telemetry.hasEvents(id)) injectRolePrompt();
-      } else {
-        session._rolePromptTimer = setTimeout(() => {
-          if (session.pendingRolePrompt) injectRolePrompt();
-        }, 3000);
-      }
-    }
     session.chunks.push(data);
     session.chunksSize += data.length;
     while (session.chunksSize > MAX_BUFFER && session.chunks.length > 1) {
@@ -164,7 +159,6 @@ function spawnSession(id, cmd, parts, cwd, name, themeId, commandId, savedToken,
       resumable.push({
         id, name: s.name, commandId: s.commandId, presetId: s.presetId || 'shell', cwd: s.cwd,
         themeId: s.themeId, sessionToken: s.sessionToken, projectId: s.projectId, muted: !!s.muted,
-        roleName: s.roleName || null,
         lastPreview: s.lastPreview || '', lastActivityAt: s.lastActivityAt || null,
         savedAt: new Date().toISOString(),
       });
@@ -202,25 +196,12 @@ function create(msg, ws, cfg) {
     return;
   }
 
-  // If a role was selected, store identity on session and queue prompt injection
-  if (msg.roleId) {
-    const role = (cfg.roles || []).find(r => r.id === msg.roleId);
-    if (role) {
-      const s = sessions.get(id);
-      if (s) {
-        s.roleName = role.name;
-        if (role.instructions) s.pendingRolePrompt = role.instructions;
-      }
-    }
-  }
-
-  const createdPresetId = PRESETS.find(p => binName(p.command) === binName(cmd.command))?.presetId || 'shell';
+  const createdPresetId = presetForCommand(cmd)?.presetId || 'shell';
   const installId = msg.installId || undefined;
   broadcast({ type: 'created', id, name, themeId, commandId: cmd.id, presetId: createdPresetId, projectId, installId });
 
   // Immediate setup notification if config not detected
-  const bin = binName(cmd.command);
-  const preset = PRESETS.find(p => binName(p.command) === bin);
+  const preset = presetForCommand(cmd);
   if (preset && (preset.telemetrySetup || preset.bridge) && !(cmd.telemetryEnabled && cmd.telemetryStatus?.ok)) {
     broadcast({ type: 'session.needsSetup', id });
   }
@@ -245,10 +226,9 @@ function createProgrammatic(opts, cfg) {
   if (err) return { error: err.message };
 
   const s = sessions.get(id);
-  if (s && opts.roleName) s.roleName = opts.roleName;
   if (s && opts.ephemeral) s.ephemeral = true;
 
-  const presetId = PRESETS.find(p => binName(p.command) === binName(cmd.command))?.presetId || 'shell';
+  const presetId = presetForCommand(cmd)?.presetId || 'shell';
   broadcast({ type: 'created', id, name, themeId, commandId: cmd.id, presetId, projectId });
   return { id };
 }
@@ -292,14 +272,13 @@ function resume(msg, ws, cfg) {
   const s = sessions.get(id);
   if (s) {
     if (saved.muted) s.muted = true;
-    if (saved.roleName) s.roleName = saved.roleName;
   }
 
   // Remove from resumable list and notify all clients
   resumable = resumable.filter(s => s.id !== id);
   broadcast({ type: 'sessions.resumable', list: getResumable(cfg) });
 
-  const resumePresetId = PRESETS.find(p => binName(p.command) === binName(cmd.command))?.presetId || saved.presetId || 'shell';
+  const resumePresetId = presetForCommand(cmd)?.presetId || saved.presetId || 'shell';
   broadcast({ type: 'created', id, name: saved.name, themeId: saved.themeId || saved.profileId || 'default', commandId: saved.commandId, presetId: resumePresetId, projectId: saved.projectId || null, muted: !!saved.muted, resumed: true, lastPreview: saved.lastPreview || '' });
 }
 
@@ -386,7 +365,7 @@ function restart(msg, ws, cfg) {
   }
 
   const savedToken = s.sessionToken;
-  const { name, cwd, commandId, projectId, roleName, muted, lastPreview, lastActivityAt } = s;
+  const { name, cwd, commandId, projectId, muted, lastPreview, lastActivityAt } = s;
 
   activity.clear(id);
   telemetry.clear(id);
@@ -405,7 +384,6 @@ function restart(msg, ws, cfg) {
 
   const next = sessions.get(id);
   if (next) {
-    next.roleName = roleName || null;
     next.muted = !!muted;
     next.lastPreview = lastPreview || '';
     next.lastActivityAt = lastActivityAt || null;
@@ -417,7 +395,6 @@ function restart(msg, ws, cfg) {
 function list() {
   return [...sessions].map(([id, s]) => ({
     id, name: s.name, themeId: s.themeId, commandId: s.commandId, presetId: s.presetId || 'shell', projectId: s.projectId, muted: !!s.muted,
-    roleName: s.roleName || null,
     // Last preview text for sidebar display on reconnect
     lastPreview: s.lastPreview || '', lastActivityAt: s.lastActivityAt || null,
     menu: s._menuKey ? JSON.parse(s._menuKey) : undefined,
@@ -445,13 +422,18 @@ function getResumable(cfg) {
     if (s.presetId) return s;
     const cmd = (cfg.commands || []).find(c => c.id === s.commandId);
     if (!cmd) return { ...s, presetId: 'shell' };
-    const preset = PRESETS.find(p => binName(p.command) === binName(cmd.command));
+    const preset = presetForCommand(cmd);
     return { ...s, presetId: preset?.presetId || 'shell' };
   });
 }
 
 function sendBuffers(ws) {
   for (const [id, s] of sessions) {
+    if (s.chunks.length) {
+      const data = s.chunks.join('');
+      ws.send(JSON.stringify({ type: 'output', id, data, replay: true }));
+      continue;
+    }
     if (['claude-code', 'codex', 'gemini-cli', 'opencode', 'clideck-agent'].includes(s.presetId) && !s.working) {
       const text = transcript.getReplayText(id, s.presetId);
       if (text) {
@@ -459,10 +441,6 @@ function sendBuffers(ws) {
         continue;
       }
     }
-    if (s.chunks.length) {
-      const data = s.chunks.join('');
-      ws.send(JSON.stringify({ type: 'output', id, data, replay: true }));
-    }
   }
 }
 
@@ -486,7 +464,6 @@ function saveSessions(cfg) {
     .map(([id, s]) => ({
       id, name: s.name, commandId: s.commandId, presetId: s.presetId || 'shell', cwd: s.cwd,
       themeId: s.themeId, sessionToken: s.sessionToken, projectId: s.projectId, muted: !!s.muted,
-      roleName: s.roleName || null,
       lastPreview: s.lastPreview || '', lastActivityAt: s.lastActivityAt || null,
       savedAt: new Date().toISOString(),
     }));

package/transcript.js

@@ -226,9 +226,13 @@ function getTurns(id, n, order) {
 
 function getCache() { return { ...cache }; }
 
+function hasSettledReplay(entries) {
+  return entries?.some(e => e.role === 'agent') && entries[entries.length - 1]?.role === 'agent';
+}
+
 function getReplayText(id, presetId) {
   const entries = builder.compactEntries(entriesById[id], presetId);
-  if (!entries?.length) return '';
+  if (!hasSettledReplay(entries)) return '';
   const marks = {
     'claude-code': { user: '❯', agent: '⏺' },
     codex: { user: '›', agent: '•' },

package/public/js/roles.js

@@ -1,112 +0,0 @@
-// Roles panel — manage worker role definitions (core feature, not plugin-specific)
-import { state, send } from './state.js';
-import { esc } from './utils.js';
-
-const panel = document.getElementById('panel-roles');
-
-function getRoles() { return state.cfg.roles || []; }
-
-function save() { send({ type: 'config.update', config: state.cfg }); }
-
-export function renderRoles() {
-  const roles = getRoles();
-  panel.innerHTML = `
-    <div class="flex items-center justify-between px-3 pt-3 pb-2">
-      <span class="text-sm font-bold text-slate-200 tracking-tight" style="font-family:'JetBrains Mono',monospace">Roles</span>
-      <button id="btn-add-role" class="icon-btn w-7 h-7 flex items-center justify-center rounded-md border border-slate-600 text-slate-400 hover:bg-slate-700 hover:text-slate-200 transition-colors text-sm" title="New role">+</button>
-    </div>
-    <div id="roles-list" class="tmx-scroll flex-1 overflow-y-auto border-t border-slate-700/50"></div>`;
-
-  panel.querySelector('#btn-add-role').addEventListener('click', () => openEditor());
-
-  const list = panel.querySelector('#roles-list');
-  list.addEventListener('click', (e) => {
-    if (e.target.closest('.role-edit')) {
-      const idx = +e.target.closest('.role-row').dataset.idx;
-      openEditor(idx);
-      return;
-    }
-    if (e.target.closest('.role-del')) {
-      const idx = +e.target.closest('.role-row').dataset.idx;
-      state.cfg.roles.splice(idx, 1);
-      save();
-      renderRoles();
-      return;
-    }
-  });
-
-  renderRoleList(roles);
-}
-
-function renderRoleList(roles) {
-  const list = panel.querySelector('#roles-list');
-  if (!roles.length) {
-    list.innerHTML = `<div class="flex flex-col items-center justify-center h-full px-6 text-center">
-      <p class="text-sm text-slate-400 mb-1">No roles defined</p>
-      <p class="text-xs text-slate-600 leading-relaxed">Define agent identities with a name and instructions.<br>Roles are sent to the agent when a session starts<br>and can be used by plugins like Autopilot.</p>
-    </div>`;
-    return;
-  }
-  list.innerHTML = roles.map((r, idx) => `
-    <div class="role-row group flex items-start gap-2 px-3 py-2.5 cursor-default hover:bg-slate-800/40 transition-colors ${idx > 0 ? 'border-t border-slate-700/30' : ''}" data-idx="${idx}">
-      <div class="flex-1 min-w-0">
-        <div class="text-[13px] font-medium text-slate-200 truncate">${esc(r.name)}</div>
-        <div class="text-[11px] text-slate-500 mt-0.5 line-clamp-2 leading-relaxed">${esc(r.instructions)}</div>
-      </div>
-      <div class="flex items-center gap-0.5 opacity-0 group-hover:opacity-100 transition-opacity flex-shrink-0 mt-0.5">
-        <button class="role-edit w-6 h-6 flex items-center justify-center rounded text-slate-500 hover:text-slate-300 hover:bg-slate-700/60 transition-colors" title="Edit">
-          <svg class="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="1.5"><path d="M17 3a2.85 2.85 0 1 1 4 4L7.5 20.5 2 22l1.5-5.5Z"/></svg>
-        </button>
-        <button class="role-del w-6 h-6 flex items-center justify-center rounded text-slate-500 hover:text-red-400 hover:bg-slate-700/60 transition-colors" title="Delete">
-          <svg class="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="1.5"><path d="M18 6L6 18M6 6l12 12"/></svg>
-        </button>
-      </div>
-    </div>
-  `).join('');
-}
-
-function closeEditor() { document.getElementById('role-editor')?.remove(); }
-
-function openEditor(idx) {
-  if (document.getElementById('role-editor')) { closeEditor(); if (idx == null) return; }
-  const existing = idx != null ? getRoles()[idx] : null;
-
-  const card = document.createElement('div');
-  card.id = 'role-editor';
-  card.className = 'p-3 border-b border-slate-700/50 bg-slate-800/30';
-  card.innerHTML = `
-    <input id="re-name" type="text" maxlength="40" placeholder="Role name" value="${esc(existing?.name || '')}"
-      class="w-full px-3 py-2 text-sm bg-slate-900 border border-slate-700 rounded-md text-slate-200 placeholder-slate-500 outline-none focus:border-blue-500 transition-colors mb-2">
-    <textarea id="re-instructions" rows="4" placeholder="Who am I? e.g. You are a senior software architect. You break down goals into clear, actionable tasks with acceptance criteria."
-      class="w-full max-w-full px-3 py-1.5 text-xs bg-slate-900 border border-slate-700 rounded-md text-slate-200 placeholder-slate-600 outline-none focus:border-blue-500 transition-colors resize-y leading-relaxed font-mono mb-2" style="min-height:5lh">${esc(existing?.instructions || '')}</textarea>
-    <div class="flex items-center gap-2">
-      <button id="re-save" class="px-4 py-1.5 text-xs font-medium bg-blue-600 hover:bg-blue-500 text-white rounded-md transition-colors">${existing ? 'Save' : 'Add'}</button>
-      <button id="re-cancel" class="px-3 py-1.5 text-xs text-slate-500 hover:text-slate-300 transition-colors">Cancel</button>
-    </div>`;
-
-  const list = panel.querySelector('#roles-list');
-  list.parentElement.insertBefore(card, list);
-
-  const nameEl = card.querySelector('#re-name');
-  const instrEl = card.querySelector('#re-instructions');
-  nameEl.focus();
-
-  const doSave = () => {
-    const name = nameEl.value.trim();
-    const instructions = instrEl.value.trim();
-    if (!name || !instructions) return;
-    if (!state.cfg.roles) state.cfg.roles = [];
-    if (idx != null) {
-      state.cfg.roles[idx] = { ...state.cfg.roles[idx], name, instructions };
-    } else {
-      state.cfg.roles.push({ id: crypto.randomUUID(), name, instructions });
-    }
-    save();
-    closeEditor();
-    renderRoles();
-  };
-
-  card.querySelector('#re-save').addEventListener('click', doSave);
-  card.querySelector('#re-cancel').addEventListener('click', closeEditor);
-  nameEl.addEventListener('keydown', (e) => { if (e.key === 'Escape') closeEditor(); });
-}