sync: update from private repo (6fcb0d0)
This commit is contained in:
+11
-1
@@ -43,6 +43,7 @@ import { createWorkerMetrics, type WorkerMetrics } from '../metrics/worker-metri
|
||||
import { createMetricsHandler } from '../metrics/http-handler.js';
|
||||
import { buildDirectProbe, buildProxyProbe } from '../engine/backend-probes.js';
|
||||
import { startTrashCleanup } from '../user-folder/trash-cleanup.js';
|
||||
import { userPiecesDir } from '../user-folder/paths.js';
|
||||
import { startReflectionRetentionSweep } from '../engine/reflection/retention.js';
|
||||
import type { AuthConfig } from '../config.js';
|
||||
import { isKeyConfigured } from '../mcp/crypto.js';
|
||||
@@ -777,7 +778,16 @@ export function createCoreServer(opts: CoreServerOptions): {
|
||||
generateTitle: opts.generateTitle,
|
||||
selectPiece: opts.selectPiece,
|
||||
pieceExists: opts.piecesDir
|
||||
? (name: string) => findPieceFile(name, opts.piecesDir!, opts.customPiecesDir) !== null
|
||||
? (name: string, ownerId?: string) => {
|
||||
// Mirror the worker's per-user → global-custom → builtin resolution order.
|
||||
// 1. Owner's per-user dir (matches what worker uses at job run time).
|
||||
// No-auth tasks (ownerId null) fall back to 'local', mirroring the worker.
|
||||
const ufl = loadConfig().userFolderRoot ?? './data/users';
|
||||
const ownerForPieces = ownerId ?? 'local';
|
||||
if (existsSync(join(userPiecesDir(ufl, ownerForPieces), `${name}.yaml`))) return true;
|
||||
// 2. Global-custom + builtin via existing helper.
|
||||
return findPieceFile(name, opts.piecesDir!, opts.customPiecesDir) !== null;
|
||||
}
|
||||
: undefined,
|
||||
sessRepo,
|
||||
getMaxUploadMb: opts.configManager
|
||||
|
||||
Reference in New Issue
Block a user