nolo-cli 0.189.0-alpha.1 → 0.189.0

package/{machineWsRunDispatch-PPVYOERM.js → machineWsRunDispatch-HVHO5FF7.js}

@@ -11,13 +11,13 @@ import {
   runtimeWorkspacePermissionPolicy,
   scopePermissionPolicyToRuntimeWorkspace,
   summarizeAgentConfigForLogs
-} from "./chunk-TNVE3CAV.js";
-import "./chunk-J7QGWFT6.js";
+} from "./chunk-UF3YPO4W.js";
+import "./chunk-HV7UAV6R.js";
 import "./chunk-DYQXB46J.js";
 import "./chunk-VP3BINY7.js";
 import "./chunk-R4BMKAR5.js";
 import "./chunk-LKZPX6YH.js";
-import "./chunk-RJ3EYB5G.js";
+import "./chunk-X3RWBJDQ.js";
 import "./chunk-NBTY7YJF.js";
 import "./chunk-VIWDGTDA.js";
 import "./chunk-HGDKT2D6.js";
@@ -27,40 +27,40 @@ import "./chunk-VL5KOY2C.js";
 import "./chunk-ZEZC7IIM.js";
 import "./chunk-ATNTHIZI.js";
 import "./chunk-INFHX73M.js";
-import "./chunk-ZIOYHDYW.js";
+import "./chunk-WXJBMIJG.js";
 import "./chunk-HS7MLR74.js";
-import "./chunk-6G5V4Y3V.js";
+import "./chunk-CNWXWENP.js";
 import "./chunk-KFHREHUQ.js";
-import "./chunk-53RSTB7T.js";
+import "./chunk-5N5FMA7J.js";
 import "./chunk-OXME3PEE.js";
 import "./chunk-KSTEXKL6.js";
 import "./chunk-VF4K2QE6.js";
-import "./chunk-LOQYQUM2.js";
-import "./chunk-O2MBTX37.js";
+import "./chunk-JGJVDP2W.js";
+import "./chunk-6XWKAFHB.js";
 import "./chunk-NF64D32W.js";
 import "./chunk-3L2WKC3W.js";
 import "./chunk-VYNMQ6HW.js";
-import "./chunk-R6AJKHEU.js";
+import "./chunk-FWWNKGI2.js";
 import "./chunk-MYOH447Z.js";
-import "./chunk-ER4UTWWS.js";
+import "./chunk-DFF6B7P7.js";
 import "./chunk-YIRADHSY.js";
 import "./chunk-AGIM7IMJ.js";
 import "./chunk-ZBCBFOWC.js";
 import "./chunk-VIDPVFP3.js";
 import "./chunk-63W5N6P3.js";
-import "./chunk-H6FUDBS3.js";
-import "./chunk-RGTPR57U.js";
+import "./chunk-7DQTUEMG.js";
+import "./chunk-KKUMQLZV.js";
 import "./chunk-5XBUWM6I.js";
-import "./chunk-RBVR7P3M.js";
+import "./chunk-Z6L7XGF3.js";
 import "./chunk-TZXPT53C.js";
 import "./chunk-LEC5ALIN.js";
 import "./chunk-523DITKR.js";
-import "./chunk-PVZ3GB25.js";
+import "./chunk-5IWKNSOS.js";
 import "./chunk-BYXBJQAS.js";
 import "./chunk-QYPE3TS3.js";
-import "./chunk-JOOWHDGM.js";
+import "./chunk-A5BLRE3G.js";
 import "./chunk-4JH2UMJR.js";
-import "./chunk-7SJG5ZNX.js";
+import "./chunk-B6EZB6DW.js";
 import "./chunk-UAD2WT54.js";
 import "./chunk-5RGU3J7P.js";
 import "./chunk-ZRAU6T47.js";
@@ -69,9 +69,9 @@ import "./chunk-OWYYDMGJ.js";
 import "./chunk-YDH3FDFQ.js";
 import "./chunk-P64WRQYV.js";
 import "./chunk-GLKOYSRU.js";
-import "./chunk-CLGAGPEM.js";
+import "./chunk-CNMQATUF.js";
 import "./chunk-32ZKZET7.js";
-import "./chunk-Y2ZDNW2H.js";
+import "./chunk-B2N5GZBU.js";
 import "./chunk-3PVYUPXK.js";
 import "./chunk-BA2FHPS4.js";
 import "./chunk-LBXUNNDS.js";
@@ -84,13 +84,13 @@ import "./chunk-OW765XBU.js";
 import "./chunk-PXYBUFDB.js";
 import "./chunk-ZSO5B6SW.js";
 import "./chunk-D2MDMY2M.js";
-import "./chunk-GSX7Z46F.js";
-import "./chunk-OXOXPREC.js";
+import "./chunk-5HAPEKNH.js";
+import "./chunk-SM56M7N7.js";
 import "./chunk-EUGTFFO6.js";
 import "./chunk-AETZ7AD6.js";
 import "./chunk-Y6ORVLSS.js";
 import "./chunk-KHCLMKZZ.js";
-import "./chunk-HVV4B6OL.js";
+import "./chunk-MEJLTHBK.js";
 import "./chunk-ZNFJWEN4.js";
 import "./chunk-IIX6VWLW.js";
 import "./chunk-NVOYW6H4.js";
@@ -103,15 +103,15 @@ import "./chunk-2WZXXAQD.js";
 import "./chunk-PVD7CRYV.js";
 import "./chunk-G6OOUQWJ.js";
 import "./chunk-56GBUMO5.js";
-import "./chunk-I3HWJODB.js";
+import "./chunk-OWCWVNX2.js";
 import "./chunk-OHRDHS4N.js";
 import "./chunk-E2BESSAW.js";
-import "./chunk-UBLITLAZ.js";
+import "./chunk-NABJEYPJ.js";
 import "./chunk-JLR5NWP2.js";
 import "./chunk-WJZOQR2J.js";
 import "./chunk-WFUIXNKC.js";
 import "./chunk-2MBTWINN.js";
-import "./chunk-S4W4GV3B.js";
+import "./chunk-K6TZSON4.js";
 import "./chunk-5ZUL4CUO.js";
 import "./chunk-JIFYXQRD.js";
 import "./chunk-H57T64RA.js";
@@ -147,8 +147,8 @@ import "./chunk-4SN6J65J.js";
 import "./chunk-CF7PE763.js";
 import "./chunk-R5GO3YZP.js";
 import "./chunk-Y6ROFCZO.js";
-import "./chunk-63RO7QWZ.js";
-import "./chunk-WMHWFFTE.js";
+import "./chunk-UNOILAZP.js";
+import "./chunk-ECX3NKRD.js";
 import "./chunk-XJWWBO34.js";
 import "./chunk-I42VC5KR.js";
 import "./chunk-U6VC4MU4.js";

package/{memberThunks-VXT36MZP.js → memberThunks-QWAAGQBS.js}

@@ -1,16 +1,16 @@
 import {
+  addMemberSpace,
   appendRecoveredMemberships,
+  applyFetchSpaceFulfilled,
   fetchRemoteSpace,
   fetchRemoteUserSpaceMemberships,
-  getMemberSpaces,
-  hydrateMemberSpacesFromLocal,
   membershipBelongsToUser,
   selectSpaceRemoteAuth,
   setMemberSpaces,
   setMembershipLoading,
   setMembershipRejected,
   spaceListsUser
-} from "./chunk-LOQYQUM2.js";
+} from "./chunk-JGJVDP2W.js";
 import {
   getCurrentSpaceIdRaw,
   updateCurrentSpaceIfMatch
@@ -25,7 +25,7 @@ import {
   read,
   remove,
   write
-} from "./chunk-Y2ZDNW2H.js";
+} from "./chunk-B2N5GZBU.js";
 import "./chunk-3PVYUPXK.js";
 import "./chunk-BA2FHPS4.js";
 import {
@@ -41,7 +41,8 @@ import {
   createAsyncThunk
 } from "./chunk-WRCZXJ4N.js";
 import {
-  logger
+  logger,
+  normalizeTimeFields
 } from "./chunk-6Q7UTJKR.js";
 import "./chunk-QQ56R7KS.js";
 import "./chunk-OW765XBU.js";
@@ -62,7 +63,7 @@ import "./chunk-4SN6J65J.js";
 import "./chunk-CF7PE763.js";
 import {
   DB_PREFIX
-} from "./chunk-WMHWFFTE.js";
+} from "./chunk-ECX3NKRD.js";
 import "./chunk-XJWWBO34.js";
 import "./chunk-I42VC5KR.js";
 import "./chunk-U6VC4MU4.js";
@@ -111,26 +112,6 @@ var readLocalSpaceData = async (db, spaceId) => {
   }
 };
 var membershipCheckUserId = (membership, activeUserId) => isDeviceLocalSpaceMembership(membership) ? DEVICE_LOCAL_OWNER_ID : activeUserId;
-var buildLocalMembershipPreview = async (userId, db, memberships) => {
-  const preview = await Promise.all(
-    memberships.map(async (membership) => {
-      if (isTombstoneRecord(membership)) return null;
-      const checkUserId = membershipCheckUserId(membership, userId);
-      if (!membershipBelongsToUser(membership, checkUserId)) return null;
-      const normalizedSpaceId = normalizeSpaceId(membership.spaceId);
-      const localSpaceData = await readLocalSpaceData(db, normalizedSpaceId);
-      if (!localSpaceData || isTombstoneRecord(localSpaceData)) return null;
-      if (!spaceListsUser(localSpaceData, checkUserId)) return null;
-      return {
-        ...membership,
-        spaceId: normalizedSpaceId
-      };
-    })
-  );
-  return preview.filter(
-    (membership) => !!membership
-  );
-};
 var fetchLocalForUser = async (userId, db) => {
   try {
     const memberships = [];
@@ -255,23 +236,12 @@ var fetchUserSpaceMembershipsAction = async (userId, thunkAPI) => {
   const db = thunkAPI.extra.db;
   const { token, servers } = selectSpaceRemoteAuth(state);
   const isLocalActor = isDeviceLocalOwnerId(userId);
-  const localMembershipsPromise = fetchLocalUnion(userId, db);
   const remoteResultsPromise = isLocalActor ? Promise.resolve([]) : Promise.all(
     servers.map(
       (server) => fetchRemoteUserSpaceMemberships(server, token, userId)
     )
   );
-  const localMemberships = await localMembershipsPromise;
-  if (getMemberSpaces() === null && localMemberships.length > 0) {
-    const localPreview = await buildLocalMembershipPreview(
-      userId,
-      db,
-      localMemberships
-    );
-    if (localPreview.length > 0) {
-      hydrateMemberSpacesFromLocal(localPreview);
-    }
-  }
+  const localMemberships = isLocalActor ? await fetchLocalUnion(userId, db) : [];
   const remoteResults = await remoteResultsPromise;
   const successfulRemoteResults = remoteResults.filter((result) => result.ok);
   const successfulRemoteMemberships = successfulRemoteResults.flatMap(
@@ -287,6 +257,11 @@ var fetchUserSpaceMembershipsAction = async (userId, thunkAPI) => {
       `${SPACE_MEMBERSHIP_REMOTE_UNAVAILABLE}: unable to refresh memberships from ${servers.join(", ")}`
     );
   }
+  if (!isLocalActor && !hasRemoteAuthority) {
+    throw new Error(
+      `${SPACE_MEMBERSHIP_REMOTE_UNAVAILABLE}: no remote authority for ${userId}`
+    );
+  }
   const remoteSpaceIds = new Set(
     successfulRemoteMemberships.map(
       (membership) => normalizeSpaceId(membership.spaceId)
@@ -326,11 +301,20 @@ var fetchUserSpaceMembershipsAction = async (userId, thunkAPI) => {
     const checkUserId = membershipCheckUserId(membership, userId);
     if (!membershipBelongsToUser(membership, checkUserId)) return null;
     const normalizedSpaceId = normalizeSpaceId(membership.spaceId);
-    const localSpaceData = await readLocalSpaceData(db, normalizedSpaceId);
     const isDeviceLocal = membership.deviceLocal || isDeviceLocalSpaceMembership(membership);
+    let localSpaceDataLoaded = false;
+    let localSpaceDataCache = null;
+    const loadLocalSpaceData = async () => {
+      if (!localSpaceDataLoaded) {
+        localSpaceDataCache = await readLocalSpaceData(db, normalizedSpaceId);
+        localSpaceDataLoaded = true;
+      }
+      return localSpaceDataCache;
+    };
     if (isDeviceLocal) {
-      if (!localSpaceData || isTombstoneRecord(localSpaceData)) return null;
-      if (!spaceListsUser(localSpaceData, checkUserId)) {
+      const localSpaceData2 = await loadLocalSpaceData();
+      if (!localSpaceData2 || isTombstoneRecord(localSpaceData2)) return null;
+      if (!spaceListsUser(localSpaceData2, checkUserId)) {
         return null;
       }
       const {
@@ -345,15 +329,16 @@ var fetchUserSpaceMembershipsAction = async (userId, thunkAPI) => {
         userId: DEVICE_LOCAL_OWNER_ID
       };
     }
+    if (membership.sourceServer && !membership.requiresRemoteSpaceVerification) {
+      const { sourceServer: _ss, ...verifiedMembership } = membership;
+      return {
+        ...verifiedMembership,
+        spaceId: normalizedSpaceId
+      };
+    }
     if (membership.sourceServer || membership.requiresRemoteSpaceVerification) {
-      if (localSpaceData && isTombstoneRecord(localSpaceData)) return null;
-      if (membership.sourceServer && !membership.requiresRemoteSpaceVerification) {
-        const { sourceServer: _ss, ...verifiedMembership } = membership;
-        return {
-          ...verifiedMembership,
-          spaceId: normalizedSpaceId
-        };
-      }
+      const localSpaceData2 = await loadLocalSpaceData();
+      if (localSpaceData2 && isTombstoneRecord(localSpaceData2)) return null;
       try {
         const remoteSpaceServers = Array.from(
           new Set(
@@ -385,6 +370,7 @@ var fetchUserSpaceMembershipsAction = async (userId, thunkAPI) => {
         return null;
       }
     }
+    const localSpaceData = await loadLocalSpaceData();
     if (localSpaceData) {
       return !spaceListsUser(localSpaceData, userId) ? null : {
         ...membership,
@@ -486,6 +472,88 @@ var fetchUserSpaceMembershipsAction = async (userId, thunkAPI) => {
 var dbThunkState = (thunkApi) => thunkApi.getState();
 var dbThunkExtra = (thunkApi) => thunkApi.extra;
 
+// packages/create/space/member/submitAddSpaceMember.ts
+var ADD_SPACE_MEMBER_TIMEOUT_MS = 1e4;
+var pendingOperations = /* @__PURE__ */ new Map();
+var newOperationId = () => {
+  const uuid = globalThis.crypto?.randomUUID;
+  if (typeof uuid === "function") return uuid.call(globalThis.crypto);
+  return `op-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
+};
+var messageForErrorCode = (code, fallback) => {
+  switch (code) {
+    case "conflict":
+      return "\u8FD9\u6B21\u64CD\u4F5C\u4E0E\u4E4B\u524D\u7684\u63D0\u4EA4\u51B2\u7A81\uFF0C\u8BF7\u5237\u65B0\u7A7A\u95F4\u540E\u91CD\u8BD5";
+    case "forbidden":
+      return "\u4F60\u6CA1\u6709\u6743\u9650\u7ED9\u8FD9\u4E2A\u7A7A\u95F4\u6DFB\u52A0\u6210\u5458";
+    case "not_found":
+      return "\u7A7A\u95F4\u4E0D\u5B58\u5728\u6216\u5DF2\u88AB\u5220\u9664";
+    case "invalid_input":
+      return "\u52A0\u6210\u5458\u53C2\u6570\u4E0D\u5B8C\u6574";
+    default:
+      return fallback;
+  }
+};
+var submitAddSpaceMember = async (options) => {
+  const { token, servers } = selectSpaceRemoteAuth(options.state);
+  if (!token || servers.length === 0) {
+    return {
+      ok: false,
+      code: "no-server",
+      message: "\u6CA1\u6709\u53EF\u7528\u7684\u670D\u52A1\u5668\uFF0C\u6210\u5458\u5173\u7CFB\u672A\u63D0\u4EA4"
+    };
+  }
+  const operationKey = `${options.spaceId}:${options.targetUserId}`;
+  const operationId = options.operationId ?? pendingOperations.get(operationKey) ?? newOperationId();
+  if (!options.operationId && !pendingOperations.has(operationKey)) {
+    pendingOperations.set(operationKey, operationId);
+  }
+  const timeoutMs = options.timeoutMs ?? ADD_SPACE_MEMBER_TIMEOUT_MS;
+  const doFetch = options.fetchImpl ?? fetch;
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    const response = await doFetch(`${servers[0]}/rpc/addSpaceMember`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${token}`
+      },
+      body: JSON.stringify({
+        spaceId: options.spaceId,
+        targetUserId: options.targetUserId,
+        operationId,
+        ...options.role ? { role: options.role } : null
+      }),
+      signal: controller.signal
+    });
+    if (!response.ok) {
+      const payload = await response.json().catch(() => null);
+      const raw = payload && typeof payload === "object" ? payload : null;
+      pendingOperations.delete(operationKey);
+      return {
+        ok: false,
+        code: "rejected",
+        message: messageForErrorCode(
+          raw?.code,
+          raw?.message || "\u670D\u52A1\u7AEF\u62D2\u7EDD\u4E86\u8FD9\u6B21\u52A0\u6210\u5458\u64CD\u4F5C"
+        )
+      };
+    }
+    const result = await response.json();
+    pendingOperations.delete(operationKey);
+    return { ok: true, result };
+  } catch (error) {
+    return {
+      ok: false,
+      code: "unconfirmed",
+      message: `\u6210\u5458\u5173\u7CFB\u63D0\u4EA4\u7ED3\u679C\u672A\u786E\u8BA4\uFF08${operationId}\uFF09\uFF1A\u7F51\u7EDC\u6216\u670D\u52A1\u7AEF\u672A\u5728\u65F6\u9650\u5185\u54CD\u5E94\uFF0C\u8BF7\u91CD\u8BD5`
+    };
+  } finally {
+    clearTimeout(timer);
+  }
+};
+
 // packages/create/space/member/addMemberAction.ts
 var addMemberAction = async (input, thunkAPI) => {
   const { spaceId, memberId, role = "member" /* MEMBER */ } = input;
@@ -515,9 +583,6 @@ var addMemberAction = async (input, thunkAPI) => {
     members: [...spaceData.members, resolvedMemberId],
     updatedAt: Date.now()
   };
-  await dispatch(
-    write({ data: updatedSpaceData, customKey: spaceKey })
-  ).unwrap();
   const now = Date.now();
   const spaceMemberData = {
     userId: resolvedMemberId,
@@ -534,6 +599,44 @@ var addMemberAction = async (input, thunkAPI) => {
     // 添加 type 字段
   };
   const spaceMemberKey = createSpaceKey.member(resolvedMemberId, spaceId);
+  if (currentUserId && !isDeviceLocalOwnerId(currentUserId)) {
+    const submitted = await submitAddSpaceMember({
+      spaceId,
+      targetUserId: resolvedMemberId,
+      role,
+      state
+    });
+    if (!submitted.ok) {
+      throw new Error(submitted.message);
+    }
+    const authoritativeSpace = submitted.result?.space ?? updatedSpaceData;
+    applyFetchSpaceFulfilled({ spaceId, spaceData: authoritativeSpace });
+    if (db) {
+      try {
+        await db.put(
+          spaceKey,
+          normalizeTimeFields({
+            ...authoritativeSpace,
+            dbKey: spaceKey,
+            userId: currentUserId
+          })
+        );
+      } catch (error) {
+        logger.warn(
+          { error },
+          "[addMemberAction] \u672C\u5730\u5E94\u7528\u670D\u52A1\u7AEF\u8FD4\u56DE\u7684\u7A7A\u95F4\u6570\u636E\u5931\u8D25"
+        );
+      }
+    }
+    const returnedMembership = submitted.result?.membership;
+    if (returnedMembership && returnedMembership.userId === currentUserId) {
+      addMemberSpace(returnedMembership);
+    }
+    return { spaceId, updatedSpaceData: authoritativeSpace };
+  }
+  await dispatch(
+    write({ data: updatedSpaceData, customKey: spaceKey })
+  ).unwrap();
   await dispatch(
     write({
       data: spaceMemberData,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nolo-cli",
-  "version": "0.189.0-alpha.1",
+  "version": "0.189.0",
   "type": "module",
   "description": "Agent-first terminal workspace for Nolo",
   "bin": {