Merge upstream/master into dev (76 commits)

Resolved 5 conflicts:
- .github/workflows/docker.yml, release.yml: kept fork stubs (CI handled by build-prod/build-dev)
- server/src/routes/secrets.ts: kept fork's /usages route alongside upstream's /usage, /access-events
- server/src/services/secrets.ts: kept fork's usages() function and in-use deletion guard,
  layered before upstream's soft-delete + provider cleanup in remove()
- ui/src/api/secrets.ts: kept fork's usages() method alongside upstream's vault methods

Typechecks pass on @paperclipai/shared, @paperclipai/server, @paperclipai/ui.
This commit is contained in:
2026-05-11 18:01:34 -04:00
625 changed files with 145314 additions and 4442 deletions
+4 -3
View File
@@ -43,8 +43,8 @@ import {
collectAllPaths,
parseFrontmatter,
FRONTMATTER_FIELD_LABELS,
PackageFileTree,
} from "../components/PackageFileTree";
FileTree,
} from "../components/FileTree";
import { readZipArchive } from "../lib/zip";
import { getPortableFileDataUrl, getPortableFileText, isPortableImageFile } from "../lib/portable-files";
@@ -1344,7 +1344,7 @@ export function CompanyImport() {
<h2 className="text-base font-semibold">Package files</h2>
</div>
<div className="flex-1 overflow-y-auto">
<PackageFileTree
<FileTree
nodes={tree}
selectedFile={selectedFile}
expandedDirs={expandedDirs}
@@ -1354,6 +1354,7 @@ export function CompanyImport() {
onToggleCheck={handleToggleCheck}
renderFileExtra={(node, checked) => renderImportFileExtra(node, checked, renameMap)}
fileRowClassName={importFileRowClassName}
wrapLabels={false}
/>
</div>
</aside>