claude-code-workflow 6.2.4 → 6.2.6

package/ccw/src/templates/dashboard-js/views/rules-manager.js

@@ -638,9 +638,26 @@ function addRulePath() {
 
 function removeRulePath(index) {
   ruleCreateState.paths.splice(index, 1);
-  // Re-render paths list
-  closeRuleCreateModal();
-  openRuleCreateModal();
+
+  // Re-render paths list without closing modal
+  const pathsList = document.getElementById('rulePathsList');
+  if (pathsList) {
+    pathsList.innerHTML = ruleCreateState.paths.map((path, idx) => `
+      <div class="flex gap-2">
+        <input type="text" class="rule-path-input flex-1 px-3 py-2 bg-background border border-border rounded-lg text-sm focus:outline-none focus:ring-2 focus:ring-primary"
+               placeholder="src/**/*.ts"
+               value="${path}"
+               data-index="${idx}">
+        ${idx > 0 ? `
+          <button class="px-3 py-2 text-destructive hover:bg-destructive/10 rounded-lg transition-colors"
+                  onclick="removeRulePath(${idx})">
+            <i data-lucide="x" class="w-4 h-4"></i>
+          </button>
+        ` : ''}
+      </div>
+    `).join('');
+    if (typeof lucide !== 'undefined') lucide.createIcons();
+  }
 }
 
 function switchRuleCreateMode(mode) {
@@ -674,9 +691,21 @@ function switchRuleCreateMode(mode) {
     if (contentSection) contentSection.style.display = 'block';
   }
 
-  // Re-render modal to update button states
-  closeRuleCreateModal();
-  openRuleCreateModal();
+  // Update mode button styles without re-rendering
+  const modeButtons = document.querySelectorAll('#ruleCreateModal .mode-btn');
+  modeButtons.forEach(btn => {
+    const btnText = btn.querySelector('.font-medium')?.textContent || '';
+    const isInput = btnText.includes(t('rules.manualInput'));
+    const isCliGenerate = btnText.includes(t('rules.cliGenerate'));
+
+    if ((isInput && mode === 'input') || (isCliGenerate && mode === 'cli-generate')) {
+      btn.classList.remove('border-border', 'hover:border-primary/50');
+      btn.classList.add('border-primary', 'bg-primary/10');
+    } else {
+      btn.classList.remove('border-primary', 'bg-primary/10');
+      btn.classList.add('border-border', 'hover:border-primary/50');
+    }
+  });
 }
 
 function switchRuleGenerationType(type) {

package/ccw/src/templates/dashboard-js/views/skills-manager.js

@@ -153,10 +153,11 @@ function renderSkillCard(skill, location) {
   const locationIcon = location === 'project' ? 'folder' : 'user';
   const locationClass = location === 'project' ? 'text-primary' : 'text-indigo';
   const locationBg = location === 'project' ? 'bg-primary/10' : 'bg-indigo/10';
+  const folderName = skill.folderName || skill.name;
 
   return `
     <div class="skill-card bg-card border border-border rounded-lg p-4 hover:shadow-md transition-all cursor-pointer"
-         onclick="showSkillDetail('${escapeHtml(skill.name)}', '${location}')">
+         onclick="showSkillDetail('${escapeHtml(folderName)}', '${location}')">
       <div class="flex items-start justify-between mb-3">
         <div class="flex items-center gap-3">
           <div class="w-10 h-10 ${locationBg} rounded-lg flex items-center justify-center">
@@ -198,6 +199,7 @@ function renderSkillCard(skill, location) {
 function renderSkillDetailPanel(skill) {
   const hasAllowedTools = skill.allowedTools && skill.allowedTools.length > 0;
   const hasSupportingFiles = skill.supportingFiles && skill.supportingFiles.length > 0;
+  const folderName = skill.folderName || skill.name;
 
   return `
     <div class="skill-detail-panel fixed top-0 right-0 w-1/2 max-w-xl h-full bg-card border-l border-border shadow-lg z-50 flex flex-col">
@@ -243,20 +245,54 @@ function renderSkillDetailPanel(skill) {
             </div>
           ` : ''}
 
-          <!-- Supporting Files -->
-          ${hasSupportingFiles ? `
-            <div>
-              <h4 class="text-sm font-semibold text-foreground mb-2">${t('skills.supportingFiles')}</h4>
-              <div class="space-y-2">
-                ${skill.supportingFiles.map(file => `
-                  <div class="flex items-center gap-2 p-2 bg-muted/50 rounded-lg">
-                    <i data-lucide="file-text" class="w-4 h-4 text-muted-foreground"></i>
-                    <span class="text-sm font-mono text-foreground">${escapeHtml(file)}</span>
+          <!-- Skill Files (SKILL.md + Supporting Files) -->
+          <div>
+            <h4 class="text-sm font-semibold text-foreground mb-2">${t('skills.files') || 'Files'}</h4>
+            <div class="space-y-2">
+              <!-- SKILL.md (main file) -->
+              <div class="flex items-center justify-between p-2 bg-primary/5 border border-primary/20 rounded-lg cursor-pointer hover:bg-primary/10 transition-colors"
+                   onclick="viewSkillFile('${escapeHtml(folderName)}', 'SKILL.md', '${skill.location}')">
+                <div class="flex items-center gap-2">
+                  <i data-lucide="file-text" class="w-4 h-4 text-primary"></i>
+                  <span class="text-sm font-mono text-foreground font-medium">SKILL.md</span>
+                </div>
+                <div class="flex items-center gap-1">
+                  <button class="p-1 text-primary hover:bg-primary/20 rounded transition-colors"
+                          onclick="event.stopPropagation(); editSkillFile('${escapeHtml(folderName)}', 'SKILL.md', '${skill.location}')"
+                          title="${t('common.edit')}">
+                    <i data-lucide="edit-2" class="w-3.5 h-3.5"></i>
+                  </button>
+                </div>
+              </div>
+              ${hasSupportingFiles ? skill.supportingFiles.map(file => {
+                const isDir = file.endsWith('/');
+                const dirName = isDir ? file.slice(0, -1) : file;
+                return `
+              <!-- Supporting file: ${escapeHtml(file)} -->
+              <div class="skill-file-item" data-path="${escapeHtml(dirName)}">
+                <div class="flex items-center justify-between p-2 bg-muted/50 rounded-lg cursor-pointer hover:bg-muted transition-colors"
+                     onclick="${isDir ? `toggleSkillFolder('${escapeHtml(folderName)}', '${escapeHtml(dirName)}', '${skill.location}', this)` : `viewSkillFile('${escapeHtml(folderName)}', '${escapeHtml(file)}', '${skill.location}')`}">
+                  <div class="flex items-center gap-2">
+                    <i data-lucide="${isDir ? 'folder' : 'file-text'}" class="w-4 h-4 text-muted-foreground ${isDir ? 'folder-icon' : ''}"></i>
+                    <span class="text-sm font-mono text-foreground">${escapeHtml(isDir ? dirName : file)}</span>
+                    ${isDir ? '<i data-lucide="chevron-right" class="w-3 h-3 text-muted-foreground folder-chevron transition-transform"></i>' : ''}
                   </div>
-                `).join('')}
+                  ${!isDir ? `
+                  <div class="flex items-center gap-1">
+                    <button class="p-1 text-muted-foreground hover:text-foreground hover:bg-muted rounded transition-colors"
+                            onclick="event.stopPropagation(); editSkillFile('${escapeHtml(folderName)}', '${escapeHtml(file)}', '${skill.location}')"
+                            title="${t('common.edit')}">
+                      <i data-lucide="edit-2" class="w-3.5 h-3.5"></i>
+                    </button>
+                  </div>
+                  ` : ''}
+                </div>
+                <div class="folder-contents hidden ml-4 mt-1 space-y-1"></div>
               </div>
+              `;
+              }).join('') : ''}
             </div>
-          ` : ''}
+          </div>
 
           <!-- Path -->
           <div>
@@ -269,12 +305,12 @@ function renderSkillDetailPanel(skill) {
       <!-- Actions -->
       <div class="px-5 py-4 border-t border-border flex justify-between">
         <button class="px-4 py-2 text-sm text-destructive hover:bg-destructive/10 rounded-lg transition-colors flex items-center gap-2"
-                onclick="deleteSkill('${escapeHtml(skill.name)}', '${skill.location}')">
+                onclick="deleteSkill('${escapeHtml(folderName)}', '${skill.location}')">
           <i data-lucide="trash-2" class="w-4 h-4"></i>
           ${t('common.delete')}
         </button>
         <button class="px-4 py-2 text-sm bg-primary text-primary-foreground rounded-lg hover:opacity-90 transition-opacity flex items-center gap-2"
-                onclick="editSkill('${escapeHtml(skill.name)}', '${skill.location}')">
+                onclick="editSkill('${escapeHtml(folderName)}', '${skill.location}')">
           <i data-lucide="edit" class="w-4 h-4"></i>
           ${t('common.edit')}
         </button>
@@ -525,7 +561,7 @@ function openSkillCreateModal() {
         </div>
 
         <!-- Footer -->
-        <div class="flex items-center justify-end gap-3 px-6 py-4 border-t border-border">
+        <div id="skillModalFooter" class="flex items-center justify-end gap-3 px-6 py-4 border-t border-border">
           <button class="px-4 py-2 text-sm text-muted-foreground hover:text-foreground transition-colors"
                   onclick="closeSkillCreateModal()">
             ${t('common.cancel')}
@@ -588,16 +624,76 @@ function selectSkillLocation(location) {
 
 function switchSkillCreateMode(mode) {
   skillCreateState.mode = mode;
-  // Re-render modal
-  closeSkillCreateModal();
-  openSkillCreateModal();
+
+  // Toggle visibility of mode sections
+  const importSection = document.getElementById('skillImportMode');
+  const cliGenerateSection = document.getElementById('skillCliGenerateMode');
+  const footerContainer = document.getElementById('skillModalFooter');
+
+  if (importSection) importSection.style.display = mode === 'import' ? 'block' : 'none';
+  if (cliGenerateSection) cliGenerateSection.style.display = mode === 'cli-generate' ? 'block' : 'none';
+
+  // Update mode button styles
+  const modeButtons = document.querySelectorAll('#skillCreateModal .mode-btn');
+  modeButtons.forEach(btn => {
+    const btnText = btn.querySelector('.font-medium')?.textContent || '';
+    const isImport = btnText.includes(t('skills.importFolder'));
+    const isCliGenerate = btnText.includes(t('skills.cliGenerate'));
+
+    if ((isImport && mode === 'import') || (isCliGenerate && mode === 'cli-generate')) {
+      btn.classList.remove('border-border', 'hover:border-primary/50');
+      btn.classList.add('border-primary', 'bg-primary/10');
+    } else {
+      btn.classList.remove('border-primary', 'bg-primary/10');
+      btn.classList.add('border-border', 'hover:border-primary/50');
+    }
+  });
+
+  // Update footer buttons
+  if (footerContainer) {
+    if (mode === 'import') {
+      footerContainer.innerHTML = `
+        <button class="px-4 py-2 text-sm text-muted-foreground hover:text-foreground transition-colors"
+                onclick="closeSkillCreateModal()">
+          ${t('common.cancel')}
+        </button>
+        <button class="px-4 py-2 text-sm bg-primary/10 text-primary rounded-lg hover:bg-primary/20 transition-colors"
+                onclick="validateSkillImport()">
+          ${t('skills.validate')}
+        </button>
+        <button class="px-4 py-2 text-sm bg-primary text-primary-foreground rounded-lg hover:opacity-90 transition-opacity"
+                onclick="createSkill()">
+          ${t('skills.import')}
+        </button>
+      `;
+    } else {
+      footerContainer.innerHTML = `
+        <button class="px-4 py-2 text-sm text-muted-foreground hover:text-foreground transition-colors"
+                onclick="closeSkillCreateModal()">
+          ${t('common.cancel')}
+        </button>
+        <button class="px-4 py-2 text-sm bg-primary text-primary-foreground rounded-lg hover:opacity-90 transition-opacity flex items-center gap-2"
+                onclick="createSkill()">
+          <i data-lucide="sparkles" class="w-4 h-4"></i>
+          ${t('skills.generate')}
+        </button>
+      `;
+    }
+    if (typeof lucide !== 'undefined') lucide.createIcons();
+  }
 }
 
 function switchSkillGenerationType(type) {
   skillCreateState.generationType = type;
-  // Re-render modal
-  closeSkillCreateModal();
-  openSkillCreateModal();
+
+  // Toggle visibility of description area
+  const descriptionArea = document.getElementById('skillDescriptionArea');
+  if (descriptionArea) {
+    descriptionArea.style.display = type === 'description' ? 'block' : 'none';
+  }
+
+  // Update generation type button styles (only the description button is active, template is disabled)
+  // No need to update button styles since template button is disabled
 }
 
 function browseSkillFolder() {
@@ -817,3 +913,271 @@ async function createSkill() {
     }
   }
 }
+
+
+// ========== Skill File View/Edit Functions ==========
+
+var skillFileEditorState = {
+  skillName: '',
+  fileName: '',
+  location: '',
+  content: '',
+  isEditing: false
+};
+
+async function viewSkillFile(skillName, fileName, location) {
+  try {
+    const response = await fetch(
+      '/api/skills/' + encodeURIComponent(skillName) + '/file?filename=' + encodeURIComponent(fileName) +
+      '&location=' + location + '&path=' + encodeURIComponent(projectPath)
+    );
+
+    if (!response.ok) {
+      const error = await response.json();
+      throw new Error(error.error || 'Failed to load file');
+    }
+
+    const data = await response.json();
+
+    skillFileEditorState = {
+      skillName,
+      fileName,
+      location,
+      content: data.content,
+      isEditing: false
+    };
+
+    renderSkillFileModal();
+  } catch (err) {
+    console.error('Failed to load skill file:', err);
+    if (window.showToast) {
+      showToast(err.message || t('skills.fileLoadError') || 'Failed to load file', 'error');
+    }
+  }
+}
+
+function editSkillFile(skillName, fileName, location) {
+  viewSkillFile(skillName, fileName, location).then(() => {
+    skillFileEditorState.isEditing = true;
+    renderSkillFileModal();
+  });
+}
+
+function renderSkillFileModal() {
+  // Remove existing modal if any
+  const existingModal = document.getElementById('skillFileModal');
+  if (existingModal) existingModal.remove();
+
+  const { skillName, fileName, content, isEditing, location } = skillFileEditorState;
+
+  const modalHtml = `
+    <div class="modal-overlay fixed inset-0 bg-black/50 z-[60] flex items-center justify-center" onclick="closeSkillFileModal(event)">
+      <div class="modal-dialog bg-card rounded-lg shadow-lg w-full max-w-4xl max-h-[90vh] mx-4 flex flex-col" onclick="event.stopPropagation()">
+        <!-- Header -->
+        <div class="flex items-center justify-between px-6 py-4 border-b border-border">
+          <div class="flex items-center gap-3">
+            <i data-lucide="file-text" class="w-5 h-5 text-primary"></i>
+            <div>
+              <h3 class="text-lg font-semibold text-foreground font-mono">${escapeHtml(fileName)}</h3>
+              <p class="text-xs text-muted-foreground">${escapeHtml(skillName)} / ${location}</p>
+            </div>
+          </div>
+          <div class="flex items-center gap-2">
+            ${!isEditing ? `
+              <button class="px-3 py-1.5 text-sm bg-primary/10 text-primary rounded-lg hover:bg-primary/20 transition-colors flex items-center gap-1"
+                      onclick="toggleSkillFileEdit()">
+                <i data-lucide="edit-2" class="w-4 h-4"></i>
+                ${t('common.edit')}
+              </button>
+            ` : ''}
+            <button class="w-8 h-8 flex items-center justify-center text-xl text-muted-foreground hover:text-foreground hover:bg-hover rounded"
+                    onclick="closeSkillFileModal()">&times;</button>
+          </div>
+        </div>
+
+        <!-- Content -->
+        <div class="flex-1 overflow-hidden p-4">
+          ${isEditing ? `
+            <textarea id="skillFileContent"
+                      class="w-full h-full min-h-[400px] px-4 py-3 bg-background border border-border rounded-lg text-sm font-mono focus:outline-none focus:ring-2 focus:ring-primary resize-none"
+                      spellcheck="false">${escapeHtml(content)}</textarea>
+          ` : `
+            <div class="w-full h-full min-h-[400px] overflow-auto">
+              <pre class="px-4 py-3 bg-muted/30 rounded-lg text-sm font-mono whitespace-pre-wrap break-words">${escapeHtml(content)}</pre>
+            </div>
+          `}
+        </div>
+
+        <!-- Footer -->
+        ${isEditing ? `
+          <div class="flex items-center justify-end gap-3 px-6 py-4 border-t border-border">
+            <button class="px-4 py-2 text-sm text-muted-foreground hover:text-foreground transition-colors"
+                    onclick="cancelSkillFileEdit()">
+              ${t('common.cancel')}
+            </button>
+            <button class="px-4 py-2 text-sm bg-primary text-primary-foreground rounded-lg hover:opacity-90 transition-opacity flex items-center gap-2"
+                    onclick="saveSkillFile()">
+              <i data-lucide="save" class="w-4 h-4"></i>
+              ${t('common.save')}
+            </button>
+          </div>
+        ` : ''}
+      </div>
+    </div>
+  `;
+
+  const modalContainer = document.createElement('div');
+  modalContainer.id = 'skillFileModal';
+  modalContainer.innerHTML = modalHtml;
+  document.body.appendChild(modalContainer);
+
+  if (typeof lucide !== 'undefined') lucide.createIcons();
+}
+
+function closeSkillFileModal(event) {
+  if (event && event.target !== event.currentTarget) return;
+  const modal = document.getElementById('skillFileModal');
+  if (modal) modal.remove();
+  skillFileEditorState = { skillName: '', fileName: '', location: '', content: '', isEditing: false };
+}
+
+function toggleSkillFileEdit() {
+  skillFileEditorState.isEditing = true;
+  renderSkillFileModal();
+}
+
+function cancelSkillFileEdit() {
+  skillFileEditorState.isEditing = false;
+  renderSkillFileModal();
+}
+
+async function saveSkillFile() {
+  const contentTextarea = document.getElementById('skillFileContent');
+  if (!contentTextarea) return;
+
+  const newContent = contentTextarea.value;
+  const { skillName, fileName, location } = skillFileEditorState;
+
+  try {
+    const response = await fetch('/api/skills/' + encodeURIComponent(skillName) + '/file', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        fileName,
+        content: newContent,
+        location,
+        projectPath
+      })
+    });
+
+    if (!response.ok) {
+      const error = await response.json();
+      throw new Error(error.error || 'Failed to save file');
+    }
+
+    // Update state and close edit mode
+    skillFileEditorState.content = newContent;
+    skillFileEditorState.isEditing = false;
+    renderSkillFileModal();
+
+    // Refresh skill detail if SKILL.md was edited
+    if (fileName === 'SKILL.md') {
+      await loadSkillsData();
+      // Reload current skill detail
+      if (selectedSkill) {
+        await showSkillDetail(skillName, location);
+      }
+    }
+
+    if (window.showToast) {
+      showToast(t('skills.fileSaved') || 'File saved successfully', 'success');
+    }
+  } catch (err) {
+    console.error('Failed to save skill file:', err);
+    if (window.showToast) {
+      showToast(err.message || t('skills.fileSaveError') || 'Failed to save file', 'error');
+    }
+  }
+}
+
+
+
+// ========== Skill Folder Expansion Functions ==========
+
+var expandedFolders = new Set();
+
+async function toggleSkillFolder(skillName, subPath, location, element) {
+  const fileItem = element.closest('.skill-file-item');
+  if (!fileItem) return;
+
+  const contentsDiv = fileItem.querySelector('.folder-contents');
+  const chevron = element.querySelector('.folder-chevron');
+  const folderIcon = element.querySelector('.folder-icon');
+  const folderKey = `${skillName}:${subPath}:${location}`;
+
+  if (expandedFolders.has(folderKey)) {
+    // Collapse folder
+    expandedFolders.delete(folderKey);
+    contentsDiv.classList.add('hidden');
+    contentsDiv.innerHTML = '';
+    if (chevron) chevron.style.transform = '';
+    if (folderIcon) folderIcon.setAttribute('data-lucide', 'folder');
+    if (typeof lucide !== 'undefined') lucide.createIcons();
+  } else {
+    // Expand folder
+    try {
+      const response = await fetch(
+        '/api/skills/' + encodeURIComponent(skillName) + '/dir?subpath=' + encodeURIComponent(subPath) +
+        '&location=' + location + '&path=' + encodeURIComponent(projectPath)
+      );
+
+      if (!response.ok) {
+        const error = await response.json();
+        throw new Error(error.error || 'Failed to load folder');
+      }
+
+      const data = await response.json();
+
+      expandedFolders.add(folderKey);
+      if (chevron) chevron.style.transform = 'rotate(90deg)';
+      if (folderIcon) folderIcon.setAttribute('data-lucide', 'folder-open');
+
+      // Render folder contents
+      contentsDiv.innerHTML = data.files.map(file => {
+        const filePath = file.path;
+        const isDir = file.isDirectory;
+        return `
+          <div class="skill-file-item" data-path="${escapeHtml(filePath)}">
+            <div class="flex items-center justify-between p-2 bg-muted/30 rounded-lg cursor-pointer hover:bg-muted/50 transition-colors"
+                 onclick="${isDir ? `toggleSkillFolder('${escapeHtml(skillName)}', '${escapeHtml(filePath)}', '${location}', this)` : `viewSkillFile('${escapeHtml(skillName)}', '${escapeHtml(filePath)}', '${location}')`}">
+              <div class="flex items-center gap-2">
+                <i data-lucide="${isDir ? 'folder' : 'file-text'}" class="w-4 h-4 text-muted-foreground ${isDir ? 'folder-icon' : ''}"></i>
+                <span class="text-sm font-mono text-foreground">${escapeHtml(file.name)}</span>
+                ${isDir ? '<i data-lucide="chevron-right" class="w-3 h-3 text-muted-foreground folder-chevron transition-transform"></i>' : ''}
+              </div>
+              ${!isDir ? `
+              <div class="flex items-center gap-1">
+                <button class="p-1 text-muted-foreground hover:text-foreground hover:bg-muted rounded transition-colors"
+                        onclick="event.stopPropagation(); editSkillFile('${escapeHtml(skillName)}', '${escapeHtml(filePath)}', '${location}')"
+                        title="${t('common.edit')}">
+                  <i data-lucide="edit-2" class="w-3.5 h-3.5"></i>
+                </button>
+              </div>
+              ` : ''}
+            </div>
+            <div class="folder-contents hidden ml-4 mt-1 space-y-1"></div>
+          </div>
+        `;
+      }).join('');
+
+      contentsDiv.classList.remove('hidden');
+      if (typeof lucide !== 'undefined') lucide.createIcons();
+    } catch (err) {
+      console.error('Failed to load folder contents:', err);
+      if (window.showToast) {
+        showToast(err.message || 'Failed to load folder', 'error');
+      }
+    }
+  }
+}
+

package/ccw/src/tools/cli-executor.ts

@@ -5,6 +5,7 @@
 
 import { z } from 'zod';
 import type { ToolSchema, ToolResult } from '../types/tool.js';
+import type { HistoryIndexEntry } from './cli-history-store.js';
 import { spawn, ChildProcess } from 'child_process';
 import { existsSync, mkdirSync, readFileSync, writeFileSync, unlinkSync, readdirSync, statSync } from 'fs';
 import { join, relative } from 'path';
@@ -1982,6 +1983,7 @@ export async function getEnrichedConversation(baseDir: string, ccwId: string) {
 
 /**
  * Get history with native session info
+ * Supports recursive querying of child projects
  */
 export async function getHistoryWithNativeInfo(baseDir: string, options?: {
   limit?: number;
@@ -1990,9 +1992,75 @@ export async function getHistoryWithNativeInfo(baseDir: string, options?: {
   status?: string | null;
   category?: ExecutionCategory | null;
   search?: string | null;
+  recursive?: boolean;
 }) {
-  const store = await getSqliteStore(baseDir);
-  return store.getHistoryWithNativeInfo(options || {});
+  const { limit = 50, recursive = false, ...queryOptions } = options || {};
+
+  // Non-recursive mode: query single project
+  if (!recursive) {
+    const store = await getSqliteStore(baseDir);
+    return store.getHistoryWithNativeInfo({ limit, ...queryOptions });
+  }
+
+  // Recursive mode: aggregate data from parent and all child projects
+  const { scanChildProjectsAsync } = await import('../config/storage-paths.js');
+  const childProjects = await scanChildProjectsAsync(baseDir);
+
+  // Use the same type as store.getHistoryWithNativeInfo returns
+  type ExecutionWithNativeAndSource = HistoryIndexEntry & {
+    hasNativeSession: boolean;
+    nativeSessionId?: string;
+    nativeSessionPath?: string;
+  };
+
+  const allExecutions: ExecutionWithNativeAndSource[] = [];
+  let totalCount = 0;
+
+  // Query parent project
+  try {
+    const parentStore = await getSqliteStore(baseDir);
+    const parentResult = parentStore.getHistoryWithNativeInfo({ limit, ...queryOptions });
+    totalCount += parentResult.total;
+
+    for (const exec of parentResult.executions) {
+      allExecutions.push({ ...exec, sourceDir: baseDir });
+    }
+  } catch (error) {
+    if (process.env.DEBUG) {
+      console.error(`[CLI History] Failed to query parent project ${baseDir}:`, error);
+    }
+  }
+
+  // Query all child projects
+  for (const child of childProjects) {
+    try {
+      const childStore = await getSqliteStore(child.projectPath);
+      const childResult = childStore.getHistoryWithNativeInfo({ limit, ...queryOptions });
+      totalCount += childResult.total;
+
+      for (const exec of childResult.executions) {
+        allExecutions.push({ ...exec, sourceDir: child.projectPath });
+      }
+    } catch (error) {
+      if (process.env.DEBUG) {
+        console.error(`[CLI History] Failed to query child project ${child.projectPath}:`, error);
+      }
+    }
+  }
+
+  // Sort by updated_at descending and apply limit
+  allExecutions.sort((a, b) => {
+    const timeA = a.updated_at ? new Date(a.updated_at).getTime() : new Date(a.timestamp).getTime();
+    const timeB = b.updated_at ? new Date(b.updated_at).getTime() : new Date(b.timestamp).getTime();
+    return timeB - timeA;
+  });
+  const limitedExecutions = allExecutions.slice(0, limit);
+
+  return {
+    total: totalCount,
+    count: limitedExecutions.length,
+    executions: limitedExecutions
+  };
 }
 
 // Export types