loadtoagent 1.3.7 → 1.3.8

package/renderer/styles-control-room.css

@@ -344,6 +344,14 @@
   font-variant-numeric: tabular-nums;
 }
 
+.control-room-project-toolbar .workspace-live-state b {
+  display: inline;
+}
+
+.control-room-project-toolbar .workspace-item.has-live-sessions {
+  border-color: rgba(76,227,154,.28);
+}
+
 .control-room-project-toolbar .workspace-item:hover {
   border-color: rgba(89,216,255,.38);
   background: rgba(89,216,255,.065);
@@ -489,63 +497,39 @@
   min-height: 40px !important;
 }
 
-.control-room-pagination {
+.control-room-disclosure-actions {
   display: flex;
   flex: 0 0 auto;
   align-items: center;
   gap: 10px;
 }
 
-.control-room-page-summary {
-  min-width: 76px;
-  color: #c3d0d8;
-  text-align: center;
-  white-space: nowrap;
-  font-size: 12px;
-  font-variant-numeric: tabular-nums;
-}
-
-.control-room-page-buttons {
-  display: flex;
-  flex: 0 0 auto;
-  gap: 10px;
-}
-
-.control-room-page-buttons button {
-  width: 40px;
+.control-room-disclosure-actions button {
   height: 40px;
-  min-width: 40px;
+  min-width: 76px;
   min-height: 40px !important;
-  display: grid;
-  place-items: center;
+  padding: 0 12px;
   border: 1px solid rgba(104,130,151,.28);
+  border-radius: 8px;
   background: rgba(11,18,27,.88);
   color: #a8b7c4;
+  font-size: 12px;
   cursor: pointer;
 }
 
-.control-room-page-buttons button:first-child {
-  border-radius: 8px;
-}
-
-.control-room-page-buttons button:last-child {
-  margin-left: 0;
-  border-radius: 8px;
-}
-
-.control-room-page-buttons button:hover:not(:disabled) {
+.control-room-disclosure-actions button:hover:not(:disabled) {
   border-color: rgba(89,216,255,.45);
   color: #80e6f4;
 }
 
-.control-room-page-buttons button:disabled {
+.control-room-disclosure-actions button:disabled {
   opacity: .36;
   cursor: default;
 }
 
-#controlRoomPagePrev,
-#controlRoomPageNext {
-  min-width: 40px;
+#controlRoomExpandAll,
+#controlRoomCollapseAll {
+  min-width: 76px;
   min-height: 40px !important;
 }
 
@@ -693,6 +677,7 @@ body details.control-room-project-group > summary.control-project-header {
   display: grid;
   place-items: center;
   color: #718597;
+  cursor: grab;
 }
 
 .control-project-handle::before {
@@ -803,10 +788,6 @@ body details.control-room-project-group > summary.control-project-header {
   margin-top: 0;
 }
 
-.control-room-project-group:not([open]) .control-project-handle {
-  display: none;
-}
-
 .control-room-project-group:not([open]) .control-project-heading {
   padding-left: 10px;
 }
@@ -815,6 +796,36 @@ body details.control-room-project-group > summary.control-project-header {
   display: none;
 }
 
+.control-room-project-group.project-sort-dragging {
+  opacity: .48;
+}
+
+.control-room-project-group[data-project-drop-edge]::after {
+  position: absolute;
+  z-index: 9;
+  right: 12px;
+  left: 12px;
+  height: 3px;
+  border-radius: 999px;
+  background: #64e2b5;
+  box-shadow: 0 0 0 3px rgba(100,226,181,.13),0 0 16px rgba(100,226,181,.55);
+  content: "";
+  pointer-events: none;
+}
+
+.control-room-project-group[data-project-drop-edge="top"]::after {
+  top: 3px;
+}
+
+.control-room-project-group[data-project-drop-edge="bottom"]::after {
+  bottom: 3px;
+}
+
+.control-project-header[draggable="true"]:active,
+.control-room-project-group.project-sort-dragging .control-project-header {
+  cursor: grabbing;
+}
+
 .control-room-session {
   --provider: #7ddcf2;
   position: relative;
@@ -2020,7 +2031,7 @@ body details.control-room-project-group > summary.control-project-header {
 
   .control-room-list-toolbar {
     gap: 10px;
-    flex-wrap: nowrap;
+    flex-wrap: wrap;
   }
 
   .control-room-toolbar-spacer,
@@ -2042,13 +2053,13 @@ body details.control-room-project-group > summary.control-project-header {
 
   #controlRoomListToolbar select,
   #controlRoomSearchBtn,
-  #controlRoomPagePrev,
-  #controlRoomPageNext {
+  #controlRoomExpandAll,
+  #controlRoomCollapseAll {
     min-height: 44px !important;
   }
 
   .control-room-search,
-  .control-room-page-buttons button {
+  .control-room-disclosure-actions button {
     height: 44px;
     min-height: 44px !important;
   }
@@ -2062,6 +2073,16 @@ body details.control-room-project-group > summary.control-project-header {
     flex: 1 1 180px;
   }
 
+  .control-room-disclosure-actions {
+    display: grid;
+    flex: 1 1 100%;
+    grid-template-columns: repeat(2,minmax(0,1fr));
+  }
+
+  .control-room-disclosure-actions button {
+    width: 100%;
+  }
+
   .control-room-search button {
     width: 40px;
     height: 38px;

package/renderer/terminal-agent.js

@@ -132,6 +132,19 @@ window.LoadToAgentTerminalAgentActions = function createModule(context) {
     if (!support.supported) throw new Error(support.reason);
     const cwd = String(agentSession.cwd || preferredWorkspace() || '').trim();
     if (!cwd) throw new Error(t('terminal.agent.cwd_missing'));
+    const environment = agentSession.environment || {};
+    const tmuxPresence = (agentSession.runtimePresence || []).find(item => item.kind === 'tmux') || {};
+    const tmuxPresenceId = String(tmuxPresence.id || '');
+    const distroFromPresenceId = tmuxPresenceId.startsWith('tmux:')
+      ? tmuxPresenceId.slice(5, tmuxPresenceId.lastIndexOf(':'))
+      : '';
+    const wslCwd = state.platform.id === 'win32'
+      && (environment.kind === 'wsl' || /^\/(?:mnt|home|root|workspace)(?:\/|$)/.test(cwd));
+    const distro = wslCwd
+      ? String(environment.distro || tmuxPresence.distro || distroFromPresenceId
+        || (state.wslDistros.length === 1 ? state.wslDistros[0] : '')).trim()
+      : '';
+    if (wslCwd && !distro) throw new Error(t('terminal.agent.wsl_distro_missing'));
     const prompt = String(draft || '').trim();
     const title = t('terminal.agent.resume_title', {
       provider: providerLabel(agentSession.provider),
@@ -142,6 +155,7 @@ window.LoadToAgentTerminalAgentActions = function createModule(context) {
       provider: support.provider,
       args: resumeLaunchArgs(support, sendDraft ? prompt : '', { background: options.focus === false }),
       cwd,
+      distro,
       bridgeId: agentSession.id,
       title,
       transient: options.focus === false,

package/src/agentMonitor/claudeParser.js

@@ -85,6 +85,15 @@ function createClaudeParser(dependencies) {
     return /^(?:Agent|Task)$/i.test(String(name || ''));
   }
 
+  function isClaudeMessageTool(name) {
+    return /^(?:SendMessage|send_message)$/i.test(String(name || ''));
+  }
+
+  function claudeChildId(value) {
+    const externalId = compactText(value, 180).replace(/^claude:/i, '');
+    return externalId ? `claude:${externalId}` : '';
+  }
+
   function addClaudeCommunication(session, event) {
     const communications = session.collaboration.communications;
     const row = {
@@ -103,8 +112,10 @@ function createClaudeParser(dependencies) {
     if (!communications.some(item => item.id === row.id)) communications.push(row);
   }
 
-  function findClaudeSpawn(session, callId) {
-    return session.collaboration.spawns.find(record => record.callId === String(callId || ''));
+  function findClaudeSpawn(session, callId, childExternalId = '') {
+    const childId = claudeChildId(childExternalId);
+    return session.collaboration.spawns.find(record => record.callId === String(callId || '')
+      || (childId && (record.childId === childId || record.agentPath === childId)));
   }
 
   function recordClaudeAgentCall(session, state, row, callId, args) {
@@ -143,14 +154,16 @@ function createClaudeParser(dependencies) {
   }
 
   function updateClaudeSpawn(session, callId, details = {}) {
-    const record = findClaudeSpawn(session, callId);
+    const record = findClaudeSpawn(session, callId, details.childExternalId);
     if (!record) return;
     const childExternalId = compactText(details.childExternalId, 180);
     if (childExternalId) {
-      record.childId = `claude:${childExternalId}`;
+      record.childId = claudeChildId(childExternalId);
       record.agentPath = record.childId;
     }
     if (details.status) record.status = details.status;
+    if (details.startedAt) record.lastSentAt = timestamp(details.startedAt, record.lastSentAt || record.startedAt);
+    if (details.status === 'running') record.completedAt = null;
     if (details.completedAt) record.completedAt = timestamp(details.completedAt, record.completedAt || session.updatedAt);
     if (details.result) record.result = compactText(details.result, 6000);
     for (const communication of session.collaboration.communications) {
@@ -170,9 +183,10 @@ function createClaudeParser(dependencies) {
         timestamp: record.startedAt,
       });
     }
-    if (record.completedAt && !session.collaboration.communications.some(item => item.id === `result:${record.callId}`)) {
+    const resultCallId = String(details.resultCallId || record.callId);
+    if (record.completedAt && !session.collaboration.communications.some(item => item.id === `result:${resultCallId}`)) {
       addClaudeCommunication(session, {
-        id: `result:${record.callId}`,
+        id: `result:${resultCallId}`,
         kind: 'result',
         label: '결과 반환 확인',
         from: record.agentPath || record.taskName,
@@ -185,9 +199,60 @@ function createClaudeParser(dependencies) {
     }
   }
 
+  function recordClaudeMessageCall(session, state, row, callId, args) {
+    const target = compactText(args.to || args.recipient || args.agent_id || args.agentId || args.task_id || args.taskId, 180);
+    const childId = claudeChildId(target);
+    const record = findClaudeSpawn(session, '', target);
+    const messageType = String(args.type || '').toLowerCase();
+    const kind = /interrupt|cancel|shutdown|stop/.test(messageType) ? 'interrupt' : 'followup';
+    const text = compactText(args.message || args.content || args.prompt, 6000);
+    const taskName = record && record.taskName || compactText(args.summary, 180);
+    state.claudeMessageCalls.set(String(callId), { target, childId, kind, text, taskName });
+    if (record && kind === 'followup') {
+      updateClaudeSpawn(session, callId, {
+        childExternalId: target,
+        status: 'running',
+        startedAt: row.timestamp,
+      });
+    }
+    addClaudeCommunication(session, {
+      id: `${kind}:${callId}`,
+      kind,
+      label: kind === 'interrupt' ? '서브에이전트 중단 요청' : '후속 메시지 전달',
+      from: session.agentPath || session.id,
+      to: childId || target,
+      taskName,
+      childId,
+      text,
+      timestamp: row.timestamp,
+    });
+  }
+
+  function recordClaudeMessageToolResult(session, state, item, at) {
+    const callId = String(item.tool_use_id || '');
+    const messageCall = state.claudeMessageCalls.get(callId);
+    if (!messageCall) return;
+    const output = compactText(item.content || item, 12000);
+    const resumed = output.match(/"resumedAgentId"\s*:\s*"([^"]+)"/i)
+      || output.match(/\bAgent\s+"([^"]+)"\s+had no active task/i);
+    const target = resumed && resumed[1] || messageCall.target;
+    updateClaudeSpawn(session, callId, {
+      childExternalId: target,
+      status: item.is_error === true || /"success"\s*:\s*false/i.test(output)
+        ? 'failed'
+        : (messageCall.kind === 'interrupt' ? 'cancelled' : 'running'),
+      startedAt: at,
+    });
+  }
+
   function recordClaudeAgentToolResult(session, state, item, at) {
     const call = state.toolCalls.get(String(item.tool_use_id || ''));
-    if (!call || !isClaudeAgentTool(call.name)) return;
+    if (!call) return;
+    if (isClaudeMessageTool(call.name)) {
+      recordClaudeMessageToolResult(session, state, item, at);
+      return;
+    }
+    if (!isClaudeAgentTool(call.name)) return;
     const output = compactText(item.content || item, 12000);
     const agentId = output.match(/\bagentId:\s*([A-Za-z0-9_-]+)/i);
     const launched = /agent launched successfully|working in the background/i.test(output);
@@ -200,14 +265,16 @@ function createClaudeParser(dependencies) {
     });
   }
 
-  function recordClaudeTaskCompletion(session, notification, at) {
+  function recordClaudeTaskCompletion(session, state, notification, at) {
     if (!notification) return;
     const resultMatch = notification.text.match(/<result>([\s\S]*?)<\/result>/i);
+    const messageCall = state.claudeMessageCalls.get(String(notification.toolUseId || ''));
     updateClaudeSpawn(session, notification.toolUseId, {
       childExternalId: notification.taskId,
       status: notification.status === 'completed' ? 'completed' : notification.status,
       completedAt: at,
       result: resultMatch ? resultMatch[1].trim() : '',
+      resultCallId: messageCall ? notification.toolUseId : undefined,
     });
   }
 
@@ -223,6 +290,7 @@ function createClaudeParser(dependencies) {
       const args = item.input && typeof item.input === 'object' ? item.input : {};
       state.toolCalls.set(String(callId), { name, args });
       if (isClaudeAgentTool(name)) recordClaudeAgentCall(session, state, row, callId, args);
+      if (isClaudeMessageTool(name)) recordClaudeMessageCall(session, state, row, callId, args);
       state.executionTracker.recordCall({ name, callId, args, rawInput: item.input, at: row.timestamp });
       addMessage(session, {
         id,
@@ -305,7 +373,7 @@ function createClaudeParser(dependencies) {
     content.filter(item => item && (!item.type || item.type === 'text'))
       .forEach((item) => {
         const notification = recordTaskNotification(state, typeof item === 'string' ? item : item.text, row.timestamp);
-        recordClaudeTaskCompletion(session, notification, row.timestamp);
+        recordClaudeTaskCompletion(session, state, notification, row.timestamp);
       });
     if (session.depth && role === 'user') state.subagentCompletedAt = null;
     content.forEach((item, index) => {
@@ -367,6 +435,7 @@ function createClaudeParser(dependencies) {
       pendingUserInputCalls: new Set(),
       toolCalls: new Map(),
       executionTracker: createExecutionTracker({ compactText, timestamp }),
+      claudeMessageCalls: new Map(),
       latestTs: session.updatedAt,
       lastTurnFinished: false,
       subagentCompletedAt: null,
@@ -379,7 +448,7 @@ function createClaudeParser(dependencies) {
       if (row.agentId && session.depth) session.agentName = row.agentId;
       if (row.type === 'queue-operation' && row.operation === 'enqueue' && row.content) {
         const notification = recordTaskNotification(state, row.content, row.timestamp);
-        recordClaudeTaskCompletion(session, notification, row.timestamp);
+        recordClaudeTaskCompletion(session, state, notification, row.timestamp);
         const detectedUtility = utilityKind(row.content);
         if (detectedUtility) session.utilityKind = detectedUtility;
         const visibleUser = visibleUserText(row.content);
@@ -430,6 +499,7 @@ function createClaudeParser(dependencies) {
     session.context = contextInfo(currentInput, modelContextWindow('claude', session.model, 0));
     const age = Date.now() - fileInfo.mtimeMs;
     const pendingUserInput = state.pendingUserInputCalls.size > 0;
+    const activeSubagents = session.collaboration.spawns.filter(record => record.status === 'running');
     const conversationalInput = state.lastConversationRole === 'assistant'
       && assistantRequestsUserResponse(state.lastAssistantText)
       && (state.lastTurnFinished || age >= ACTIVE_THRESHOLD_MS);
@@ -443,6 +513,11 @@ function createClaudeParser(dependencies) {
     } else if (!session.depth && (pendingUserInput || conversationalInput)) {
       session.status = 'waiting';
       session.statusDetail = pendingUserInput ? '선택 또는 입력 대기' : '답변 또는 선택 대기';
+    } else if (!session.depth && activeSubagents.length) {
+      session.status = 'running';
+      session.statusDetail = activeSubagents.length === 1
+        ? '서브에이전트 작업 진행 중'
+        : `서브에이전트 ${activeSubagents.length}개 작업 진행 중`;
     } else if (age < STALE_TURN_THRESHOLD_MS && !state.lastTurnFinished) {
       session.status = 'running';
       session.statusDetail = state.lastRole === 'user' ? '응답 생성 중' : '도구 실행 또는 스트리밍 중';

package/src/agentMonitor/hierarchy.js

@@ -114,9 +114,14 @@ function createHierarchyAttacher(dependencies) {
     record.taskName = record.taskName || child.taskName || collaborationTaskName(child.agentPath);
     record.agentName = child.agentName || record.agentName;
     record.result = record.result || child.result || '';
-    if (child.status === 'running' || child.status === 'starting') record.status = 'running';
+    const lastSentAt = Date.parse(record.lastSentAt || 0);
+    const childCompletedAt = Date.parse(child.completedAt || 0);
+    const followupStillNewer = record.status === 'running'
+      && Number.isFinite(lastSentAt)
+      && (!Number.isFinite(childCompletedAt) || lastSentAt > childCompletedAt);
+    if (child.status === 'running' || child.status === 'starting' || followupStillNewer) record.status = 'running';
     else if (child.status === 'completed' || child.completionObserved || record.result) record.status = 'completed';
-    if (!record.completedAt && child.completedAt) record.completedAt = child.completedAt;
+    if (!record.completedAt && child.completedAt && !followupStillNewer) record.completedAt = child.completedAt;
 
     const retained = retainedByTask.get(record.taskName);
     record.currentlyRetained = Boolean(retained);

package/src/agentMonitor.js

@@ -406,6 +406,59 @@ function isProjectlessSession(session) {
     && /(?:^|\/)Documents\/Codex\/\d{4}-\d{2}-\d{2}\/new-chat$/i.test(normalized);
 }
 
+function mergeObservedRows(historyRows = [], managedRows = []) {
+  const rows = [];
+  const ids = new Map();
+  const signatures = new Set();
+  for (const row of [...historyRows, ...managedRows]) {
+    if (!row) continue;
+    const id = String(row.id || row.callId || row.path || '');
+    const signature = [
+      row.role || row.type || '',
+      compactText(row.text || row.detail || row.label || row.assignment || row.taskName || row.result, 6000),
+      timestamp(row.timestamp || row.updatedAt || row.startedAt, ''),
+    ].join('\u0000');
+    if (id && ids.has(id)) {
+      Object.assign(rows[ids.get(id)], row);
+      continue;
+    }
+    if (signatures.has(signature)) continue;
+    if (id) ids.set(id, rows.length);
+    signatures.add(signature);
+    rows.push(structuredClone(row));
+  }
+  return rows.sort((left, right) =>
+    Date.parse(left.timestamp || left.updatedAt || left.startedAt || 0)
+    - Date.parse(right.timestamp || right.updatedAt || right.startedAt || 0));
+}
+
+function mergeManagedWithHistory(history, managed) {
+  if (!history) return managed;
+  if (!managed) return history;
+  const historyCollaboration = history.collaboration || {};
+  const managedCollaboration = managed.collaboration || {};
+  const collaboration = {
+    ...managedCollaboration,
+    ...historyCollaboration,
+    capacity: Number(historyCollaboration.capacity && historyCollaboration.capacity.totalThreads || 0)
+      ? historyCollaboration.capacity
+      : managedCollaboration.capacity,
+    spawns: mergeObservedRows(historyCollaboration.spawns, managedCollaboration.spawns),
+    communications: mergeObservedRows(historyCollaboration.communications, managedCollaboration.communications),
+    retainedAgents: mergeObservedRows(historyCollaboration.retainedAgents, managedCollaboration.retainedAgents),
+  };
+  return {
+    ...history,
+    ...managed,
+    historyFile: history.historyFile || history.file || '',
+    messages: mergeObservedRows(history.messages, managed.messages),
+    lifecycle: mergeObservedRows(history.lifecycle, managed.lifecycle),
+    executions: (history.executions || []).length ? history.executions : (managed.executions || []),
+    childIds: [...new Set([...(history.childIds || []), ...(managed.childIds || [])])],
+    collaboration,
+  };
+}
+
 const attachHierarchy = createHierarchyAttacher({
   addMessage,
   baseSession,
@@ -516,6 +569,19 @@ class AgentMonitor extends EventEmitter {
     let detailed = null;
     if (stored.source === 'loadtoagent' && stored.runId && this.runsDir) {
       detailed = parseManagedSession(path.join(this.runsDir, stored.runId), { fullHistory: true });
+      if (stored.historyFile) {
+        const historyStat = safeStat(stored.historyFile);
+        if (historyStat && historyStat.isFile()) {
+          const historyInfo = { file: stored.historyFile, mtimeMs: historyStat.mtimeMs, size: historyStat.size };
+          const historyParser = stored.provider === 'claude'
+            ? item => parseClaude(item, { fullHistory: true })
+            : stored.provider === 'codex'
+              ? item => parseCodex(item, { fullHistory: true })
+              : item => parseGeneric(item, stored.provider, { fullHistory: true });
+          const historyDetail = this.parseFile(historyInfo, historyParser, 'full-history');
+          detailed = mergeManagedWithHistory(historyDetail, detailed);
+        }
+      }
     } else if (stored.file) {
       const stat = safeStat(stored.file);
       if (stat && stat.isFile()) {
@@ -609,7 +675,9 @@ class AgentMonitor extends EventEmitter {
         const existing = byId.get(session.id);
         if (!existing || Date.parse(session.updatedAt || 0) > Date.parse(existing.updatedAt || 0)) byId.set(session.id, session);
       }
-      for (const session of managed) byId.set(session.id, session);
+      for (const session of managed) {
+        byId.set(session.id, mergeManagedWithHistory(byId.get(session.id), session));
+      }
       const merged = [...byId.values()]
         .map(session => {
           const originCwd = session.originCwd || session.cwd || '';
@@ -653,4 +721,5 @@ module.exports = {
   buildSummary,
   contextInfo,
   attachHierarchy,
+  mergeManagedWithHistory,
 };

package/src/processMonitor.js

@@ -410,6 +410,11 @@ function applyRuntimePresence(agentSessions, tmuxSnapshot, processSnapshot, now
             id: `tmux:${distro.name}:${pane.nativeId}`,
             kind: 'tmux',
             label: `${distro.name} · ${tmuxSession.name} · pane ${pane.index}`,
+            distro: distro.name,
+            sessionId: tmuxSession.id,
+            sessionName: tmuxSession.name,
+            paneId: pane.id,
+            paneNativeId: pane.nativeId,
             provider: agent.provider,
             pid: agent.pid,
             startedAt: agent.startedAt,

package/src/terminalHost.js

@@ -10,7 +10,7 @@ const { spawn } = require('child_process');
 const { endpointFor, safeWriteJson } = require('./bridgeServer');
 const { runBestEffort } = require('./diagnostics');
 
-const TERMINAL_HOST_PROTOCOL = 2;
+const TERMINAL_HOST_PROTOCOL = 3;
 const TERMINAL_HOST_RUNTIME = `node-pty-${require('node-pty/package.json').version}`;
 const MAX_FRAME_CHARS = 4 * 1024 * 1024;
 const AUTH_TIMEOUT_MS = 5_000;

package/src/terminalManager.js

@@ -120,10 +120,11 @@ function normalizeLaunchOptions(options = {}, platform = process.platform) {
   const type = TERMINAL_TYPES.has(options.type) ? options.type : fallbackType;
   const suppliedCwd = String(options.cwd || '').trim();
   const localCwd = suppliedCwd || os.homedir();
-  if (['powershell', 'cmd', 'shell', 'agent'].includes(type) && (!fs.existsSync(localCwd) || !fs.statSync(localCwd).isDirectory())) {
+  const distro = cleanText(options.distro, 100);
+  const wslAgent = platform === 'win32' && type === 'agent' && Boolean(distro);
+  if (['powershell', 'cmd', 'shell', 'agent'].includes(type) && !wslAgent && (!fs.existsSync(localCwd) || !fs.statSync(localCwd).isDirectory())) {
     throw new Error(`작업 폴더를 찾을 수 없습니다: ${localCwd}`);
   }
-  const distro = cleanText(options.distro, 100);
   if ((type === 'wsl' || type === 'tmux') && !distro) throw new Error(type === 'tmux' ? 'tmux 환경을 선택하세요.' : 'WSL 배포판을 선택하세요.');
   const tmuxSession = cleanText(options.tmuxSession, 100);
   const tmuxPane = cleanText(options.tmuxPane, 100);
@@ -135,7 +136,7 @@ function normalizeLaunchOptions(options = {}, platform = process.platform) {
     : [];
   return {
     type,
-    cwd: ['powershell', 'cmd', 'shell', 'agent'].includes(type) ? path.resolve(localCwd) : suppliedCwd,
+    cwd: ['powershell', 'cmd', 'shell', 'agent'].includes(type) && !wslAgent ? path.resolve(localCwd) : suppliedCwd,
     distro,
     tmuxSession,
     tmuxPane,
@@ -162,6 +163,17 @@ function launchSpec(options, platform = process.platform, agentProviders = AGENT
   if (options.type === 'agent') {
     const provider = agentProviders[options.provider] || AGENT_PROVIDERS[options.provider];
     if (platform === 'win32') {
+      if (options.distro) {
+        const args = ['-d', options.distro];
+        if (options.cwd) args.push('--cd', options.cwd);
+        args.push('--', provider.command, ...(provider.args || []), ...options.args);
+        return {
+          file: 'wsl.exe',
+          args,
+          cwd: os.homedir(),
+          label: `${provider.label} · ${options.distro}`,
+        };
+      }
       const command = resolveWindowsCommand(provider.command);
       if (path.extname(command).toLowerCase() === '.ps1') {
         return {