Merge upstream develop

Author: github-actions[bot]

.gitlab/ci/build_js_sdks.yml

@@ -5,13 +5,13 @@
       when: always
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       changes:
-        - packages/js-*/*
+        - packages/js-*/**/*
         - .gitlab/ci/build_js_sdks.yml
     - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
       when: never
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       changes:
-        - packages/js-*/*
+        - packages/js-*/**/*
         - .gitlab/ci/build_js_sdks.yml
 
 .js-sdks-base:

.gitlab/ci/build_rs_core.yml

@@ -5,13 +5,15 @@
       when: always
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       changes:
-        - packages/rs-core/*
+        - packages/rs-core/**/*
+        - packages/rs-common/**/*
         - .gitlab/ci/build_rs_core.yml
     - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
       when: never
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       changes:
-        - packages/rs-core/*
+        - packages/rs-core/**/*
+        - packages/rs-common/**/*
         - .gitlab/ci/build_rs_core.yml
   variables:
     RUNNER_SCRIPT_TIMEOUT: 179m

.gitlab/ci/build_server.yml

@@ -5,13 +5,13 @@
       when: always
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       changes:
-        - services/server/*
+        - services/server/**/*
         - .gitlab/ci/build_server.yml
     - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
       when: never
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       changes:
-        - services/server/*
+        - services/server/**/*
         - .gitlab/ci/build_server.yml
   variables:
     RUNNER_SCRIPT_TIMEOUT: 179m

apps/polycentric/src/common/components/composites/IdentitySwitcherSheetInner.tsx

@@ -19,7 +19,8 @@ import { SheetHeaderBlock, useSheetContext } from '@/src/common/lib/sheet';
 import { Atoms, useTheme } from '@/src/common/theme';
 import { Ionicons } from '@expo/vector-icons';
 import {
-  createIdentityWithDefaultServer,
+  createIdentity,
+  KEY_TYPE,
   type KeyPair,
   types,
 } from '@polycentric/react-native';
@@ -73,7 +74,14 @@ export function IdentitySwitcherSheetInner() {
   const [isEditing, setIsEditing] = useState(false);
 
   const handleCreateIdentity = useCallback(async () => {
-    await createIdentityWithDefaultServer(client, DEFAULT_SERVER);
+    // Adding a second identity on this device means generating a fresh
+    // keypair for it; the initial device-wide keypair stays paired with
+    // whatever identity it currently owns.
+    await client.keyPairManager.createKeyPair({
+      keyType: KEY_TYPE.ED25519,
+      setAsCurrent: true,
+    });
+    await createIdentity(client, DEFAULT_SERVER);
     await client.sync().catch(() => {});
   }, [client]);
 

apps/polycentric/src/common/components/primitives/PillChip.tsx

@@ -1,15 +1,26 @@
 import { type ComponentProps } from 'react';
 import { Text } from './Text';
-import { getIdentityIdShort } from '@/src/common/lib/polycentric-hooks';
+import {
+  getIdentityIdShort,
+  shortenIdentityId,
+} from '@/src/common/lib/polycentric-hooks';
 import { types } from '@polycentric/react-native';
 
 interface PubkeyTagProps {
   publicKey: types.PublicKey;
+  /**
+   * v2 identity id (hex sha256 of the initial Identity content). When
+   * provided, the tag renders a short form of this identity instead of the
+   * signer's public key — this is what users should actually see.
+   */
+  identity?: string;
   style?: ComponentProps<typeof Text>['style'];
 }
 
-export function PubkeyTag({ publicKey, style }: PubkeyTagProps) {
-  const label = getIdentityIdShort(publicKey);
+export function PubkeyTag({ publicKey, identity, style }: PubkeyTagProps) {
+  const label = identity
+    ? shortenIdentityId(identity)
+    : getIdentityIdShort(publicKey);
 
   return (
     <Text

apps/polycentric/src/common/lib/polycentric-hooks/PolycentricProvider.tsx

@@ -1,13 +1,11 @@
 import { DEFAULT_IDENTITY_NAME } from '@/src/common/constants';
 import {
   PolycentricClient,
-  createIdentityWithDefaultServer,
   createPolycentricClient,
   types,
   v2,
+  type IdentityState,
 } from '@polycentric/react-native';
-
-type Identity = v2.Identity;
 import {
   createContext,
   useCallback,
@@ -31,7 +29,7 @@ export interface PolycentricContextValue {
   isLoading: boolean;
   isReady: boolean;
   error: Error | null;
-  currentIdentity: Identity | null;
+  currentIdentity: IdentityState | null;
   switchIdentity: (publicKey: types.PublicKey) => Promise<void>;
 }
 
@@ -107,9 +105,10 @@ function DefaultErrorComponent({ error }: { error: Error }) {
 
 async function resolveIdentity(
   client: PolycentricClient,
-): Promise<Identity | null> {
+): Promise<IdentityState | null> {
+  if (!client.activeIdentityKey) return null;
   const state = await client.identityManager.getCurrent();
-  return state ?? null;
+  return state.identityKey ? state : null;
 }
 
 export function PolycentricProvider({
@@ -119,7 +118,9 @@ export function PolycentricProvider({
 }: PolycentricProviderProps) {
   const [client, setClient] = useState<PolycentricClient | null>(null);
   const [store, setStore] = useState<PolycentricStoreApi | null>(null);
-  const [currentIdentity, setCurrentIdentity] = useState<Identity | null>(null);
+  const [currentIdentity, setCurrentIdentity] = useState<IdentityState | null>(
+    null,
+  );
   const [isLoading, setIsLoading] = useState(true);
   const [error, setError] = useState<Error | null>(null);
 
@@ -134,18 +135,15 @@ export function PolycentricProvider({
 
     (async () => {
       try {
+        // PolycentricClient.initialize() guarantees a keypair exists on
+        // every device. Identity (the published Identity doc) is a separate
+        // concept — the onboarding gate handles creating or pairing one.
         const c = await createPolycentricClient({
           databaseName: 'polycentric.db',
         });
 
         if (cancelled) return;
 
-        if ((await c.keyPairManager.getKeys()).length === 0) {
-          await createIdentityWithDefaultServer(c, DEFAULT_SERVER);
-        }
-
-        if (cancelled) return;
-
         const s = createPolycentricStore(c);
         await s.getState().refreshIdentities();
 
@@ -154,19 +152,26 @@ export function PolycentricProvider({
         setCurrentIdentity(await resolveIdentity(c));
         setIsLoading(false);
 
-        void c.sync().catch((syncError) => {
-          console.warn('Initial Polycentric sync failed:', syncError);
-        });
+        // Only sync when we already have an identity to sync for.
+        if (c.activeIdentityKey) {
+          void c.sync().catch((syncError) => {
+            console.warn('Initial Polycentric sync failed:', syncError);
+          });
+        }
 
         c.events.onKeyPairChanged(async () => {
           if (cancelled) return;
-          if ((await c.keyPairManager.getKeys()).length === 0) {
-            await createIdentityWithDefaultServer(c, DEFAULT_SERVER);
-            await c.sync().catch(() => {});
-          }
           setCurrentIdentity(await resolveIdentity(c));
           await s.getState().refreshIdentities();
         });
+
+        // Identity onboarding (create / claim) publishes an Identity event,
+        // which flows through onContentCreated. Re-resolve so the gate
+        // flips from onboarding → app once the user completes signup.
+        c.events.onContentCreated(async () => {
+          if (cancelled) return;
+          setCurrentIdentity(await resolveIdentity(c));
+        });
       } catch (err) {
         if (!cancelled) {
           console.error('Failed to initialize PolycentricProvider:', err);

apps/polycentric/src/common/lib/polycentric-hooks/helpers.ts

@@ -18,6 +18,12 @@ export type PostData = {
   id: string;
   content: string;
   authorPublicKey: types.PublicKey;
+  /**
+   * v2 identity key (hex sha256 of the initial Identity content) that the
+   * author signed this post on behalf of. Undefined for legacy v1 posts,
+   * which pre-date identity separation.
+   */
+  authorIdentity?: string;
   timestamp: number;
   parentAuthorPublicKey?: types.PublicKey;
   parentProcess?: types.Process;
@@ -144,6 +150,7 @@ export function decodeV2PostBundle(bundle: v2.EventBundle): PostData | null {
         keyType: key.signedBy.keyType,
         key: authorKey,
       }),
+      authorIdentity: key.identity,
       timestamp: Number(event.createdAt),
       // v1 compat shim — store expects types.SignedEvent
       signedEvent: types.SignedEvent.create({
@@ -260,6 +267,11 @@ export function stringURLSafeToPublicKey(str: string): types.PublicKey {
   return stringToPublicKey(decodeURIComponent(str));
 }
 
+/**
+ * @deprecated misnamed — this returns a short base64 form of the signer's
+ * public key, not the identity id. Use {@link shortenIdentityId} or render
+ * the v2 `key.identity` string directly.
+ */
 export function getIdentityId(publicKey: types.PublicKey): string {
   const bytes = publicKey.key ?? new Uint8Array();
   if (bytes.length === 0) return '...';
@@ -270,6 +282,18 @@ export function getIdentityIdShort(publicKey: types.PublicKey): string {
   return getIdentityId(publicKey).slice(0, 4);
 }
 
+/**
+ * Short display form of a v2 identity id (hex sha256 of the initial
+ * Identity content). Returns a placeholder if the id is empty.
+ */
+export function shortenIdentityId(
+  identity: string | undefined,
+  len = 10,
+): string {
+  if (!identity) return '...';
+  return identity.slice(0, len);
+}
+
 export function pointerToURLString(pointer: types.Pointer): string {
   const systemStr = publicKeyToString(
     pointer.system ?? types.PublicKey.create(),

apps/polycentric/src/common/lib/polycentric-hooks/index.ts

@@ -55,6 +55,7 @@ export {
   stringURLSafeToPublicKey,
   getIdentityId,
   getIdentityIdShort,
+  shortenIdentityId,
   pointerToURLString,
   urlStringToPointer,
   signedEventToHex,

apps/polycentric/src/common/lib/polycentric-hooks/useProfileScreenData.ts

@@ -1,6 +1,7 @@
 import { useMemo, useState, useEffect } from 'react';
 import { types } from '@polycentric/react-native';
 import {
+  usePolycentricContext,
   useCurrentIdentity,
   useUsername,
   useProfile,
@@ -11,17 +12,22 @@ import {
 import {
   getIdentityId,
   identiconUrl,
+  shortenIdentityId,
   stringURLSafeToPublicKey,
 } from './helpers';
+import { useStore } from './store';
 
 export type ProfileScreenData = {
   publicKey: types.PublicKey;
+  /** v2 identity id (hex) for this profile, or null if none can be resolved. */
+  identityKey: string | null;
   isSelf: boolean;
   username: string;
   profile: ReturnType<typeof useProfile>;
   authorFeed: ReturnType<typeof useAuthorFeed>;
   likesFeed: ReturnType<typeof useLikesFeed>;
   followStatus: ReturnType<typeof useFollowStatus>;
+  /** Short display string — identity id when known, pubkey short otherwise. */
   short: string;
   avatarUrl: string;
   activeFeed: 'posts' | 'likes';
@@ -40,7 +46,7 @@ export function useProfileScreenData(
     [publicKeyParam],
   );
 
-  const { isCurrentIdentity } = useCurrentIdentity();
+  const { isCurrentIdentity, identity: selfIdentity } = useCurrentIdentity();
   const isSelf = isCurrentIdentity(publicKey);
   const getIsAborted = options?.getIsAborted;
 
@@ -50,7 +56,27 @@ export function useProfileScreenData(
   const likesFeed = useLikesFeed({ enabled: isSelf, getIsAborted });
   const followStatus = useFollowStatus(publicKey);
 
-  const short = getIdentityId(publicKey);
+  // Resolve an identity id for this profile. For self we already know it
+  // from the client; for other users we scan locally-known posts for the
+  // first one signed by this public key.
+  const { store } = usePolycentricContext();
+  const postIdentity = useStore(store, (state) => {
+    for (const post of Object.values(state.posts)) {
+      const key = post.decoded.authorPublicKey.key;
+      if (key && bytesEqual(key, publicKey.key ?? new Uint8Array())) {
+        return post.decoded.authorIdentity ?? null;
+      }
+    }
+    return null;
+  });
+
+  const identityKey = isSelf
+    ? (selfIdentity?.identityKey ?? null)
+    : postIdentity;
+
+  const short = identityKey
+    ? shortenIdentityId(identityKey)
+    : getIdentityId(publicKey);
   const avatarUrl = identiconUrl(publicKey);
 
   const [activeFeed, setActiveFeed] = useState<'posts' | 'likes'>('posts');
@@ -60,6 +86,7 @@ export function useProfileScreenData(
 
   return {
     publicKey,
+    identityKey,
     isSelf,
     username,
     profile,
@@ -72,3 +99,11 @@ export function useProfileScreenData(
     setActiveFeed,
   };
 }
+
+function bytesEqual(a: Uint8Array, b: Uint8Array): boolean {
+  if (a.length !== b.length) return false;
+  for (let i = 0; i < a.length; i++) {
+    if (a[i] !== b[i]) return false;
+  }
+  return true;
+}

apps/polycentric/src/common/navigation/IndexScreen.tsx

@@ -3,7 +3,8 @@ import { View, ActivityIndicator } from 'react-native';
 import { usePolycentricContext } from '@/src/common/lib/polycentric-hooks';
 
 export default function IndexScreen() {
-  const { client, isLoading, isReady } = usePolycentricContext();
+  const { client, currentIdentity, isLoading, isReady } =
+    usePolycentricContext();
 
   if (isLoading || !isReady || !client) {
     return (
@@ -13,11 +14,13 @@ export default function IndexScreen() {
     );
   }
 
-  // TODO: re-enable onboarding flow when ready
-  // const hasIdentity = client.currentIdentity !== null;
-  // if (!hasIdentity) {
-  //   return <Redirect href="/(onboarding)" />;
-  // }
+  // Gate on the resolved identity, not just the localStorage hint
+  // (`activeIdentityKey`). If the hint points at an identity we don't have
+  // content for, `currentIdentity` is null and we still send the user to
+  // onboarding — self-heals stale state from earlier builds.
+  if (!currentIdentity) {
+    return <Redirect href="/(onboarding)" />;
+  }
 
   return <Redirect href="/(tabs)/feed" />;
 }