fix(shared): emit PowerShell zip entries as json lines

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
This commit is contained in:
YeonGyu-Kim
2026-04-04 01:16:30 +09:00
parent 0c5deac232
commit 553a961338
@@ -4,35 +4,74 @@ import type { ArchiveEntry } from "../archive-entry-validator"
export type PowerShellZipExtractor = "pwsh" | "powershell" export type PowerShellZipExtractor = "pwsh" | "powershell"
type PowerShellZipEntryRecord = {
type: "file" | "directory" | "symlink"
name: string
target: string
}
function isPowerShellZipEntryRecord(value: unknown): value is PowerShellZipEntryRecord {
if (!value || typeof value !== "object") {
return false
}
const candidate = value as Record<string, unknown>
return (
(candidate.type === "file" || candidate.type === "directory" || candidate.type === "symlink") &&
typeof candidate.name === "string" &&
typeof candidate.target === "string"
)
}
export function parsePowerShellZipEntryLine(line: string): ArchiveEntry | null {
const parsedValue: unknown = JSON.parse(line)
if (!isPowerShellZipEntryRecord(parsedValue)) {
return null
}
if (parsedValue.type === "symlink") {
return {
path: parsedValue.name,
type: parsedValue.type,
linkPath: parsedValue.target,
}
}
return {
path: parsedValue.name,
type: parsedValue.type,
}
}
export async function listZipEntriesWithPowerShell( export async function listZipEntriesWithPowerShell(
archivePath: string, archivePath: string,
escapePowerShellPath: (path: string) => string, escapePowerShellPath: (path: string) => string,
extractor: PowerShellZipExtractor extractor: PowerShellZipExtractor
): Promise<ArchiveEntry[]> { ): Promise<ArchiveEntry[]> {
const proc = spawn( const proc = spawn(
[
extractor,
"-Command",
[ [
extractor,
"-Command",
[
"Add-Type -AssemblyName System.IO.Compression.FileSystem", "Add-Type -AssemblyName System.IO.Compression.FileSystem",
`$archive = [System.IO.Compression.ZipFile]::OpenRead('${escapePowerShellPath(archivePath)}')`, `$archive = [System.IO.Compression.ZipFile]::OpenRead('${escapePowerShellPath(archivePath)}')`,
"try {", "try {",
" foreach ($entry in $archive.Entries) {", " foreach ($entry in $archive.Entries) {",
" $mode = ($entry.ExternalAttributes -shr 16) -band 0xFFFF", " $mode = ($entry.ExternalAttributes -shr 16) -band 0xFFFF",
" $type = if (($mode -band 0xF000) -eq 0xA000) { 'symlink' } elseif ($entry.FullName.EndsWith('/')) { 'directory' } else { 'file' }", " $type = if (($mode -band 0xF000) -eq 0xA000) { 'symlink' } elseif ($entry.FullName.EndsWith('/')) { 'directory' } else { 'file' }",
" $target = ''", " $target = ''",
" if ($type -eq 'symlink') {", " if ($type -eq 'symlink') {",
" $stream = $entry.Open()", " $stream = $entry.Open()",
" try {", " try {",
" $reader = New-Object System.IO.StreamReader($stream)", " $reader = New-Object System.IO.StreamReader($stream)",
" try { $target = $reader.ReadToEnd() } finally { $reader.Dispose() }", " try { $target = $reader.ReadToEnd() } finally { $reader.Dispose() }",
" } finally { $stream.Dispose() }", " } finally { $stream.Dispose() }",
" }", " }",
" Write-Output ($type + \"`t\" + $entry.FullName + \"`t\" + $target)", " Write-Output (ConvertTo-Json @{type=$type; name=$entry.FullName; target=$target} -Compress)",
" }", " }",
"} finally {", "} finally {",
" $archive.Dispose()", " $archive.Dispose()",
"}", "}",
].join("; "), ].join("; "),
], ],
{ {
@@ -55,24 +94,6 @@ export async function listZipEntriesWithPowerShell(
.split(/\r?\n/) .split(/\r?\n/)
.map(line => line.trim()) .map(line => line.trim())
.filter(Boolean) .filter(Boolean)
.map((line): ArchiveEntry | null => { .map(line => parsePowerShellZipEntryLine(line))
const [type, entryPath, linkPath = ""] = line.split("\t")
if (type !== "file" && type !== "directory" && type !== "symlink") {
return null
}
if (type === "symlink") {
return {
path: entryPath,
type,
linkPath,
}
}
return {
path: entryPath,
type,
}
})
.filter((entry): entry is ArchiveEntry => entry !== null) .filter((entry): entry is ArchiveEntry => entry !== null)
} }