nolo-cli 0.1.26 → 0.1.29

package/database/actions/readAndWait.ts

@@ -1,13 +1,21 @@
 // 文件路径: database/actions/readAndWait.ts
 
-import type { AppThunkApi } from "app/store";
+import type { AppThunkApi } from "../../app/store";
 import {
-  fetchFromClientDb,
-  fetchFromServer,
-} from "./common";
+  BUILTIN_AGENT_CREATOR_AGENT_KEY,
+  buildBuiltinAgentCreatorRecord,
+} from "../../core/builtinAgents";
+import { fetchFromClientDb, fetchFromServer } from "./common";
 import { readRequestManager } from "./readRequestManager";
 import { scheduleExistingRecordReplication } from "./replication";
-import { getRuntimeServerContext } from "database/runtimeServerContext";
+import { getRuntimeServerContext } from "../runtimeServerContext";
+import { resolveAgentReadServers } from "./agentReadResolution";
+import {
+  compareRemoteRecordsByComparableTime,
+  pickBestSettledRemoteRecord,
+  shouldReplaceLocalWithRemoteRecord,
+  shouldReplicateLocalRecord,
+} from "./readResolution";
 
 /**
  * 比较远程数据和本地数据的时间戳，判断远程数据是否更新。
@@ -16,26 +24,7 @@ import { getRuntimeServerContext } from "database/runtimeServerContext";
  * @returns 如果远程数据更新，则返回 true。
  */
 const isRemoteDataNewer = (remoteData: any, localData: any): boolean => {
-  const toComparableTimestamp = (data: any): number => {
-    if (!data || typeof data !== "object") return 0;
-
-    const updatedAtMs = new Date(data.updatedAt).getTime();
-    if (Number.isFinite(updatedAtMs) && updatedAtMs > 0) return updatedAtMs;
-
-    const createdAtMs = new Date(data.createdAt).getTime();
-    if (Number.isFinite(createdAtMs) && createdAtMs > 0) return createdAtMs;
-
-    const metaCreatedAt = Number(data?.meta?.createdAt);
-    if (Number.isFinite(metaCreatedAt) && metaCreatedAt > 0) return metaCreatedAt;
-
-    return 0;
-  };
-
-  const remoteTs = toComparableTimestamp(remoteData);
-  const localTs = toComparableTimestamp(localData);
-  if (remoteTs <= 0) return false;
-  if (localTs <= 0) return true;
-  return remoteTs > localTs;
+  return compareRemoteRecordsByComparableTime(remoteData, localData) > 0;
 };
 
 /**
@@ -43,70 +32,27 @@ const isRemoteDataNewer = (remoteData: any, localData: any): boolean => {
  * 通常在发现本地存在数据而所有远程服务器上都不存在该数据时调用。
  */
 const syncLocalDataToServer = async (
-  thunkApi: AppThunkApi,
+  replicationContext: {
+    currentServer: string | undefined;
+    syncServers: string[] | undefined;
+    state: unknown;
+  },
   dbKey: string,
   localData: any
 ): Promise<void> => {
   try {
-    const state = thunkApi.getState();
-    const { currentServer, syncServers } = getRuntimeServerContext(state);
     scheduleExistingRecordReplication({
-      currentServer,
-      syncServers,
+      currentServer: replicationContext.currentServer,
+      syncServers: replicationContext.syncServers,
       dbKey,
       localData,
-      state,
+      state: replicationContext.state,
     });
   } catch {
     // 后台同步失败不阻塞主流程，静默处理即可
   }
 };
 
-/**
- * 从所有远程服务器的请求结果中，筛选出有效的、时间戳最新的那一份数据。
- */
-const getValidRemoteData = (
-  dbKey: string,
-  settledResults: PromiseSettledResult<any>[],
-  localData?: any
-): { data: any; index: number } | null => {
-  const toComparableTimestamp = (data: any): number => {
-    if (!data || typeof data !== "object") return 0;
-
-    const updatedAtMs = new Date(data.updatedAt).getTime();
-    if (Number.isFinite(updatedAtMs) && updatedAtMs > 0) return updatedAtMs;
-
-    const createdAtMs = new Date(data.createdAt).getTime();
-    if (Number.isFinite(createdAtMs) && createdAtMs > 0) return createdAtMs;
-
-    const metaCreatedAt = Number(data?.meta?.createdAt);
-    if (Number.isFinite(metaCreatedAt) && metaCreatedAt > 0) return metaCreatedAt;
-
-    return 0;
-  };
-
-  const validResults = settledResults
-    .map((result, index) => ({
-      data: result.status === "fulfilled" ? result.value : null,
-      index,
-    }))
-    .filter((item) => item.data !== null && typeof item.data === "object");
-
-  if (validResults.length === 0) return null;
-
-  // 从所有有效的远程数据中，选出时间戳最新的那一个。
-  const latest = validResults.reduce((latest, current) => {
-    const latestTimestamp = toComparableTimestamp(latest.data);
-    const currentTimestamp = toComparableTimestamp(current.data);
-    return currentTimestamp > latestTimestamp ? current : latest;
-  });
-
-  return {
-    ...latest,
-    data: latest.data,
-  };
-};
-
 /**
  * 核心处理函数：协调本地和远程数据，决定最终返回哪个版本的数据，并处理同步逻辑。
  */
@@ -115,23 +61,35 @@ const processRemoteData = async (
   dbKey: string,
   remotePromises: Promise<any>[],
   localData: any,
-  thunkApi: AppThunkApi
+  replicationContext: {
+    currentServer: string | undefined;
+    syncServers: string[] | undefined;
+    state: unknown;
+  }
 ): Promise<any> => {
   try {
     // 并行执行所有远程请求，并等待它们全部完成（无论成功或失败）。
     const settledResults = await Promise.allSettled(remotePromises);
     // 从所有结果中，找出最“权威”的远程版本（时间戳最新）。
-    const remoteResult = getValidRemoteData(dbKey, settledResults, localData);
+    const remoteResult = pickBestSettledRemoteRecord({
+      settledResults,
+      isBetterCandidate: (current, latest) =>
+        compareRemoteRecordsByComparableTime(current, latest) > 0,
+    });
     const validRemoteData = remoteResult ? remoteResult.data : null;
 
     // --- 数据决策核心逻辑 ---
 
     // 场景 1: 至少一个远程服务器返回了有效数据。
-    if (validRemoteData) {
+    if (
+      shouldReplaceLocalWithRemoteRecord({
+        localData,
+        remoteData: validRemoteData,
+        isRemoteNewer: isRemoteDataNewer,
+      })
+    ) {
       // 如果本地没有数据，或者远程更新更新，则用远程覆盖本地缓存。
-      if (!localData || isRemoteDataNewer(validRemoteData, localData)) {
-        await db.put(dbKey, validRemoteData);
-      }
+      await db.put(dbKey, validRemoteData);
       // 最终决策：返回权威的远程数据。
       return validRemoteData;
     }
@@ -139,14 +97,23 @@ const processRemoteData = async (
     // 场景 2: 所有远程服务器都没有返回有效数据，但我们本地数据库中存在数据。
     if (localData) {
       // 仅当“确实有远程目标”时，才尝试上传本地数据到服务器。
-      if (remotePromises.length > 0) {
-        void syncLocalDataToServer(thunkApi, dbKey, localData);
+      if (
+        shouldReplicateLocalRecord({
+          localData,
+          remoteData: validRemoteData,
+          remoteTargetCount: remotePromises.length,
+        })
+      ) {
+        void syncLocalDataToServer(replicationContext, dbKey, localData);
       }
       // 最终决策：返回本地数据。
       return localData;
     }
 
     // 场景 3: 远程和本地都找不到任何数据。
+    if (dbKey === BUILTIN_AGENT_CREATOR_AGENT_KEY) {
+      return buildBuiltinAgentCreatorRecord();
+    }
     throw new Error("Failed to fetch data from all sources");
   } catch (err) {
     // 如果在上述过程中发生错误，且有本地数据，则优先返回本地数据，避免崩溃。
@@ -175,8 +142,9 @@ export const readAndWaitAction = async (
   }
 
   const state = thunkApi.getState();
-  const { currentToken, remoteServers: allServers } =
+  const { currentToken, remoteServers: configuredServers, currentServer, syncServers } =
     getRuntimeServerContext(state);
+  const allServers = resolveAgentReadServers({ dbKey, configuredServers });
   const isLoggedIn = !!currentToken;
 
   const executeReadAndWait = async (): Promise<any> => {
@@ -205,7 +173,7 @@ export const readAndWaitAction = async (
       dbKey,
       remotePromises,
       localData,
-      thunkApi
+      { currentServer, syncServers, state }
     );
 
     // ⭐ 统一：不论返回的是本地还是远程，最终都附加 dbKey 字段

package/database/actions/readOutcome.ts

@@ -0,0 +1,45 @@
+export type RemoteReadStatusTag =
+  | "success"
+  | "not_found"
+  | "unauthorized"
+  | "forbidden"
+  | "transient_error"
+  | "http_error";
+
+export const classifyRemoteReadStatus = (
+  status: number
+): RemoteReadStatusTag => {
+  if (status === 200) return "success";
+  if (status === 404) return "not_found";
+  if (status === 401) return "unauthorized";
+  if (status === 403) return "forbidden";
+  if ([408, 425, 429, 500, 502, 503, 504].includes(status)) {
+    return "transient_error";
+  }
+  return "http_error";
+};
+
+export type ReadMissReason =
+  | "temporarily_suppressed"
+  | "offline_without_local_data"
+  | "all_sources_failed";
+
+export const buildReadMissError = ({
+  dbKey,
+  reason,
+}: {
+  dbKey: string;
+  reason: ReadMissReason;
+}) => {
+  switch (reason) {
+    case "temporarily_suppressed":
+      return new Error(`Read temporarily suppressed for missing key "${dbKey}".`);
+    case "offline_without_local_data":
+      return new Error(
+        `Failed to fetch data for key "${dbKey}" because network is offline and no local data is available.`
+      );
+    case "all_sources_failed":
+    default:
+      return new Error(`Failed to fetch data for key "${dbKey}" from all sources.`);
+  }
+};

package/database/actions/readResolution.ts

@@ -0,0 +1,102 @@
+const normalizeServerOrigin = (server: string): string =>
+  server.trim().replace(/\/+$/, "");
+
+const toComparableTimestamp = (data: any): number => {
+  if (!data || typeof data !== "object") return 0;
+
+  const updatedAtMs = new Date(data.updatedAt).getTime();
+  if (Number.isFinite(updatedAtMs) && updatedAtMs > 0) return updatedAtMs;
+
+  const createdAtMs = new Date(data.createdAt).getTime();
+  if (Number.isFinite(createdAtMs) && createdAtMs > 0) return createdAtMs;
+
+  const metaCreatedAt = Number(data?.meta?.createdAt);
+  if (Number.isFinite(metaCreatedAt) && metaCreatedAt > 0) return metaCreatedAt;
+
+  return 0;
+};
+
+export const partitionReadServers = ({
+  allServers,
+  preferredServerOrigin,
+}: {
+  allServers: string[];
+  preferredServerOrigin?: string | null;
+}): {
+  preferredServer: string | null;
+  fallbackServers: string[];
+  orderedServersForLocalHit: string[];
+} => {
+  const preferredServer =
+    typeof preferredServerOrigin === "string" &&
+    preferredServerOrigin.trim().length > 0
+      ? normalizeServerOrigin(preferredServerOrigin)
+      : null;
+
+  const fallbackServers = preferredServer
+    ? allServers.filter(
+        (server) => normalizeServerOrigin(server) !== preferredServer
+      )
+    : allServers;
+
+  return {
+    preferredServer,
+    fallbackServers,
+    orderedServersForLocalHit: preferredServer
+      ? [preferredServer, ...fallbackServers]
+      : fallbackServers,
+  };
+};
+
+export const compareRemoteRecordsByComparableTime = (
+  left: any,
+  right: any
+): number => toComparableTimestamp(left) - toComparableTimestamp(right);
+
+export const pickBestSettledRemoteRecord = ({
+  settledResults,
+  isBetterCandidate,
+}: {
+  settledResults: PromiseSettledResult<any>[];
+  isBetterCandidate: (current: any, latest: any) => boolean;
+}): { data: any; index: number } | null => {
+  const validResults = settledResults
+    .map((result, index) => ({
+      data: result.status === "fulfilled" ? result.value : null,
+      index,
+    }))
+    .filter((item) => item.data !== null && typeof item.data === "object");
+
+  if (validResults.length === 0) return null;
+
+  const latest = validResults.reduce((best, current) =>
+    isBetterCandidate(current.data, best.data) ? current : best
+  );
+
+  return { index: latest.index, data: latest.data };
+};
+
+export const shouldReplaceLocalWithRemoteRecord = ({
+  localData,
+  remoteData,
+  isRemoteNewer,
+}: {
+  localData: any;
+  remoteData: any;
+  isRemoteNewer: (remoteData: any, localData: any) => boolean;
+}): boolean => {
+  if (!remoteData || typeof remoteData !== "object") return false;
+  if (!localData || typeof localData !== "object") return true;
+  return isRemoteNewer(remoteData, localData);
+};
+
+export const shouldReplicateLocalRecord = ({
+  localData,
+  remoteData,
+  remoteTargetCount,
+}: {
+  localData: any;
+  remoteData: any;
+  remoteTargetCount: number;
+}): boolean =>
+  !!localData && !remoteData && remoteTargetCount > 0;

package/database/actions/remove.ts

@@ -1,7 +1,7 @@
 // 文件路径: src/database/actions/delete.ts
 
-import type { AppThunkApi } from "app/store";
-import { getRuntimeServerContext } from "database/runtimeServerContext";
+import type { AppThunkApi } from "../../app/store";
+import { getRuntimeServerContext } from "../runtimeServerContext";
 
 import { fetchFromClientDb } from "./common";
 import { deleteFileFromIndexedDb } from "../fileStorage";

package/database/actions/upload.ts

@@ -1,14 +1,14 @@
 // 文件路径: database/actions/upload.ts
 
-import { getRuntimeServerContext } from "database/runtimeServerContext";
+import { getRuntimeServerContext } from "../runtimeServerContext";
 import { ulid } from "../utils/ulid";
 import { normalizeTimeFields, logger } from "./common";
-import { toast } from "app/utils/toast";
+import { toast } from "../../app/utils/toast";
 import { saveFileToIndexedDb } from "../fileStorage";
 import { fileKey } from "../keys";
 import { scheduleUploadReplication, uploadToCurrentServer } from "./replication";
-import { DataType } from "create/types";
-import { resolveFileCategory } from "app/utils/fileUtils";
+import { DataType } from "../../create/types";
+import { resolveFileCategory } from "../../app/utils/fileUtils";
 
 /**
  * 辅助函数：保存文件元数据到客户端数据库

package/database/actions/upsert.ts

@@ -1,6 +1,6 @@
 // src/database/actions/upsert.ts
-import { toast } from "app/utils/toast";
-import type { AppThunkApi } from "app/store";
+import { toast } from "../../app/utils/toast";
+import type { AppThunkApi } from "../../app/store";
 
 import { patchAction } from "./patch";
 import { readAction } from "./read";

package/database/actions/write.ts

@@ -1,14 +1,14 @@
 // 文件路径: database/actions/write.ts
 
-import type { AppThunkApi } from "app/store";
-import { getRuntimeServerContext } from "database/runtimeServerContext";
-import { DataType } from "create/types";
+import type { AppThunkApi } from "../../app/store";
+import { getRuntimeServerContext } from "../runtimeServerContext";
+import { DataType } from "../../create/types";
 import { normalizeTimeFields, logger } from "./common";
 import {
   resolveReplicationServers,
   scheduleWriteReplication,
 } from "./replication";
-import { toast } from "app/utils/toast";
+import { toast } from "../../app/utils/toast";
 
 const SPACE_MEMBER_PREFIX = "space-member-";
 

package/database/client/handleError.ts

@@ -1,4 +1,4 @@
-import i18n from "app/i18n";
+import i18n from "../../app/i18n";
 export const handleError = (error, handleUnauthorized?) => {
   let message;
   switch (error.message) {

package/database/client/queryRequest.ts

@@ -1,4 +1,4 @@
-import { API_ENDPOINTS } from "database/config";
+import { API_ENDPOINTS } from "../config";
 
 export const noloQueryRequest = async (queryConfig: any) => {
   const { server } = queryConfig;

package/database/dbSlice.ts

@@ -6,7 +6,7 @@ import {
   createEntityAdapter,
   type PayloadAction,
 } from "@reduxjs/toolkit";
-import type { RootState } from "app/store";
+import type { RootState } from "../app/store";
 
 // Import actions
 import { removeAction } from "./actions/remove";
@@ -17,7 +17,7 @@ import { patchAction } from "./actions/patch";
 import { upsertAction } from "./actions/upsert";
 import { uploadFileAction } from "./actions/upload";
 import { readFileContentAction } from "./actions/fileContent";
-import { shareResourceAction } from "share/action";
+import { shareResourceAction } from "../share/action";
 
 // Use dbKey as the entity's unique identifier
 export const dbAdapter = createEntityAdapter<any>({

package/database/email.ts

@@ -1,4 +1,4 @@
-import type { DataType } from "create/types";
+import type { DataType } from "../create/types";
 
 export type EmailOwnerType = "user" | "agent";
 export type EmailMailbox = "inbox" | "sent" | "archive" | "trash" | "drafts";

package/database/hooks/useUserData.ts

@@ -3,11 +3,11 @@ import { useEffect, useState, useCallback, useRef, useMemo } from "react";
 import {
   selectRuntimeRemoteServers,
   selectRuntimeSnapshot,
-} from "app/stateViews/runtime";
-import { toast } from "app/utils/toast";
+} from "../../app/stateViews/runtime";
+import { toast } from "../../app/utils/toast";
 
-import { DataType } from "create/types";
-import { useAppDispatch, useAppSelector } from "app/store";
+import { DataType } from "../../create/types";
+import { useAppDispatch, useAppSelector } from "../../app/store";
 import {
   getUserDataItemTimestamp,
   mergeAndDedupUserData,

package/database/keys.ts

@@ -9,7 +9,7 @@
 
 import { ulid } from "./utils/ulid";
 import { curry } from "rambda";
-import { DataType } from "create/types"; // 枚举：DIALOG / PAGE / CYBOT …
+import { DataType } from "../create/types"; // 枚举：DIALOG / PAGE / CYBOT …
 
 /* --------------------------------------------------------------------------
  * 基础工具
@@ -539,7 +539,7 @@ export const pubAgentKeys = {
 };
 
 /* ---- Share (re-exported from share/keys) ---- */
-export { shareKey } from "share/keys";
+export { shareKey } from "../share/keys";
 
 /* --------------------------------------------------------------------------
  * 3. 收藏（Favorite）相关键 —— 显式区分 id / key

package/database/runtimeServerContext.ts

@@ -1,6 +1,6 @@
-import type { RootState } from "app/store";
-import { selectRuntimeSnapshot } from "app/stateViews/runtime";
-import { getAllServers } from "database/actions/common";
+import type { RootState } from "../app/store";
+import { selectRuntimeSnapshot } from "../app/stateViews/runtime";
+import { getAllServers } from ".//actions/common";
 
 export type RuntimeServerContext = {
   currentToken?: string;

package/database/server/actorAccess.ts

@@ -1,4 +1,4 @@
-import type { ActorContext } from "auth/actor";
+import type { ActorContext } from "../../auth/actor";
 import {
   authorizeRecordAccess,
   type AccessAction,

package/database/server/cybotReadonly.ts

@@ -1,4 +1,4 @@
-import { DataType } from "create/types";
+import { DataType } from "../../create/types";
 
 export const CYBOT_READONLY_MESSAGE =
   "Cybot data is read-only and cannot be modified. Please use agent data instead.";

package/database/server/dataHandlers.ts

@@ -1,6 +1,6 @@
 import { pino } from "pino";
 import serverDb from "./db";
-import { chargeTokenUsageWithLedger } from "auth/server/tokenUsageBilling";
+import { chargeTokenUsageWithLedger } from "../../auth/server/tokenUsageBilling";
 
 const logger = pino({ name: "dataHandlers" });
 

package/database/server/delete.ts

@@ -1,19 +1,19 @@
 // 文件: database/server/delete.ts
 
 import serverDb from "./db";
-import { DataType } from "create/types";
-import { deleteMessages } from "chat/messages/deleteMessages";
-import { deleteTable } from "database/table/deleteTable";
-import { isSystemAdmin, nolotusId } from "core/init";
-import { authenticateRequest } from "auth/utils";
-import { invalidatePublicAgentsCache } from "ai/agent/server/fetchPublicAgents";
+import { DataType } from "../../create/types";
+import { deleteMessages } from "../../chat/messages/deleteMessages";
+import { deleteTable } from "../table/deleteTable";
+import { isSystemAdmin, nolotusId } from "../../core/init";
+import { authenticateRequest } from "../../auth/utils";
+import { invalidatePublicAgentsCache } from "../../ai/agent/server/fetchPublicAgents";
 import {
   createFavoriteKey,
   createFavoriteStatsKey,
   isAgentKey,
   shareKey,
-} from "database/keys";
-import { buildTombstoneRecord, isTombstoneRecord } from "database/tombstones";
+} from "../keys";
+import { buildTombstoneRecord, isTombstoneRecord } from "../tombstones";
 import { canDeleteSpaceMemberRecord, parseSpaceMemberKey } from "./spaceMemberAuthority";
 import {
   bootstrapReplicatedTable,

package/database/server/emailRepository.ts

@@ -1,18 +1,18 @@
-import type { ActorContext } from "auth/actor";
-import { DataType } from "create/types";
+import type { ActorContext } from "../../auth/actor";
+import { DataType } from "../../create/types";
 import type {
   EmailMailbox,
   EmailParticipant,
   EmailRecord,
   EmailStatus,
-} from "database/email";
-import { emailKey } from "database/keys";
-import type { ApiContext, ApiError } from "server/api/types";
+} from "../email";
+import { emailKey } from "../keys";
+import type { ApiContext, ApiError } from "../../server/api/types";
 import {
   type EmailProvider,
   type EmailProviderSendResult,
-} from "server/email/provider";
-import { getEmailProvider } from "server/email/providerRegistry";
+} from "../../server/email/provider";
+import { getEmailProvider } from "../../server/email/providerRegistry";
 import { authorizeActorRecordAccess } from "./actorAccess";
 import { agentDelegationKey } from "./agentDelegation";
 import serverDb from "./db";

package/database/server/fileService.ts

@@ -6,7 +6,7 @@ import { ulid } from "ulid";
 import serverDb from "./db";
 import { blobKey, fileKey, fileIdIndexKey, fileStatKey } from "../keys";
 import { isTombstoneRecord } from "../tombstones";
-import { DataType } from "create/types";
+import { DataType } from "../../create/types";
 
 const UPLOAD_DIR = path.join(process.cwd(), "data", "uploads");
 

package/database/server/handleTransaction.ts

@@ -1,5 +1,5 @@
-import { rechargeUserBalance } from "auth/server/recharge";
-import { isSystemAdmin } from "core/init";
+import { rechargeUserBalance } from "../../auth/server/recharge";
+import { isSystemAdmin } from "../../core/init";
 
 // 添加类型定义
 interface TransactionData {

package/database/server/patch.ts

@@ -1,13 +1,13 @@
 // patch.js (或你的 patch 处理文件名)
 import { pino } from "pino";
-import { DataType } from "create/types";
+import { DataType } from "../../create/types";
 import serverDb from "./db"; // 确认路径正确
-import { handleToken } from "auth/server/token";
+import { handleToken } from "../../auth/server/token";
 import {
   CYBOT_READONLY_MESSAGE,
   isCybotReadOnlyMutation,
 } from "./cybotReadonly";
-import { invalidatePublicAgentsCache } from "ai/agent/server/fetchPublicAgents";
+import { invalidatePublicAgentsCache } from "../../ai/agent/server/fetchPublicAgents";
 import { resolveWriteAuthority } from "./writeAuthority";
 import { findIdentityPatchField } from "./recordIdentity";
 import {

package/database/server/read.ts

@@ -1,12 +1,12 @@
 // 文件路径: packages/database/server/read.ts
 
 import serverDb, { ensureServerDbOpen } from "./db";
-import { DB_PREFIX, shareKey } from "database/keys";
-import { parseToken, verifyToken } from "auth/token";
-import { assertSessionTokenVersion } from "auth/sessionTokenVersion";
+import { DB_PREFIX, shareKey } from "../keys";
+import { parseToken, verifyToken } from "../../auth/token";
+import { assertSessionTokenVersion } from "../../auth/sessionTokenVersion";
 import { hasActiveEntitlement } from "../../auth/server/productEntitlements";
-import { isTombstoneRecord } from "database/tombstones";
-import { userActor } from "auth/actor";
+import { isTombstoneRecord } from "../tombstones";
+import { userActor } from "../../auth/actor";
 import { authorizeActorRecordAccess } from "./actorAccess";
 import {
   resolveSharePaidAccess,

package/database/server/resourceAccess.ts

@@ -1,5 +1,5 @@
-import { isSystemAdmin } from "core/init";
-import { shareKey } from "database/keys";
+import { isSystemAdmin } from "../../core/init";
+import { shareKey } from "../keys";
 import serverDb from "./db";
 import { resolveKeyOwnerId } from "./writeAuthority";