Merge branch 'main' into dev
Resolve 38 conflicts preserving both sides' work: - Server: DB-based registries (dev) + WorkspaceGitService/DaemonConfigStore (main) - App: script proxy/voice MCP (dev) + pin/hide tabs/bootstrap boundary (main) - Shared: WorkspaceScriptPayload (dev) + git/GitHub runtime schemas (main) - Deleted workspace-registry-bootstrap.ts (dev's DB approach supersedes)
This commit is contained in:
@@ -76,7 +76,11 @@ function pruneSharpLibvips(nodeModules, platform, arch) {
|
||||
if (!fs.existsSync(imgDir)) return;
|
||||
|
||||
for (const entry of fs.readdirSync(imgDir)) {
|
||||
if (entry.startsWith("sharp-") && entry !== prefix && !entry.startsWith(`sharp-${platform}-${arch}`)) {
|
||||
if (
|
||||
entry.startsWith("sharp-") &&
|
||||
entry !== prefix &&
|
||||
!entry.startsWith(`sharp-${platform}-${arch}`)
|
||||
) {
|
||||
rmSafe(path.join(imgDir, entry));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -505,8 +505,7 @@ async function main() {
|
||||
dragRegionCheck.candidate.explicitNoDragInteractive.length > 0,
|
||||
details: {
|
||||
candidate: dragRegionCheck.candidate,
|
||||
explicitNoDragInteractive:
|
||||
dragRegionCheck.candidate?.explicitNoDragInteractive ?? [],
|
||||
explicitNoDragInteractive: dragRegionCheck.candidate?.explicitNoDragInteractive ?? [],
|
||||
},
|
||||
screenshot: dragScreenshot,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user