Jannik/PaperClipAI
1
0 Fork 0
mirror of https://github.com/paperclipai/paperclip.git synced 2026-10-21 16:27:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bounded Boat file operations into acceptance branch

Browse Source 
Co-Authored-By: Paperclip <noreply@paperclip.ing>

* commit '47b4bc1d4ea61e4b92b9d6a3bb36067e4b06490e':
  fix: enforce file operation deadlines inside the remote process group
  fix: preserve automatic workspace fallback for missing Boat files
  fix: share one bounded lifetime across computer file operations
This commit is contained in:
DottaandPaperclip committed 2026-10-10 14:02:50 -05:00
2 parents 6e09a5ee82 47b4bc1d4e
commit b375f46557
7 files changed
+316 -43
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

server/src/services/workspace-file-resources.ts
+23 -13
View File
@@ -1385,14 +1385,14 @@ export function workspaceFileResourceService(db: Db, actor?: AuthorizationActor,
const hasExplicitTarget = Boolean(explicitTarget?.candidate);
let lastNotFound: unknown = null;
for (const candidate of candidates) {
if (candidate.placement) return availabilityResult(item.query, await statPersistentCandidate(candidate, item.normalizedPath, item.directory));
if (candidate.remote) {
if (candidate.remote && !candidate.placement) {
if (hasExplicitTarget || item.query.workspace !== "auto") {
return availabilityResult(item.query, remoteResource(candidate, item.normalizedPath.relativePath));
}
continue;
}
try {
if (candidate.placement) return availabilityResult(item.query, await statPersistentCandidate(candidate, item.normalizedPath, item.directory));
const resource = item.directory
? (await statLocalDirectory(candidate, item.normalizedPath)).resource
: (await statLocalCandidate(candidate, item.normalizedPath)).resource;
@@ -1454,12 +1454,12 @@ export function workspaceFileResourceService(db: Db, actor?: AuthorizationActor,
let lastNotFound: unknown = null;
for (const candidate of candidates) {
if (candidate.placement) return statPersistentCandidate(candidate, normalized, isDirectoryRequest);
if (candidate.remote) {
if (candidate.remote && !candidate.placement) {
if (explicitTarget || selector !== "auto") return remoteResource(candidate, normalized.relativePath);
continue;
}
try {
if (candidate.placement) return await statPersistentCandidate(candidate, normalized, isDirectoryRequest);
return isDirectoryRequest
? (await statLocalDirectory(candidate, normalized)).resource
: (await statLocalCandidate(candidate, normalized)).resource;
@@ -1513,7 +1513,17 @@ export function workspaceFileResourceService(db: Db, actor?: AuthorizationActor,
let firstUnavailable: { candidate: WorkspaceCandidate; reason: string } | null = null;
let lastNotFound: unknown = null;
for (const candidate of candidates) {
if (candidate.placement) return persistentList(candidate, { selector, mode, normalizedPath, q, normalizedQuery, limit, offset });
if (candidate.placement) {
try {
return await persistentList(candidate, { selector, mode, normalizedPath, q, normalizedQuery, limit, offset });
} catch (error) {
if (normalizedPath && !explicitTarget && selector === "auto" && isHttpStatus(error, 404)) {
lastNotFound = error;
continue;
}
throw error;
}
}
if (candidate.remote) {
firstUnavailable ??= { candidate, reason: "remote_workspace" };
if (explicitTarget || selector !== "auto") {
@@ -1720,8 +1730,7 @@ export function workspaceFileResourceService(db: Db, actor?: AuthorizationActor,
let lastNotFound: unknown = null;
for (const candidate of candidates) {
if (candidate.placement) return persistentContent(candidate, normalized);
if (candidate.remote) {
if (candidate.remote && !candidate.placement) {
if (explicitTarget || selector !== "auto") {
throw unprocessable("Remote workspaces cannot be previewed by the server", { code: "remote_workspace" });
}
@@ -1729,6 +1738,7 @@ export function workspaceFileResourceService(db: Db, actor?: AuthorizationActor,
}
let resolved: LocalResolvedFile;
try {
if (candidate.placement) return await persistentContent(candidate, normalized);
resolved = await statLocalCandidate(candidate, normalized);
} catch (error) {
if (!explicitTarget && selector === "auto" && isHttpStatus(error, 404)) {
@@ -1805,18 +1815,18 @@ export function workspaceFileResourceService(db: Db, actor?: AuthorizationActor,
let lastNotFound: unknown = null;
for (const candidate of candidates) {
if (candidate.placement) {
const resource = await statPersistentCandidate(candidate, normalized);
const { bytes } = await (await placementFiles(candidate)).readBytes(normalized.relativePath);
return { resource: { ...resource, byteSize: bytes.length }, bytes };
}
if (candidate.remote) {
if (candidate.remote && !candidate.placement) {
if (explicitTarget || selector !== "auto") {
throw unprocessable("Remote workspaces cannot be downloaded by the server", { code: "remote_workspace" });
}
continue;
}
try {
if (candidate.placement) {
const resource = await statPersistentCandidate(candidate, normalized);
const { bytes } = await (await placementFiles(candidate)).readBytes(normalized.relativePath);
return { resource: { ...resource, byteSize: bytes.length }, bytes };
}
return await statLocalCandidate(candidate, normalized);
} catch (error) {
if (!explicitTarget && selector === "auto" && isHttpStatus(error, 404)) {