fix(daemon): align archives with managed dotfile visibility

Author: mturac

apps/daemon/src/projects.ts

@@ -327,16 +327,19 @@ async function collectFiles(
 }
 
 // Build a ZIP of every file under the project directory (or under `root`,
-// if it points at a subdirectory). Mirrors listFiles' filtering — dotfiles
-// and `.artifact.json` sidecars are excluded — so the archive matches what
-// the user sees in the file panel. Used by the "Download as .zip" share
-// menu item, which exports the user's actual project tree (e.g. the
-// uploaded `ui-design/` folder), not just the rendered HTML.
+// if it points at a subdirectory). Mirrors listFiles' filtering: managed
+// projects keep user-owned dotfiles, imported folders keep hiding all hidden
+// segments, and ignored/reserved trees plus `.artifact.json` sidecars stay
+// excluded everywhere. Used by the "Download as .zip" share menu item, which
+// exports the user's actual project tree (e.g. the uploaded `ui-design/`
+// folder), not just the rendered HTML.
 export async function buildProjectArchive(projectsRoot, projectId, root, metadata?) {
   const projectRoot = resolveProjectDir(projectsRoot, projectId, metadata);
+  const skipHidden = hasExternalProjectRoot(metadata);
   let archiveRoot = projectRoot;
   let archiveBaseName = '';
   if (typeof root === 'string' && root.trim().length > 0) {
+    assertVisibleForImportedProject(root, metadata);
     // Use the symlink-aware resolver so that an imported folder containing
     // e.g. `docs -> /Users/me/.ssh` cannot exfiltrate via
     // GET /api/projects/:id/archive?root=docs. resolveSafe()'s string
@@ -369,7 +372,7 @@ export async function buildProjectArchive(projectsRoot, projectId, root, metadat
   }
 
   const entries = [];
-  await collectArchiveEntries(archiveRoot, '', entries);
+  await collectArchiveEntries(archiveRoot, '', entries, skipHidden);
   if (entries.length === 0) {
     const err = new Error('archive root is empty');
     err.code = 'ENOENT';
@@ -414,20 +417,23 @@ export async function buildBatchArchive(projectsRoot, projectId, fileNames, meta
     }
 
     // Mirror the visible-file allowlist from collectFiles/collectArchiveEntries:
-    // reject any hidden segment, .artifact.json sidecars, and symlinks at any
-    // level of the path (not just the final basename).
+    // imported folders reject every hidden segment; managed projects allow
+    // user dotfiles but still reject ignored/reserved trees. Sidecars and
+    // symlinks remain ineligible everywhere.
     const relSegments = path.relative(projectRoot, filePath).split(path.sep);
-    let hidden = false;
-    for (const seg of relSegments) {
-      if (seg.startsWith('.')) {
-        hidden = true;
-        break;
-      }
-    }
-    if (hidden) {
+    const importedHidden =
+      hasExternalProjectRoot(metadata) && relSegments.some((seg) => seg.startsWith('.'));
+    if (importedHidden) {
       rejected.push({ name, reason: 'hidden segments are not eligible for archive' });
       continue;
     }
+    // Only directory segments participate in the shared directory ignore
+    // policy. A regular user file may legitimately be named `build` or
+    // `vendor`; validateProjectPath() already rejects reserved state segments.
+    if (relSegments.slice(0, -1).some((seg) => isIgnoredProjectDirName(seg))) {
+      rejected.push({ name, reason: 'ignored directory segments are not eligible for archive' });
+      continue;
+    }
     if (path.basename(filePath).endsWith('.artifact.json')) {
       rejected.push({ name, reason: 'artifact sidecars are not eligible for archive' });
       continue;
@@ -515,7 +521,7 @@ export async function buildBatchArchive(projectsRoot, projectId, fileNames, meta
   return { buffer, baseName: '' };
 }
 
-async function collectArchiveEntries(dir, relDir, out) {
+async function collectArchiveEntries(dir, relDir, out, skipHidden = false) {
   let entries = [];
   try {
     entries = await readdir(dir, { withFileTypes: true });
@@ -524,13 +530,13 @@ async function collectArchiveEntries(dir, relDir, out) {
     throw err;
   }
   for (const e of entries) {
-    if (e.name.startsWith('.')) continue;
+    if (skipHidden && e.name.startsWith('.')) continue;
     if (!e.isDirectory() && !e.isFile()) continue;
     const rel = relDir ? `${relDir}/${e.name}` : e.name;
     const full = path.join(dir, e.name);
     if (e.isDirectory()) {
-      if (isIgnoredProjectDirName(e.name)) continue;
-      await collectArchiveEntries(full, rel, out);
+      if (isListingSkippedDirName(e.name)) continue;
+      await collectArchiveEntries(full, rel, out, skipHidden);
       continue;
     }
     if (e.name.endsWith('.artifact.json')) continue;

apps/daemon/tests/project-archive.test.ts

@@ -36,7 +36,14 @@ describe('buildProjectArchive', () => {
       .filter((entry) => !entry.dir)
       .map((entry) => entry.name)
       .sort();
-    expect(fileEntries).toEqual(['DESIGN-HANDOFF.md', 'DESIGN-MANIFEST.json', 'frames/phone.html', 'index.html', 'src/app.css']);
+    expect(fileEntries).toEqual([
+      '.hidden',
+      'DESIGN-HANDOFF.md',
+      'DESIGN-MANIFEST.json',
+      'frames/phone.html',
+      'index.html',
+      'src/app.css',
+    ]);
   });
 
   it('zips the whole project when no root is given', async () => {
@@ -49,10 +56,11 @@ describe('buildProjectArchive', () => {
     expect(fileEntries).toContain('DESIGN-HANDOFF.md');
     expect(fileEntries).toContain('DESIGN-MANIFEST.json');
     expect(fileEntries).toContain('README.md');
+    expect(fileEntries).toContain('ui-design/.hidden');
     expect(fileEntries).toContain('ui-design/index.html');
     expect(fileEntries).toContain('ui-design/src/app.css');
-    // dotfiles and .artifact.json sidecars are filtered, matching listFiles
-    expect(fileEntries.find((n) => n.includes('.hidden'))).toBeUndefined();
+    // Invariant: managed-project archives match listFiles and keep user
+    // dotfiles, while generated .artifact.json sidecars remain excluded.
     expect(fileEntries.find((n) => n.endsWith('.artifact.json'))).toBeUndefined();
   });
 

apps/daemon/tests/project-hidden-files.test.ts

@@ -2,9 +2,15 @@ import { mkdtempSync, rmSync } from 'node:fs';
 import { mkdir, writeFile } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import path from 'node:path';
+import JSZip from 'jszip';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
-import { buildBatchArchive, listFiles, listProjectFolders } from '../src/projects.js';
+import {
+  buildBatchArchive,
+  buildProjectArchive,
+  listFiles,
+  listProjectFolders,
+} from '../src/projects.js';
 
 // Regression tests for #6175: the file/folder listing helpers used a blanket
 // `startsWith('.')` filter, so legitimate dot-prefixed user content
@@ -81,6 +87,35 @@ describe('dot-prefixed user content in managed projects (#6175)', () => {
     expect(names).not.toContain('.file-versions');
   });
 
+  it('includes visible dot-prefixed user content in full project archives', async () => {
+    const { buffer } = await buildProjectArchive(projectsRoot, projectId, '');
+    const zip = await JSZip.loadAsync(buffer);
+    const paths = Object.keys(zip.files);
+
+    expect(paths).toContain('.github/workflows/ci.yml');
+    expect(paths).toContain('.storybook/main.ts');
+    expect(paths).toContain('.notes.md');
+    expect(paths.some((p) => p.startsWith('.git/'))).toBe(false);
+    expect(paths.some((p) => p.startsWith('.od/'))).toBe(false);
+    expect(paths.some((p) => p.startsWith('node_modules/'))).toBe(false);
+    expect(paths.some((p) => p.startsWith('.live-artifacts/'))).toBe(false);
+    expect(paths.some((p) => p.startsWith('.file-versions/'))).toBe(false);
+  });
+
+  it('includes visible dot-prefixed user content in batch archives', async () => {
+    await writeFile(path.join(projectsRoot, projectId, 'build'), 'plain user file');
+    const { buffer } = await buildBatchArchive(projectsRoot, projectId, [
+      '.github/workflows/ci.yml',
+      '.notes.md',
+      'build',
+    ]);
+    const zip = await JSZip.loadAsync(buffer);
+
+    expect(Object.keys(zip.files)).toEqual(
+      expect.arrayContaining(['.github/workflows/ci.yml', '.notes.md', 'build']),
+    );
+  });
+
   it('batch archive keeps rejecting reserved daemon state', async () => {
     await expect(
       buildBatchArchive(projectsRoot, projectId, ['.live-artifacts/artifact-1/index.html']),
@@ -122,6 +157,15 @@ describe('dot-prefixed entries in imported folders stay hidden (#6175)', () => {
     expect(names.some((p) => p.startsWith('.'))).toBe(false);
   });
 
+  it('keeps rejecting hidden archive roots for external baseDir projects', async () => {
+    await expect(
+      buildProjectArchive('/unused/projects', 'unused-id', '.github', {
+        kind: 'prototype',
+        baseDir,
+      }),
+    ).rejects.toThrow(/hidden path segments/);
+  });
+
   it('keeps rejecting hidden segments in batch archives for external baseDir projects', async () => {
     await expect(
       buildBatchArchive('/unused/projects', 'unused-id', ['.github/workflows/ci.yml'], {