Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 61 additions & 10 deletions src/lib/packaging/__tests__/helpers.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -477,8 +477,11 @@ describe('nested agentcore directory is preserved (issue #843)', () => {
});

// ── createZipFromDir (async) ──
// The zip stage should NOT exclude agentcore/ — that's copySourceTree's job.
// When zipping a staging directory, any agentcore/ present is a legitimate
// Python package installed by uv, not the project config dir.

it('zip: excludes top-level agentcore/ but includes nested agentcore/', async () => {
it('zip: does not exclude agentcore/ directories (staging has no project config)', async () => {
const src = buildFixture(join(root, 'zip-async'));
const zipPath = join(root, 'zip-async.zip');

Expand All@@ -487,21 +490,17 @@ describe('nested agentcore directory is preserved (issue #843)', () => {
const zipBuffer = await readFile(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

// Top-level agentcore/ should NOT appear
expect(entries.some(e => e === 'agentcore/config.yaml')).toBe(false);
expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);

// Nested agentcore/ SHOULD appear
// Both top-level and nested agentcore/ are preserved in the zip —
// the zip function zips everything; exclusion is copySourceTree's concern
expect(entries).toContain('agentcore/config.yaml');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');

// Regular files present
expect(entries).toContain('main.py');
});

// ── createZipFromDirSync ──

it('sync zip: excludes top-level agentcore/ but includes nested agentcore/', () => {
it('sync zip: does not exclude agentcore/ directories (staging has no project config)', () => {
const src = buildFixture(join(root, 'zip-sync'));
const zipPath = join(root, 'zip-sync.zip');

Expand All@@ -510,9 +509,61 @@ describe('nested agentcore directory is preserved (issue #843)', () => {
const zipBuffer = readFileSync(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);
expect(entries).toContain('agentcore/config.yaml');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');
expect(entries).toContain('main.py');
});

// ── Staging directory scenario (the actual bug) ──
// After uv installs deps into staging, copySourceTree copies user source on top.
// The staging dir may contain a top-level agentcore/ from a Python package.
// createZipFromDir must NOT strip it.

it('zip preserves top-level agentcore/ Python package in staging dir', async () => {
const staging = join(root, 'staging-zip-async');
mkdirSync(staging, { recursive: true });

// Simulate uv-installed dependency with top-level agentcore/ package
const agentcorePkg = join(staging, 'langgraph_checkpoint_aws', 'agentcore');
mkdirSync(agentcorePkg, { recursive: true });
writeFileSync(join(staging, 'langgraph_checkpoint_aws', '__init__.py'), '# init');
writeFileSync(join(agentcorePkg, '__init__.py'), '# agentcore init');
writeFileSync(join(agentcorePkg, 'saver.py'), 'class AgentCoreMemorySaver: pass');

// User source copied on top by copySourceTree
writeFileSync(join(staging, 'main.py'), 'print("hello")');

const zipPath = join(root, 'staging-async.zip');
await createZipFromDir(staging, zipPath);

const zipBuffer = await readFile(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries).toContain('langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('langgraph_checkpoint_aws/agentcore/saver.py');
expect(entries).toContain('main.py');
});

it('sync zip preserves top-level agentcore/ Python package in staging dir', () => {
const staging = join(root, 'staging-zip-sync');
mkdirSync(staging, { recursive: true });

const agentcorePkg = join(staging, 'langgraph_checkpoint_aws', 'agentcore');
mkdirSync(agentcorePkg, { recursive: true });
writeFileSync(join(staging, 'langgraph_checkpoint_aws', '__init__.py'), '# init');
writeFileSync(join(agentcorePkg, '__init__.py'), '# agentcore init');
writeFileSync(join(agentcorePkg, 'saver.py'), 'class AgentCoreMemorySaver: pass');
writeFileSync(join(staging, 'main.py'), 'print("hello")');

const zipPath = join(root, 'staging-sync.zip');
createZipFromDirSync(staging, zipPath);

const zipBuffer = readFileSync(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries).toContain('langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('langgraph_checkpoint_aws/agentcore/saver.py');
expect(entries).toContain('main.py');
});
});
14 changes: 6 additions & 8 deletions src/lib/packaging/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,24 +192,23 @@ export async function createZipFromDir(sourceDir: string, outputZip: string): Pr
await rm(outputZip, { force: true });
await mkdir(dirname(outputZip), { recursive: true });

const files = await collectFiles(sourceDir, sourceDir);
const files = await collectFiles(sourceDir);
const zipped = zipSync(files);
await writeFile(outputZip, zipped);
}

async function collectFiles(directory: string, rootDir: string, basePath = ''): Promise<Zippable> {
async function collectFiles(directory: string, basePath = ''): Promise<Zippable> {
const result: Zippable = {};
const entries = await readdir(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, await collectFiles(fullPath, rootDir, zipPath));
Object.assign(result, await collectFiles(fullPath, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [await readFile(fullPath), { level: 6 }];
}
Expand DownExpand Up@@ -325,19 +324,18 @@ export function ensureBinaryAvailableSync(binary: string, installHint?: string):
throw new MissingDependencyError(binary, installHint);
}

function collectFilesSync(directory: string, rootDir: string, basePath = ''): Zippable {
function collectFilesSync(directory: string, basePath = ''): Zippable {
const result: Zippable = {};
const entries = readdirSync(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, collectFilesSync(fullPath, rootDir, zipPath));
Object.assign(result, collectFilesSync(fullPath, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [readFileSync(fullPath), { level: 6 }];
}
Expand All@@ -349,7 +347,7 @@ export function createZipFromDirSync(sourceDir: string, outputZip: string): void
rmSync(outputZip, { force: true });
mkdirSync(dirname(outputZip), { recursive: true });

const files = collectFilesSync(sourceDir, sourceDir);
const files = collectFilesSync(sourceDir);
const zipped = zipSync(files);
writeFileSync(outputZip, zipped);
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix: remove CONFIG_DIR exclusion from zip stage to preserve dependency agentcore/ packages by aidandaly24 · Pull Request #1015 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 61 additions & 10 deletions src/lib/packaging/__tests__/helpers.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -477,8 +477,11 @@ describe('nested agentcore directory is preserved (issue #843)', () => {
});

// ── createZipFromDir (async) ──
// The zip stage should NOT exclude agentcore/ — that's copySourceTree's job.
// When zipping a staging directory, any agentcore/ present is a legitimate
// Python package installed by uv, not the project config dir.

it('zip: excludes top-level agentcore/ but includes nested agentcore/', async () => {
it('zip: does not exclude agentcore/ directories (staging has no project config)', async () => {
const src = buildFixture(join(root, 'zip-async'));
const zipPath = join(root, 'zip-async.zip');

Expand All@@ -487,21 +490,17 @@ describe('nested agentcore directory is preserved (issue #843)', () => {
const zipBuffer = await readFile(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

// Top-level agentcore/ should NOT appear
expect(entries.some(e => e === 'agentcore/config.yaml')).toBe(false);
expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);

// Nested agentcore/ SHOULD appear
// Both top-level and nested agentcore/ are preserved in the zip —
// the zip function zips everything; exclusion is copySourceTree's concern
expect(entries).toContain('agentcore/config.yaml');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');

// Regular files present
expect(entries).toContain('main.py');
});

// ── createZipFromDirSync ──

it('sync zip: excludes top-level agentcore/ but includes nested agentcore/', () => {
it('sync zip: does not exclude agentcore/ directories (staging has no project config)', () => {
const src = buildFixture(join(root, 'zip-sync'));
const zipPath = join(root, 'zip-sync.zip');

Expand All@@ -510,9 +509,61 @@ describe('nested agentcore directory is preserved (issue #843)', () => {
const zipBuffer = readFileSync(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);
expect(entries).toContain('agentcore/config.yaml');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');
expect(entries).toContain('main.py');
});

// ── Staging directory scenario (the actual bug) ──
// After uv installs deps into staging, copySourceTree copies user source on top.
// The staging dir may contain a top-level agentcore/ from a Python package.
// createZipFromDir must NOT strip it.

it('zip preserves top-level agentcore/ Python package in staging dir', async () => {
const staging = join(root, 'staging-zip-async');
mkdirSync(staging, { recursive: true });

// Simulate uv-installed dependency with top-level agentcore/ package
const agentcorePkg = join(staging, 'langgraph_checkpoint_aws', 'agentcore');
mkdirSync(agentcorePkg, { recursive: true });
writeFileSync(join(staging, 'langgraph_checkpoint_aws', '__init__.py'), '# init');
writeFileSync(join(agentcorePkg, '__init__.py'), '# agentcore init');
writeFileSync(join(agentcorePkg, 'saver.py'), 'class AgentCoreMemorySaver: pass');

// User source copied on top by copySourceTree
writeFileSync(join(staging, 'main.py'), 'print("hello")');

const zipPath = join(root, 'staging-async.zip');
await createZipFromDir(staging, zipPath);

const zipBuffer = await readFile(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries).toContain('langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('langgraph_checkpoint_aws/agentcore/saver.py');
expect(entries).toContain('main.py');
});

it('sync zip preserves top-level agentcore/ Python package in staging dir', () => {
const staging = join(root, 'staging-zip-sync');
mkdirSync(staging, { recursive: true });

const agentcorePkg = join(staging, 'langgraph_checkpoint_aws', 'agentcore');
mkdirSync(agentcorePkg, { recursive: true });
writeFileSync(join(staging, 'langgraph_checkpoint_aws', '__init__.py'), '# init');
writeFileSync(join(agentcorePkg, '__init__.py'), '# agentcore init');
writeFileSync(join(agentcorePkg, 'saver.py'), 'class AgentCoreMemorySaver: pass');
writeFileSync(join(staging, 'main.py'), 'print("hello")');

const zipPath = join(root, 'staging-sync.zip');
createZipFromDirSync(staging, zipPath);

const zipBuffer = readFileSync(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries).toContain('langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('langgraph_checkpoint_aws/agentcore/saver.py');
expect(entries).toContain('main.py');
});
});
14 changes: 6 additions & 8 deletions src/lib/packaging/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,24 +192,23 @@ export async function createZipFromDir(sourceDir: string, outputZip: string): Pr
await rm(outputZip, { force: true });
await mkdir(dirname(outputZip), { recursive: true });

const files = await collectFiles(sourceDir, sourceDir);
const files = await collectFiles(sourceDir);
const zipped = zipSync(files);
await writeFile(outputZip, zipped);
}

async function collectFiles(directory: string, rootDir: string, basePath = ''): Promise<Zippable> {
async function collectFiles(directory: string, basePath = ''): Promise<Zippable> {
const result: Zippable = {};
const entries = await readdir(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, await collectFiles(fullPath, rootDir, zipPath));
Object.assign(result, await collectFiles(fullPath, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [await readFile(fullPath), { level: 6 }];
}
Expand DownExpand Up@@ -325,19 +324,18 @@ export function ensureBinaryAvailableSync(binary: string, installHint?: string):
throw new MissingDependencyError(binary, installHint);
}

function collectFilesSync(directory: string, rootDir: string, basePath = ''): Zippable {
function collectFilesSync(directory: string, basePath = ''): Zippable {
const result: Zippable = {};
const entries = readdirSync(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, collectFilesSync(fullPath, rootDir, zipPath));
Object.assign(result, collectFilesSync(fullPath, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [readFileSync(fullPath), { level: 6 }];
}
Expand All@@ -349,7 +347,7 @@ export function createZipFromDirSync(sourceDir: string, outputZip: string): void
rmSync(outputZip, { force: true });
mkdirSync(dirname(outputZip), { recursive: true });

const files = collectFilesSync(sourceDir, sourceDir);
const files = collectFilesSync(sourceDir);
const zipped = zipSync(files);
writeFileSync(outputZip, zipped);
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: remove CONFIG_DIR exclusion from zip stage to preserve dependency agentcore/ packages by aidandaly24 · Pull Request #1015 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 61 additions & 10 deletions src/lib/packaging/__tests__/helpers.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -477,8 +477,11 @@ describe('nested agentcore directory is preserved (issue #843)', () => {
});

// ── createZipFromDir (async) ──
// The zip stage should NOT exclude agentcore/ — that's copySourceTree's job.
// When zipping a staging directory, any agentcore/ present is a legitimate
// Python package installed by uv, not the project config dir.

it('zip: excludes top-level agentcore/ but includes nested agentcore/', async () => {
it('zip: does not exclude agentcore/ directories (staging has no project config)', async () => {
const src = buildFixture(join(root, 'zip-async'));
const zipPath = join(root, 'zip-async.zip');

Expand All@@ -487,21 +490,17 @@ describe('nested agentcore directory is preserved (issue #843)', () => {
const zipBuffer = await readFile(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

// Top-level agentcore/ should NOT appear
expect(entries.some(e => e === 'agentcore/config.yaml')).toBe(false);
expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);

// Nested agentcore/ SHOULD appear
// Both top-level and nested agentcore/ are preserved in the zip —
// the zip function zips everything; exclusion is copySourceTree's concern
expect(entries).toContain('agentcore/config.yaml');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');

// Regular files present
expect(entries).toContain('main.py');
});

// ── createZipFromDirSync ──

it('sync zip: excludes top-level agentcore/ but includes nested agentcore/', () => {
it('sync zip: does not exclude agentcore/ directories (staging has no project config)', () => {
const src = buildFixture(join(root, 'zip-sync'));
const zipPath = join(root, 'zip-sync.zip');

Expand All@@ -510,9 +509,61 @@ describe('nested agentcore directory is preserved (issue #843)', () => {
const zipBuffer = readFileSync(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);
expect(entries).toContain('agentcore/config.yaml');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');
expect(entries).toContain('main.py');
});

// ── Staging directory scenario (the actual bug) ──
// After uv installs deps into staging, copySourceTree copies user source on top.
// The staging dir may contain a top-level agentcore/ from a Python package.
// createZipFromDir must NOT strip it.

it('zip preserves top-level agentcore/ Python package in staging dir', async () => {
const staging = join(root, 'staging-zip-async');
mkdirSync(staging, { recursive: true });

// Simulate uv-installed dependency with top-level agentcore/ package
const agentcorePkg = join(staging, 'langgraph_checkpoint_aws', 'agentcore');
mkdirSync(agentcorePkg, { recursive: true });
writeFileSync(join(staging, 'langgraph_checkpoint_aws', '__init__.py'), '# init');
writeFileSync(join(agentcorePkg, '__init__.py'), '# agentcore init');
writeFileSync(join(agentcorePkg, 'saver.py'), 'class AgentCoreMemorySaver: pass');

// User source copied on top by copySourceTree
writeFileSync(join(staging, 'main.py'), 'print("hello")');

const zipPath = join(root, 'staging-async.zip');
await createZipFromDir(staging, zipPath);

const zipBuffer = await readFile(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries).toContain('langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('langgraph_checkpoint_aws/agentcore/saver.py');
expect(entries).toContain('main.py');
});

it('sync zip preserves top-level agentcore/ Python package in staging dir', () => {
const staging = join(root, 'staging-zip-sync');
mkdirSync(staging, { recursive: true });

const agentcorePkg = join(staging, 'langgraph_checkpoint_aws', 'agentcore');
mkdirSync(agentcorePkg, { recursive: true });
writeFileSync(join(staging, 'langgraph_checkpoint_aws', '__init__.py'), '# init');
writeFileSync(join(agentcorePkg, '__init__.py'), '# agentcore init');
writeFileSync(join(agentcorePkg, 'saver.py'), 'class AgentCoreMemorySaver: pass');
writeFileSync(join(staging, 'main.py'), 'print("hello")');

const zipPath = join(root, 'staging-sync.zip');
createZipFromDirSync(staging, zipPath);

const zipBuffer = readFileSync(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries).toContain('langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('langgraph_checkpoint_aws/agentcore/saver.py');
expect(entries).toContain('main.py');
});
});
14 changes: 6 additions & 8 deletions src/lib/packaging/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,24 +192,23 @@ export async function createZipFromDir(sourceDir: string, outputZip: string): Pr
await rm(outputZip, { force: true });
await mkdir(dirname(outputZip), { recursive: true });

const files = await collectFiles(sourceDir, sourceDir);
const files = await collectFiles(sourceDir);
const zipped = zipSync(files);
await writeFile(outputZip, zipped);
}

async function collectFiles(directory: string, rootDir: string, basePath = ''): Promise<Zippable> {
async function collectFiles(directory: string, basePath = ''): Promise<Zippable> {
const result: Zippable = {};
const entries = await readdir(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, await collectFiles(fullPath, rootDir, zipPath));
Object.assign(result, await collectFiles(fullPath, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [await readFile(fullPath), { level: 6 }];
}
Expand DownExpand Up@@ -325,19 +324,18 @@ export function ensureBinaryAvailableSync(binary: string, installHint?: string):
throw new MissingDependencyError(binary, installHint);
}

function collectFilesSync(directory: string, rootDir: string, basePath = ''): Zippable {
function collectFilesSync(directory: string, basePath = ''): Zippable {
const result: Zippable = {};
const entries = readdirSync(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, collectFilesSync(fullPath, rootDir, zipPath));
Object.assign(result, collectFilesSync(fullPath, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [readFileSync(fullPath), { level: 6 }];
}
Expand All@@ -349,7 +347,7 @@ export function createZipFromDirSync(sourceDir: string, outputZip: string): void
rmSync(outputZip, { force: true });
mkdirSync(dirname(outputZip), { recursive: true });

const files = collectFilesSync(sourceDir, sourceDir);
const files = collectFilesSync(sourceDir);
const zipped = zipSync(files);
writeFileSync(outputZip, zipped);
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: remove CONFIG_DIR exclusion from zip stage to preserve dependency agentcore/ packages by aidandaly24 · Pull Request #1015 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 61 additions & 10 deletions src/lib/packaging/__tests__/helpers.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -477,8 +477,11 @@ describe('nested agentcore directory is preserved (issue #843)', () => {
});

// ── createZipFromDir (async) ──
// The zip stage should NOT exclude agentcore/ — that's copySourceTree's job.
// When zipping a staging directory, any agentcore/ present is a legitimate
// Python package installed by uv, not the project config dir.

it('zip: excludes top-level agentcore/ but includes nested agentcore/', async () => {
it('zip: does not exclude agentcore/ directories (staging has no project config)', async () => {
const src = buildFixture(join(root, 'zip-async'));
const zipPath = join(root, 'zip-async.zip');

Expand All@@ -487,21 +490,17 @@ describe('nested agentcore directory is preserved (issue #843)', () => {
const zipBuffer = await readFile(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

// Top-level agentcore/ should NOT appear
expect(entries.some(e => e === 'agentcore/config.yaml')).toBe(false);
expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);

// Nested agentcore/ SHOULD appear
// Both top-level and nested agentcore/ are preserved in the zip —
// the zip function zips everything; exclusion is copySourceTree's concern
expect(entries).toContain('agentcore/config.yaml');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');

// Regular files present
expect(entries).toContain('main.py');
});

// ── createZipFromDirSync ──

it('sync zip: excludes top-level agentcore/ but includes nested agentcore/', () => {
it('sync zip: does not exclude agentcore/ directories (staging has no project config)', () => {
const src = buildFixture(join(root, 'zip-sync'));
const zipPath = join(root, 'zip-sync.zip');

Expand All@@ -510,9 +509,61 @@ describe('nested agentcore directory is preserved (issue #843)', () => {
const zipBuffer = readFileSync(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);
expect(entries).toContain('agentcore/config.yaml');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');
expect(entries).toContain('main.py');
});

// ── Staging directory scenario (the actual bug) ──
// After uv installs deps into staging, copySourceTree copies user source on top.
// The staging dir may contain a top-level agentcore/ from a Python package.
// createZipFromDir must NOT strip it.

it('zip preserves top-level agentcore/ Python package in staging dir', async () => {
const staging = join(root, 'staging-zip-async');
mkdirSync(staging, { recursive: true });

// Simulate uv-installed dependency with top-level agentcore/ package
const agentcorePkg = join(staging, 'langgraph_checkpoint_aws', 'agentcore');
mkdirSync(agentcorePkg, { recursive: true });
writeFileSync(join(staging, 'langgraph_checkpoint_aws', '__init__.py'), '# init');
writeFileSync(join(agentcorePkg, '__init__.py'), '# agentcore init');
writeFileSync(join(agentcorePkg, 'saver.py'), 'class AgentCoreMemorySaver: pass');

// User source copied on top by copySourceTree
writeFileSync(join(staging, 'main.py'), 'print("hello")');

const zipPath = join(root, 'staging-async.zip');
await createZipFromDir(staging, zipPath);

const zipBuffer = await readFile(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries).toContain('langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('langgraph_checkpoint_aws/agentcore/saver.py');
expect(entries).toContain('main.py');
});

it('sync zip preserves top-level agentcore/ Python package in staging dir', () => {
const staging = join(root, 'staging-zip-sync');
mkdirSync(staging, { recursive: true });

const agentcorePkg = join(staging, 'langgraph_checkpoint_aws', 'agentcore');
mkdirSync(agentcorePkg, { recursive: true });
writeFileSync(join(staging, 'langgraph_checkpoint_aws', '__init__.py'), '# init');
writeFileSync(join(agentcorePkg, '__init__.py'), '# agentcore init');
writeFileSync(join(agentcorePkg, 'saver.py'), 'class AgentCoreMemorySaver: pass');
writeFileSync(join(staging, 'main.py'), 'print("hello")');

const zipPath = join(root, 'staging-sync.zip');
createZipFromDirSync(staging, zipPath);

const zipBuffer = readFileSync(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries).toContain('langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('langgraph_checkpoint_aws/agentcore/saver.py');
expect(entries).toContain('main.py');
});
});
14 changes: 6 additions & 8 deletions src/lib/packaging/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,24 +192,23 @@ export async function createZipFromDir(sourceDir: string, outputZip: string): Pr
await rm(outputZip, { force: true });
await mkdir(dirname(outputZip), { recursive: true });

const files = await collectFiles(sourceDir, sourceDir);
const files = await collectFiles(sourceDir);
const zipped = zipSync(files);
await writeFile(outputZip, zipped);
}

async function collectFiles(directory: string, rootDir: string, basePath = ''): Promise<Zippable> {
async function collectFiles(directory: string, basePath = ''): Promise<Zippable> {
const result: Zippable = {};
const entries = await readdir(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, await collectFiles(fullPath, rootDir, zipPath));
Object.assign(result, await collectFiles(fullPath, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [await readFile(fullPath), { level: 6 }];
}
Expand DownExpand Up@@ -325,19 +324,18 @@ export function ensureBinaryAvailableSync(binary: string, installHint?: string):
throw new MissingDependencyError(binary, installHint);
}

function collectFilesSync(directory: string, rootDir: string, basePath = ''): Zippable {
function collectFilesSync(directory: string, basePath = ''): Zippable {
const result: Zippable = {};
const entries = readdirSync(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, collectFilesSync(fullPath, rootDir, zipPath));
Object.assign(result, collectFilesSync(fullPath, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [readFileSync(fullPath), { level: 6 }];
}
Expand All@@ -349,7 +347,7 @@ export function createZipFromDirSync(sourceDir: string, outputZip: string): void
rmSync(outputZip, { force: true });
mkdirSync(dirname(outputZip), { recursive: true });

const files = collectFilesSync(sourceDir, sourceDir);
const files = collectFilesSync(sourceDir);
const zipped = zipSync(files);
writeFileSync(outputZip, zipped);
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' fix: remove CONFIG_DIR exclusion from zip stage to preserve dependency agentcore/ packages by aidandaly24 · Pull Request #1015 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 61 additions & 10 deletions src/lib/packaging/__tests__/helpers.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -477,8 +477,11 @@ describe('nested agentcore directory is preserved (issue #843)', () => {
});

// ── createZipFromDir (async) ──
// The zip stage should NOT exclude agentcore/ — that's copySourceTree's job.
// When zipping a staging directory, any agentcore/ present is a legitimate
// Python package installed by uv, not the project config dir.

it('zip: excludes top-level agentcore/ but includes nested agentcore/', async () => {
it('zip: does not exclude agentcore/ directories (staging has no project config)', async () => {
const src = buildFixture(join(root, 'zip-async'));
const zipPath = join(root, 'zip-async.zip');

Expand All@@ -487,21 +490,17 @@ describe('nested agentcore directory is preserved (issue #843)', () => {
const zipBuffer = await readFile(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

// Top-level agentcore/ should NOT appear
expect(entries.some(e => e === 'agentcore/config.yaml')).toBe(false);
expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);

// Nested agentcore/ SHOULD appear
// Both top-level and nested agentcore/ are preserved in the zip —
// the zip function zips everything; exclusion is copySourceTree's concern
expect(entries).toContain('agentcore/config.yaml');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');

// Regular files present
expect(entries).toContain('main.py');
});

// ── createZipFromDirSync ──

it('sync zip: excludes top-level agentcore/ but includes nested agentcore/', () => {
it('sync zip: does not exclude agentcore/ directories (staging has no project config)', () => {
const src = buildFixture(join(root, 'zip-sync'));
const zipPath = join(root, 'zip-sync.zip');

Expand All@@ -510,9 +509,61 @@ describe('nested agentcore directory is preserved (issue #843)', () => {
const zipBuffer = readFileSync(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);
expect(entries).toContain('agentcore/config.yaml');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');
expect(entries).toContain('main.py');
});

// ── Staging directory scenario (the actual bug) ──
// After uv installs deps into staging, copySourceTree copies user source on top.
// The staging dir may contain a top-level agentcore/ from a Python package.
// createZipFromDir must NOT strip it.

it('zip preserves top-level agentcore/ Python package in staging dir', async () => {
const staging = join(root, 'staging-zip-async');
mkdirSync(staging, { recursive: true });

// Simulate uv-installed dependency with top-level agentcore/ package
const agentcorePkg = join(staging, 'langgraph_checkpoint_aws', 'agentcore');
mkdirSync(agentcorePkg, { recursive: true });
writeFileSync(join(staging, 'langgraph_checkpoint_aws', '__init__.py'), '# init');
writeFileSync(join(agentcorePkg, '__init__.py'), '# agentcore init');
writeFileSync(join(agentcorePkg, 'saver.py'), 'class AgentCoreMemorySaver: pass');

// User source copied on top by copySourceTree
writeFileSync(join(staging, 'main.py'), 'print("hello")');

const zipPath = join(root, 'staging-async.zip');
await createZipFromDir(staging, zipPath);

const zipBuffer = await readFile(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries).toContain('langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('langgraph_checkpoint_aws/agentcore/saver.py');
expect(entries).toContain('main.py');
});

it('sync zip preserves top-level agentcore/ Python package in staging dir', () => {
const staging = join(root, 'staging-zip-sync');
mkdirSync(staging, { recursive: true });

const agentcorePkg = join(staging, 'langgraph_checkpoint_aws', 'agentcore');
mkdirSync(agentcorePkg, { recursive: true });
writeFileSync(join(staging, 'langgraph_checkpoint_aws', '__init__.py'), '# init');
writeFileSync(join(agentcorePkg, '__init__.py'), '# agentcore init');
writeFileSync(join(agentcorePkg, 'saver.py'), 'class AgentCoreMemorySaver: pass');
writeFileSync(join(staging, 'main.py'), 'print("hello")');

const zipPath = join(root, 'staging-sync.zip');
createZipFromDirSync(staging, zipPath);

const zipBuffer = readFileSync(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries).toContain('langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('langgraph_checkpoint_aws/agentcore/saver.py');
expect(entries).toContain('main.py');
});
});
14 changes: 6 additions & 8 deletions src/lib/packaging/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,24 +192,23 @@ export async function createZipFromDir(sourceDir: string, outputZip: string): Pr
await rm(outputZip, { force: true });
await mkdir(dirname(outputZip), { recursive: true });

const files = await collectFiles(sourceDir, sourceDir);
const files = await collectFiles(sourceDir);
const zipped = zipSync(files);
await writeFile(outputZip, zipped);
}

async function collectFiles(directory: string, rootDir: string, basePath = ''): Promise<Zippable> {
async function collectFiles(directory: string, basePath = ''): Promise<Zippable> {
const result: Zippable = {};
const entries = await readdir(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, await collectFiles(fullPath, rootDir, zipPath));
Object.assign(result, await collectFiles(fullPath, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [await readFile(fullPath), { level: 6 }];
}
Expand DownExpand Up@@ -325,19 +324,18 @@ export function ensureBinaryAvailableSync(binary: string, installHint?: string):
throw new MissingDependencyError(binary, installHint);
}

function collectFilesSync(directory: string, rootDir: string, basePath = ''): Zippable {
function collectFilesSync(directory: string, basePath = ''): Zippable {
const result: Zippable = {};
const entries = readdirSync(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, collectFilesSync(fullPath, rootDir, zipPath));
Object.assign(result, collectFilesSync(fullPath, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [readFileSync(fullPath), { level: 6 }];
}
Expand All@@ -349,7 +347,7 @@ export function createZipFromDirSync(sourceDir: string, outputZip: string): void
rmSync(outputZip, { force: true });
mkdirSync(dirname(outputZip), { recursive: true });

const files = collectFilesSync(sourceDir, sourceDir);
const files = collectFilesSync(sourceDir);
const zipped = zipSync(files);
writeFileSync(outputZip, zipped);
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: remove CONFIG_DIR exclusion from zip stage to preserve dependency agentcore/ packages by aidandaly24 · Pull Request #1015 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 61 additions & 10 deletions src/lib/packaging/__tests__/helpers.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -477,8 +477,11 @@ describe('nested agentcore directory is preserved (issue #843)', () => {
});

// ── createZipFromDir (async) ──
// The zip stage should NOT exclude agentcore/ — that's copySourceTree's job.
// When zipping a staging directory, any agentcore/ present is a legitimate
// Python package installed by uv, not the project config dir.

it('zip: excludes top-level agentcore/ but includes nested agentcore/', async () => {
it('zip: does not exclude agentcore/ directories (staging has no project config)', async () => {
const src = buildFixture(join(root, 'zip-async'));
const zipPath = join(root, 'zip-async.zip');

Expand All@@ -487,21 +490,17 @@ describe('nested agentcore directory is preserved (issue #843)', () => {
const zipBuffer = await readFile(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

// Top-level agentcore/ should NOT appear
expect(entries.some(e => e === 'agentcore/config.yaml')).toBe(false);
expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);

// Nested agentcore/ SHOULD appear
// Both top-level and nested agentcore/ are preserved in the zip —
// the zip function zips everything; exclusion is copySourceTree's concern
expect(entries).toContain('agentcore/config.yaml');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');

// Regular files present
expect(entries).toContain('main.py');
});

// ── createZipFromDirSync ──

it('sync zip: excludes top-level agentcore/ but includes nested agentcore/', () => {
it('sync zip: does not exclude agentcore/ directories (staging has no project config)', () => {
const src = buildFixture(join(root, 'zip-sync'));
const zipPath = join(root, 'zip-sync.zip');

Expand All@@ -510,9 +509,61 @@ describe('nested agentcore directory is preserved (issue #843)', () => {
const zipBuffer = readFileSync(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);
expect(entries).toContain('agentcore/config.yaml');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');
expect(entries).toContain('main.py');
});

// ── Staging directory scenario (the actual bug) ──
// After uv installs deps into staging, copySourceTree copies user source on top.
// The staging dir may contain a top-level agentcore/ from a Python package.
// createZipFromDir must NOT strip it.

it('zip preserves top-level agentcore/ Python package in staging dir', async () => {
const staging = join(root, 'staging-zip-async');
mkdirSync(staging, { recursive: true });

// Simulate uv-installed dependency with top-level agentcore/ package
const agentcorePkg = join(staging, 'langgraph_checkpoint_aws', 'agentcore');
mkdirSync(agentcorePkg, { recursive: true });
writeFileSync(join(staging, 'langgraph_checkpoint_aws', '__init__.py'), '# init');
writeFileSync(join(agentcorePkg, '__init__.py'), '# agentcore init');
writeFileSync(join(agentcorePkg, 'saver.py'), 'class AgentCoreMemorySaver: pass');

// User source copied on top by copySourceTree
writeFileSync(join(staging, 'main.py'), 'print("hello")');

const zipPath = join(root, 'staging-async.zip');
await createZipFromDir(staging, zipPath);

const zipBuffer = await readFile(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries).toContain('langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('langgraph_checkpoint_aws/agentcore/saver.py');
expect(entries).toContain('main.py');
});

it('sync zip preserves top-level agentcore/ Python package in staging dir', () => {
const staging = join(root, 'staging-zip-sync');
mkdirSync(staging, { recursive: true });

const agentcorePkg = join(staging, 'langgraph_checkpoint_aws', 'agentcore');
mkdirSync(agentcorePkg, { recursive: true });
writeFileSync(join(staging, 'langgraph_checkpoint_aws', '__init__.py'), '# init');
writeFileSync(join(agentcorePkg, '__init__.py'), '# agentcore init');
writeFileSync(join(agentcorePkg, 'saver.py'), 'class AgentCoreMemorySaver: pass');
writeFileSync(join(staging, 'main.py'), 'print("hello")');

const zipPath = join(root, 'staging-sync.zip');
createZipFromDirSync(staging, zipPath);

const zipBuffer = readFileSync(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries).toContain('langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('langgraph_checkpoint_aws/agentcore/saver.py');
expect(entries).toContain('main.py');
});
});
14 changes: 6 additions & 8 deletions src/lib/packaging/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,24 +192,23 @@ export async function createZipFromDir(sourceDir: string, outputZip: string): Pr
await rm(outputZip, { force: true });
await mkdir(dirname(outputZip), { recursive: true });

const files = await collectFiles(sourceDir, sourceDir);
const files = await collectFiles(sourceDir);
const zipped = zipSync(files);
await writeFile(outputZip, zipped);
}

async function collectFiles(directory: string, rootDir: string, basePath = ''): Promise<Zippable> {
async function collectFiles(directory: string, basePath = ''): Promise<Zippable> {
const result: Zippable = {};
const entries = await readdir(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, await collectFiles(fullPath, rootDir, zipPath));
Object.assign(result, await collectFiles(fullPath, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [await readFile(fullPath), { level: 6 }];
}
Expand DownExpand Up@@ -325,19 +324,18 @@ export function ensureBinaryAvailableSync(binary: string, installHint?: string):
throw new MissingDependencyError(binary, installHint);
}

function collectFilesSync(directory: string, rootDir: string, basePath = ''): Zippable {
function collectFilesSync(directory: string, basePath = ''): Zippable {
const result: Zippable = {};
const entries = readdirSync(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, collectFilesSync(fullPath, rootDir, zipPath));
Object.assign(result, collectFilesSync(fullPath, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [readFileSync(fullPath), { level: 6 }];
}
Expand All@@ -349,7 +347,7 @@ export function createZipFromDirSync(sourceDir: string, outputZip: string): void
rmSync(outputZip, { force: true });
mkdirSync(dirname(outputZip), { recursive: true });

const files = collectFilesSync(sourceDir, sourceDir);
const files = collectFilesSync(sourceDir);
const zipped = zipSync(files);
writeFileSync(outputZip, zipped);
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: remove CONFIG_DIR exclusion from zip stage to preserve dependency agentcore/ packages by aidandaly24 · Pull Request #1015 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 61 additions & 10 deletions src/lib/packaging/__tests__/helpers.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -477,8 +477,11 @@ describe('nested agentcore directory is preserved (issue #843)', () => {
});

// ── createZipFromDir (async) ──
// The zip stage should NOT exclude agentcore/ — that's copySourceTree's job.
// When zipping a staging directory, any agentcore/ present is a legitimate
// Python package installed by uv, not the project config dir.

it('zip: excludes top-level agentcore/ but includes nested agentcore/', async () => {
it('zip: does not exclude agentcore/ directories (staging has no project config)', async () => {
const src = buildFixture(join(root, 'zip-async'));
const zipPath = join(root, 'zip-async.zip');

Expand All@@ -487,21 +490,17 @@ describe('nested agentcore directory is preserved (issue #843)', () => {
const zipBuffer = await readFile(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

// Top-level agentcore/ should NOT appear
expect(entries.some(e => e === 'agentcore/config.yaml')).toBe(false);
expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);

// Nested agentcore/ SHOULD appear
// Both top-level and nested agentcore/ are preserved in the zip —
// the zip function zips everything; exclusion is copySourceTree's concern
expect(entries).toContain('agentcore/config.yaml');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');

// Regular files present
expect(entries).toContain('main.py');
});

// ── createZipFromDirSync ──

it('sync zip: excludes top-level agentcore/ but includes nested agentcore/', () => {
it('sync zip: does not exclude agentcore/ directories (staging has no project config)', () => {
const src = buildFixture(join(root, 'zip-sync'));
const zipPath = join(root, 'zip-sync.zip');

Expand All@@ -510,9 +509,61 @@ describe('nested agentcore directory is preserved (issue #843)', () => {
const zipBuffer = readFileSync(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);
expect(entries).toContain('agentcore/config.yaml');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');
expect(entries).toContain('main.py');
});

// ── Staging directory scenario (the actual bug) ──
// After uv installs deps into staging, copySourceTree copies user source on top.
// The staging dir may contain a top-level agentcore/ from a Python package.
// createZipFromDir must NOT strip it.

it('zip preserves top-level agentcore/ Python package in staging dir', async () => {
const staging = join(root, 'staging-zip-async');
mkdirSync(staging, { recursive: true });

// Simulate uv-installed dependency with top-level agentcore/ package
const agentcorePkg = join(staging, 'langgraph_checkpoint_aws', 'agentcore');
mkdirSync(agentcorePkg, { recursive: true });
writeFileSync(join(staging, 'langgraph_checkpoint_aws', '__init__.py'), '# init');
writeFileSync(join(agentcorePkg, '__init__.py'), '# agentcore init');
writeFileSync(join(agentcorePkg, 'saver.py'), 'class AgentCoreMemorySaver: pass');

// User source copied on top by copySourceTree
writeFileSync(join(staging, 'main.py'), 'print("hello")');

const zipPath = join(root, 'staging-async.zip');
await createZipFromDir(staging, zipPath);

const zipBuffer = await readFile(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries).toContain('langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('langgraph_checkpoint_aws/agentcore/saver.py');
expect(entries).toContain('main.py');
});

it('sync zip preserves top-level agentcore/ Python package in staging dir', () => {
const staging = join(root, 'staging-zip-sync');
mkdirSync(staging, { recursive: true });

const agentcorePkg = join(staging, 'langgraph_checkpoint_aws', 'agentcore');
mkdirSync(agentcorePkg, { recursive: true });
writeFileSync(join(staging, 'langgraph_checkpoint_aws', '__init__.py'), '# init');
writeFileSync(join(agentcorePkg, '__init__.py'), '# agentcore init');
writeFileSync(join(agentcorePkg, 'saver.py'), 'class AgentCoreMemorySaver: pass');
writeFileSync(join(staging, 'main.py'), 'print("hello")');

const zipPath = join(root, 'staging-sync.zip');
createZipFromDirSync(staging, zipPath);

const zipBuffer = readFileSync(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries).toContain('langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('langgraph_checkpoint_aws/agentcore/saver.py');
expect(entries).toContain('main.py');
});
});
14 changes: 6 additions & 8 deletions src/lib/packaging/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,24 +192,23 @@ export async function createZipFromDir(sourceDir: string, outputZip: string): Pr
await rm(outputZip, { force: true });
await mkdir(dirname(outputZip), { recursive: true });

const files = await collectFiles(sourceDir, sourceDir);
const files = await collectFiles(sourceDir);
const zipped = zipSync(files);
await writeFile(outputZip, zipped);
}

async function collectFiles(directory: string, rootDir: string, basePath = ''): Promise<Zippable> {
async function collectFiles(directory: string, basePath = ''): Promise<Zippable> {
const result: Zippable = {};
const entries = await readdir(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, await collectFiles(fullPath, rootDir, zipPath));
Object.assign(result, await collectFiles(fullPath, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [await readFile(fullPath), { level: 6 }];
}
Expand DownExpand Up@@ -325,19 +324,18 @@ export function ensureBinaryAvailableSync(binary: string, installHint?: string):
throw new MissingDependencyError(binary, installHint);
}

function collectFilesSync(directory: string, rootDir: string, basePath = ''): Zippable {
function collectFilesSync(directory: string, basePath = ''): Zippable {
const result: Zippable = {};
const entries = readdirSync(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, collectFilesSync(fullPath, rootDir, zipPath));
Object.assign(result, collectFilesSync(fullPath, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [readFileSync(fullPath), { level: 6 }];
}
Expand All@@ -349,7 +347,7 @@ export function createZipFromDirSync(sourceDir: string, outputZip: string): void
rmSync(outputZip, { force: true });
mkdirSync(dirname(outputZip), { recursive: true });

const files = collectFilesSync(sourceDir, sourceDir);
const files = collectFilesSync(sourceDir);
const zipped = zipSync(files);
writeFileSync(outputZip, zipped);
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); fix: remove CONFIG_DIR exclusion from zip stage to preserve dependency agentcore/ packages by aidandaly24 · Pull Request #1015 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 61 additions & 10 deletions src/lib/packaging/__tests__/helpers.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -477,8 +477,11 @@ describe('nested agentcore directory is preserved (issue #843)', () => {
});

// ── createZipFromDir (async) ──
// The zip stage should NOT exclude agentcore/ — that's copySourceTree's job.
// When zipping a staging directory, any agentcore/ present is a legitimate
// Python package installed by uv, not the project config dir.

it('zip: excludes top-level agentcore/ but includes nested agentcore/', async () => {
it('zip: does not exclude agentcore/ directories (staging has no project config)', async () => {
const src = buildFixture(join(root, 'zip-async'));
const zipPath = join(root, 'zip-async.zip');

Expand All@@ -487,21 +490,17 @@ describe('nested agentcore directory is preserved (issue #843)', () => {
const zipBuffer = await readFile(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

// Top-level agentcore/ should NOT appear
expect(entries.some(e => e === 'agentcore/config.yaml')).toBe(false);
expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);

// Nested agentcore/ SHOULD appear
// Both top-level and nested agentcore/ are preserved in the zip —
// the zip function zips everything; exclusion is copySourceTree's concern
expect(entries).toContain('agentcore/config.yaml');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');

// Regular files present
expect(entries).toContain('main.py');
});

// ── createZipFromDirSync ──

it('sync zip: excludes top-level agentcore/ but includes nested agentcore/', () => {
it('sync zip: does not exclude agentcore/ directories (staging has no project config)', () => {
const src = buildFixture(join(root, 'zip-sync'));
const zipPath = join(root, 'zip-sync.zip');

Expand All@@ -510,9 +509,61 @@ describe('nested agentcore directory is preserved (issue #843)', () => {
const zipBuffer = readFileSync(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries.some(e => e.startsWith('agentcore/'))).toBe(false);
expect(entries).toContain('agentcore/config.yaml');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('lib/langgraph_checkpoint_aws/agentcore/core.py');
expect(entries).toContain('main.py');
});

// ── Staging directory scenario (the actual bug) ──
// After uv installs deps into staging, copySourceTree copies user source on top.
// The staging dir may contain a top-level agentcore/ from a Python package.
// createZipFromDir must NOT strip it.

it('zip preserves top-level agentcore/ Python package in staging dir', async () => {
const staging = join(root, 'staging-zip-async');
mkdirSync(staging, { recursive: true });

// Simulate uv-installed dependency with top-level agentcore/ package
const agentcorePkg = join(staging, 'langgraph_checkpoint_aws', 'agentcore');
mkdirSync(agentcorePkg, { recursive: true });
writeFileSync(join(staging, 'langgraph_checkpoint_aws', '__init__.py'), '# init');
writeFileSync(join(agentcorePkg, '__init__.py'), '# agentcore init');
writeFileSync(join(agentcorePkg, 'saver.py'), 'class AgentCoreMemorySaver: pass');

// User source copied on top by copySourceTree
writeFileSync(join(staging, 'main.py'), 'print("hello")');

const zipPath = join(root, 'staging-async.zip');
await createZipFromDir(staging, zipPath);

const zipBuffer = await readFile(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries).toContain('langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('langgraph_checkpoint_aws/agentcore/saver.py');
expect(entries).toContain('main.py');
});

it('sync zip preserves top-level agentcore/ Python package in staging dir', () => {
const staging = join(root, 'staging-zip-sync');
mkdirSync(staging, { recursive: true });

const agentcorePkg = join(staging, 'langgraph_checkpoint_aws', 'agentcore');
mkdirSync(agentcorePkg, { recursive: true });
writeFileSync(join(staging, 'langgraph_checkpoint_aws', '__init__.py'), '# init');
writeFileSync(join(agentcorePkg, '__init__.py'), '# agentcore init');
writeFileSync(join(agentcorePkg, 'saver.py'), 'class AgentCoreMemorySaver: pass');
writeFileSync(join(staging, 'main.py'), 'print("hello")');

const zipPath = join(root, 'staging-sync.zip');
createZipFromDirSync(staging, zipPath);

const zipBuffer = readFileSync(zipPath);
const entries = Object.keys(unzipSync(new Uint8Array(zipBuffer)));

expect(entries).toContain('langgraph_checkpoint_aws/agentcore/__init__.py');
expect(entries).toContain('langgraph_checkpoint_aws/agentcore/saver.py');
expect(entries).toContain('main.py');
});
});
14 changes: 6 additions & 8 deletions src/lib/packaging/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,24 +192,23 @@ export async function createZipFromDir(sourceDir: string, outputZip: string): Pr
await rm(outputZip, { force: true });
await mkdir(dirname(outputZip), { recursive: true });

const files = await collectFiles(sourceDir, sourceDir);
const files = await collectFiles(sourceDir);
const zipped = zipSync(files);
await writeFile(outputZip, zipped);
}

async function collectFiles(directory: string, rootDir: string, basePath = ''): Promise<Zippable> {
async function collectFiles(directory: string, basePath = ''): Promise<Zippable> {
const result: Zippable = {};
const entries = await readdir(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, await collectFiles(fullPath, rootDir, zipPath));
Object.assign(result, await collectFiles(fullPath, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [await readFile(fullPath), { level: 6 }];
}
Expand DownExpand Up@@ -325,19 +324,18 @@ export function ensureBinaryAvailableSync(binary: string, installHint?: string):
throw new MissingDependencyError(binary, installHint);
}

function collectFilesSync(directory: string, rootDir: string, basePath = ''): Zippable {
function collectFilesSync(directory: string, basePath = ''): Zippable {
const result: Zippable = {};
const entries = readdirSync(directory, { withFileTypes: true });

for (const entry of entries) {
if (EXCLUDED_ENTRIES.has(entry.name)) continue;
if (entry.name === CONFIG_DIR && resolve(directory) === resolve(rootDir)) continue;

const fullPath = join(directory, entry.name);
const zipPath = basePath ? `${basePath}/${entry.name}` : entry.name;

if (entry.isDirectory()) {
Object.assign(result, collectFilesSync(fullPath, rootDir, zipPath));
Object.assign(result, collectFilesSync(fullPath, zipPath));
} else if (entry.isFile()) {
result[zipPath] = [readFileSync(fullPath), { level: 6 }];
}
Expand All@@ -349,7 +347,7 @@ export function createZipFromDirSync(sourceDir: string, outputZip: string): void
rmSync(outputZip, { force: true });
mkdirSync(dirname(outputZip), { recursive: true });

const files = collectFilesSync(sourceDir, sourceDir);
const files = collectFilesSync(sourceDir);
const zipped = zipSync(files);
writeFileSync(outputZip, zipped);
}
Expand Down
Loading