@ibgib/core-gib 0.0.68 → 0.0.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibgib/core-gib",
-  "version": "0.0.68",
+  "version": "0.0.70",
   "description": "ibgib core functionality, including base architecture for witnesses, spaces, apps, robbots, etc., as well as shared utility functions. Node v19+ needed for heavily-used isomorphic webcrypto hashing consumed in both node and browsers.",
   "repository": {
     "url": "https://gitlab.com/ibgib/core-gib",

package/src/common/encrypt/encrypt-constants.mts

@@ -27,6 +27,11 @@ export const ENCRYPTION_NAME_REGEXP = /^[a-zA-Z0-9_\-.]{1,255}$/;
  * An encryptions ibgib uses this rel8n name for its children encryptions.
  */
 export const ENCRYPTION_REL8N_NAME = 'encryption';
+
+/**
+ * atom for ciphertext...hmm
+ */
+export const CIPHERTEXT_ATOM = 'ciphertext';
 /**
  * Related encrypted ciphertext ibgibs will use this rel8n name.
  * Those ciphertext ibgibs will then relate to the encryption used.

package/src/common/encrypt/encrypt-types.mts

@@ -116,7 +116,7 @@ export interface EncryptionIbGib_V1 extends IbGib_V1<EncryptionData_V1, Encrypti
 /**
  * Data for the actual encrypted ciphertext.
  */
-export interface CiphertextData<TMetadata = any> {
+export interface CiphertextData<TMetadata = any> extends IbGibData_V1 {
     ciphertext?: string;
     metadata?: TMetadata;
 }
@@ -125,7 +125,7 @@ export interface CiphertextData<TMetadata = any> {
  * Rel8ns for the actual encrypted ciphertext
  */
 export interface CiphertextRel8ns extends IbGibRel8ns_V1 {
-    [ENCRYPTION_REL8N_NAME]?: IbGibAddr[];
+    // [ENCRYPTION_REL8N_NAME]?: IbGibAddr[];
 }
 
 /**

package/src/common/pubsub/subject/subject-v1.mts

@@ -266,6 +266,7 @@ export class Subject_V1<
                     // dispatch to observer's via its `next` fn
                     await (observer as ObserverWitness<TIbGibIn_ie_Payload>).next(payloadIbGib);
                 } else {
+                    debugger; // unexpected error state
                     console.warn(`${lc} (UNEXPECTED) subscriber reference still held but is unsubscribed? skipping for now (i.e. won't remove subscriber) in case that code is in yielded execution and just hasn't gotten around to it with event loop (but that would be weird). (W: c116e799f6b9483c97fd030eb0dd09ea)`)
                 }
             }

package/src/witness/space/metaspace/metaspace-base.mts

@@ -5,9 +5,9 @@ import { IbGib_V1, } from '@ibgib/ts-gib/dist/V1/types.mjs';
 import { GIB, GIB_DELIMITER, IB, ROOT, } from '@ibgib/ts-gib/dist/V1/constants.mjs';
 import { IbGibAddr, TjpIbGibAddr, TransformResult, } from '@ibgib/ts-gib/dist/types.mjs';
 import { getIbGibAddr, } from '@ibgib/ts-gib/dist/helper.mjs';
-import { Factory_V1 as factory } from '@ibgib/ts-gib/dist/V1/index.mjs';
 import { getGib, getGibInfo, isPrimitive } from '@ibgib/ts-gib/dist/V1/transforms/transform-helper.mjs';
 
+import { GLOBAL_LOG_A_LOT, GLOBAL_TIMER_NAME } from '../../../core-constants.mjs';
 import {
     DeleteIbGibOpts, DeleteIbGibResult,
     GetIbGibOpts, GetIbGibResult,
@@ -31,44 +31,37 @@ import {
 } from '../../../common/encrypt/encrypt-types.mjs';
 import { RobbotIbGib_V1 } from '../../../witness/robbot/robbot-types.mjs';
 import { AppIbGib_V1 } from '../../../witness/app/app-types.mjs';
-import {
-    getTimelinesGroupedByTjp, getTjpAddr, hasTjp
-} from '../../../common/other/ibgib-helper.mjs';
-// import {
-//     getFnPrompt, getFnAlert, getFnPromptPassword
-// } from '../../../common/prompt-functions.mjs';
+import { constantIbGib, getTimelinesGroupedByTjp, hasTjp } from '../../../common/other/ibgib-helper.mjs';
 import {
     getValidatedBootstrapIbGib, getLocalSpace, execInSpaceWithLocking,
     updateBootstrapIbGib, getSpaceArgMetadata, createTagIbGibAndSundry,
     getConfigAddr, setConfigAddr, setCurrentRoot, rel8ToCurrentRoot,
     rel8ToSpecialIbGib, registerNewIbGib, persistTransformResult, getFromSpace,
-    putInSpace, deleteFromSpace, getLatestAddrs, getTjpIbGib,
-    getSpecialIbGib, getSpecialRel8dIbGibs, /*createRobbotIbGib, */
-    trash, archive, parseSpaceIb,
+    putInSpace, deleteFromSpace, getLatestAddrs, getTjpIbGib, getSpecialIbGib,
+    getSpecialRel8dIbGibs, /*createRobbotIbGib, */ trash, archive, parseSpaceIb,
 } from '../../../witness/space/space-helper.mjs';
 import { getDependencyGraph, GetDependencyGraphOptions } from '../../../common/other/graph-helper.mjs';
-import { spaceNameIsValid, } from '../../../witness/space/space-helper.mjs';
 import { RobbotPromptResult } from '../../../witness/robbot/robbot-types.mjs';
 import { createNewRobbot, validateCommonRobbotData, validateCommonRobbotIbGib } from '../../../witness/robbot/robbot-helper.mjs';
 import { AppPromptResult } from '../../../witness/app/app-types.mjs';
 import { createNewApp, } from '../../../witness/app/app-helper.mjs';
-import { CommentIbGib_V1, UpdateCommentPromptResult } from '../../../common/comment/comment-types.mjs';
 import { IbGibCacheService } from '../../../common/cache/cache-types.mjs';
 import { BOOTSTRAP_DATA_KNOWN_SPACE_IDS_KEY, BOOTSTRAP_IBGIB_ADDR } from '../../../witness/space/bootstrap/bootstrap-constants.mjs';
-import { DEFAULT_LOCAL_SPACE_DESCRIPTION, DEFAULT_LOCAL_SPACE_POLLING_INTERVAL_MS, DEFAULT_MAX_RETRIES_GET_DEPENDENCY_GRAPH_OUTERSPACE, DEFAULT_MS_BETWEEN_RETRIES_GET_DEPENDENCY_GRAPH_OUTERSPACE, DEFAULT_SECONDS_VALID_LOCAL, PERSIST_OPTS_AND_RESULTS_IBGIBS_DEFAULT, SYNC_SPACE_REL8N_NAME } from '../../../witness/space/space-constants.mjs';
-import { IBGIB_BASE_DIR, IBGIB_BASE_SUBPATH, IBGIB_BIN_SUBPATH, IBGIB_DNA_SUBPATH, IBGIB_ENCODING, IBGIB_IBGIBS_SUBPATH, IBGIB_META_SUBPATH } from '../../../witness/space/filesystem-space/filesystem-constants.mjs';
-import { DEFAULT_ENCRYPTION_HASH_ALGORITHM, DEFAULT_ENCRYPTION_INITIAL_RECURSIONS, DEFAULT_ENCRYPTION_RECURSIONS_PER_HASH, DEFAULT_ENCRYPTION_SALT_STRATEGY, ENCRYPTION_REL8N_NAME, } from '../../../common/encrypt/encrypt-constants.mjs';
+import { DEFAULT_SECONDS_VALID_LOCAL, SYNC_SPACE_REL8N_NAME } from '../../../witness/space/space-constants.mjs';
+import {
+    CIPHERTEXT_ATOM, DEFAULT_ENCRYPTION_HASH_ALGORITHM,
+    DEFAULT_ENCRYPTION_INITIAL_RECURSIONS,
+    DEFAULT_ENCRYPTION_RECURSIONS_PER_HASH, DEFAULT_ENCRYPTION_SALT_STRATEGY,
+    ENCRYPTION_REL8N_NAME,
+} from '../../../common/encrypt/encrypt-constants.mjs';
 import { ROBBOT_REL8N_NAME } from '../../../witness/robbot/robbot-constants.mjs';
 import { APP_REL8N_NAME } from '../../../witness/app/app-constants.mjs';
 import { AUTOSYNC_ALWAYS_REL8N_NAME } from '../../../common/other/other-constants.mjs';
 import {
-    MetaspaceInitializeOptions, CreateLocalSpaceOptions, DtoToSpaceFunction,
-    LocalSpaceFactoryFunction, ZeroSpaceFactoryFunction, MetaspaceFactory
+    MetaspaceInitializeOptions, CreateLocalSpaceOptions,
+    LocalSpaceFactoryFunction, MetaspaceFactory
 } from './metaspace-types.mjs';
 import { MetaspaceService, TempCacheEntry } from './metaspace-types.mjs';
-import { InnerSpace_V1 } from '../../../witness/space/inner-space/inner-space-v1.mjs';
-
-import { GLOBAL_LOG_A_LOT, GLOBAL_TIMER_NAME } from '../../../core-constants.mjs';
 import { newupSubject } from '../../../common/pubsub/subject/subject-helper.mjs';
 import { ObservableWitness, } from '../../../common/pubsub/observable/observable-types.mjs';
 import { SubjectWitness } from '../../../common/pubsub/subject/subject-types.mjs';
@@ -1750,6 +1743,9 @@ export abstract class MetaspaceBase implements MetaspaceService {
         }
     }
 
+    /**
+     * creates a ciphertext ibgib (stone) based on the given plaintext.
+     */
     async getCiphertextIbGib<TEncryptionIbGib extends IbGib_V1<EncryptionData_V1>, TMetadata = any>({
         plaintext,
         password,
@@ -1773,7 +1769,7 @@ export abstract class MetaspaceBase implements MetaspaceService {
          */
         encryptionIbGib: TEncryptionIbGib,
         /**
-         * Decrypts and checks against original data
+         * Confirms encryption succeeds by doing an immediate decrypt and checking against original data.
          */
         confirm?: boolean,
         /**
@@ -1805,7 +1801,7 @@ export abstract class MetaspaceBase implements MetaspaceService {
         try {
             const encryptionInfo = encryptionIbGib.data;
             if (encryptionInfo?.method !== EncryptionMethod.encrypt_gib) {
-                throw new Error('only encrypt-gib is implemented.');
+                throw new Error('only encrypt-gib is implemented. (E: 1d8eb1be6d3f44f0a79b498f237147e6');
             }
             const info: EncryptionInfo_EncryptGib = encryptionInfo;
             const resEncrypt = await encrypt({
@@ -1817,6 +1813,8 @@ export abstract class MetaspaceBase implements MetaspaceService {
                 saltStrategy: info.saltStrategy,
                 hashAlgorithm: info.hashAlgorithm,
                 encryptedDataDelimiter: info.encryptedDataDelimiter,
+                blockMode: encryptionInfo.blockMode ? encryptionInfo.blockModeOptions : undefined,
+                indexingMode: encryptionInfo.indexingMode,
                 confirm,
             });
 
@@ -1824,40 +1822,34 @@ export abstract class MetaspaceBase implements MetaspaceService {
             if (resEncrypt.errors?.length ?? 0 > 0) { throw new Error(resEncrypt.errors!.join('\n')); }
             if (!resEncrypt.encryptedData) { throw new Error(`encryptedData is falsy`) }
 
-            const data: CiphertextData = { ciphertext: resEncrypt.encryptedData, };
+            const data: CiphertextData = {
+                ciphertext: resEncrypt.encryptedData,
+                uuid: await getUUID(),
+            };
             if (publicMetadata) { data.metadata = publicMetadata; }
 
-            const rel8ns: CiphertextRel8ns = {
-                encryption: [getIbGibAddr({ ibGib: encryptionIbGib })],
+            const ciphertextIbGib = await constantIbGib<CiphertextData, CiphertextRel8ns>({
+                parentPrimitiveIb: ibRoot || CIPHERTEXT_ATOM,
+                ib:
+                    publicIbMetadata ?
+                        `${ibRoot || CIPHERTEXT_ATOM} ${publicIbMetadata}` :
+                        `${ibRoot || CIPHERTEXT_ATOM}`,
+                data,
+                rel8ns: undefined,
+            }) as CiphertextIbGib_V1;
+            const resTransform: TransformResult<CiphertextIbGib_V1> = {
+                newIbGib: ciphertextIbGib
             }
 
-            const resCiphertext = (
-                await factory.firstGen({
-                    parentIbGib: factory.primitive({ ib: ibRoot || 'ciphertext' }),
-                    ib:
-                        publicIbMetadata ?
-                            `${ibRoot || 'ciphertext'} ${publicIbMetadata}` :
-                            `${ibRoot || 'ciphertext'}`,
-                    data,
-                    rel8ns,
-                    dna: false,
-                    tjp: { uuid: true, timestamp: true },
-                    nCounter: true,
-                })
-            ) as TransformResult<CiphertextIbGib_V1>;
-
-            if (!resCiphertext.newIbGib) { throw new Error('Error creating ciphertext ibgib.'); }
-
             if (persist) {
-                await this.persistTransformResult({ resTransform: resCiphertext });
+                await this.persistTransformResult({ resTransform });
             }
 
-            return resCiphertext;
+            return resTransform;
         } catch (error) {
             console.error(`${lc} ${error.message}`);
             throw error;
         }
-
     }
 
     /**
@@ -2586,10 +2578,15 @@ export abstract class MetaspaceBase implements MetaspaceService {
     protected subSagaSyncTimeLog: SubscriptionWitness | undefined;
 
     async syncIbGibs({
+        localSpace,
         dependencyGraphIbGibs,
         syncSpaceIbGibs,
         // watch,
     }: {
+        /**
+         * @see {@link MetaspaceService.syncIbGibs}
+         */
+        localSpace: IbGibSpaceAny,
         /**
          * @see {@link MetaspaceService.syncIbGibs}
          */
@@ -2618,18 +2615,20 @@ export abstract class MetaspaceBase implements MetaspaceService {
 
             // have to make sagaId and syncStatus$ early to enable timeLog calls
             const sagaId = (await getUUID()).slice(0, 24);
-            const syncStatus$ = await newupSubject<SyncStatusIbGib>();
+            const syncStatus$ = await newupSubject<SyncStatusIbGib>({ replay: true });
             const syncTimelogName = `sync_log ${sagaId}`;
             console.time(syncTimelogName);
             console.timeLog(syncTimelogName, 'start');
             this.subSagaSyncTimeLog = await syncStatus$.subscribe(fnObs<SyncStatusIbGib>({
                 next: async (status) => {
+                    // debugger; // metaspacebase syncIbGibs next
                     if (logalot) { console.log(`${lc}[obs.next] next called (I: 9af8d3267b0ff473fe5f8024f0dbed23)`); }
                     if (status.data?.statusCode === StatusCode.completed) {
                         console.timeLog(syncTimelogName, 'StatusCode.complete');
                     }
                 },
                 error: async (_: any) => {
+                    // debugger; // metaspacebase syncIbGibs error
                     if (logalot) { console.log(`${lc}[obs.error] error called (I: 976b08ab82d64299b17927eac16b1693)`); }
                     console.timeEnd(syncTimelogName)
                     if (!this.subSagaSyncTimeLog) {
@@ -2638,6 +2637,7 @@ export abstract class MetaspaceBase implements MetaspaceService {
                     await this.subSagaSyncTimeLog!.unsubscribe();
                 },
                 complete: async () => {
+                    // debugger; // metaspacebase syncIbGibs complete
                     if (logalot) { console.log(`${lc}[obs.complete] complete called (I: 72307340e2b34b22b0787e3a3c906c06)`); }
                     console.timeEnd(syncTimelogName)
                     if (!this.subSagaSyncTimeLog) {
@@ -2653,7 +2653,7 @@ export abstract class MetaspaceBase implements MetaspaceService {
             if (!syncSpaceIbGibs || syncSpaceIbGibs.length === 0) { throw new Error(`syncSpaceIbGibs required (E: c5a022454b9ce34856e141e61e337d24)`); }
             // #endregion
 
-            const localUserSpace = await this.getLocalUserSpace({});
+            const localUserSpace = localSpace ?? await this.getLocalUserSpace({});
             if (!localUserSpace?.data) { throw new Error(`localUserSpace?.data falsy (E: e7ff57e4d529cde903619078ee9b6e23)`); }
             if (!localUserSpace.gib) { throw new Error(`localUserSpace.gib falsy (E: 884d86d20e7a4468b3c8b2c3ab7dba7e)`); }
 
@@ -2755,10 +2755,13 @@ export abstract class MetaspaceBase implements MetaspaceService {
                             `${lc} something went wrong (E: d7db873d9e8b4f14b5b490cadd9730f4)`;
                     console.error(emsg);
                     if (!sagaInfo.syncStatus$.error) { throw new Error(`(UNEXPECTED) sagaInfo.syncStatus$.error is falsy? (E: 8522f275dbbf0885db75aead27d72923)`); }
-                    sagaInfo.syncStatus$.error!(emsg);
+                    await sagaInfo.syncStatus$.error!(emsg);
                 }
-                if (!sagaInfo.syncStatus$.complete) { throw new Error(`(UNEXPECTED) sagaInfo.syncStatus$.complete is falsy? (E: 836f42d8f7084ff9afd73696134d41e6)`); }
-                sagaInfo.syncStatus$.complete();
+                // we don't call complete() from within a next() (i don't think)
+                // if (!sagaInfo.syncStatus$.complete) { throw new Error(`(UNEXPECTED) sagaInfo.syncStatus$.complete is falsy? (E: 836f42d8f7084ff9afd73696134d41e6)`); }
+                // if (!sagaInfo.syncStatus$.isCompleteOrErrored) {
+                //     await sagaInfo.syncStatus$.complete();
+                // }
             }
             // I think $.complete() closes subscriptions, but to be double sure...
             let toUnsubscribe: SubscriptionWitness[] = [];
@@ -2766,15 +2769,10 @@ export abstract class MetaspaceBase implements MetaspaceService {
             for (let i = 0; i < subscriptions.length; i++) {
                 const sub = subscriptions[i];
                 let unsubscribed = await sub.unsubscribed();
-                if (!unsubscribed) { await sub.unsubscribe(); }
-            }
-            // .filter(sub => sub && !sub.closed)
-            // .filter(sub => sub && !sub.unsubscribed) // todo: make async filter sugar
-            // .forEach(sub => { sub.unsubscribe(); });
-            // for (let i = 0; i < toUnsubscribe.length; i++) {
-            //     let sub = toUnsubscribe[i];
-            //     await sub.unsubscribe();
-            // }
+                if (!unsubscribed) {
+                    await sub.unsubscribe();
+                }
+            }
 
             if (logalot) { console.log(`${lc} setting sagaInfo.complete to true (I: 85c34469cdac404782c2024ad6b6fbd1)`); }
             sagaInfo.complete = true;
@@ -3041,25 +3039,21 @@ export abstract class MetaspaceBase implements MetaspaceService {
                 const sagaInfo = infos[i];
 
                 let sub = await sagaInfo.syncStatus$
-                    // .pipe(
-                    //     concatMap(async (status: SyncStatusIbGib) => {
-                    //         if (logalot) { console.log(`${lc}(sagaId: ${sagaInfo.sagaId}) status received. ${status?.data?.statusCode ?? 'no status'}`) }
-                    //         await this._handleSyncStatusIbGib({ status, sagaInfo });
-                    //         return status;
-                    //     })
-                    // )
                     .subscribe(fnObs({
                         next: async (status: SyncStatusIbGib) => {
+                            // debugger; // metaspacebase handlesagaupdates next
                             if (logalot) { console.log(`${lc}(sagaId: ${sagaInfo.sagaId}) subscribe next triggered. status: ${status?.data?.statusCode} (I: 41e1f61e5e1b422ead1d72a1c92c7d51)`); }
                             await this._handleSyncStatusIbGib({ status, sagaInfo });
                         },
                         error: async (error: string) => {
+                            // debugger; // metaspacebase handlesagaupdates error
                             const emsg = `${lc}(sagaId: ${sagaInfo.sagaId}) syncStatus$.error: ${error}`;
                             console.error(emsg);
                             // await this.getFnAlert!()({title: 'couldnt this.syncIbGibs...', msg: emsg});
                             await this._finalizeSyncSaga({ sagaInfo, error: emsg });
                         },
                         complete: async () => {
+                            // debugger; // metaspacebase handlesagaupdates complete
                             if (logalot) { console.log(`${lc}(sagaId: ${sagaInfo.sagaId}) syncStatus$.complete.`); }
                         }
                     }));
@@ -3115,11 +3109,11 @@ export abstract class MetaspaceBase implements MetaspaceService {
                     break;
 
                 case StatusCode.merged_dna:
-                    await this._handleSyncStatus_Merged({ status });
+                    await this._handleSyncStatus_Merged({ status, sagaInfo });
                     break;
 
                 case StatusCode.merged_state:
-                    await this._handleSyncStatus_Merged({ status });
+                    await this._handleSyncStatus_Merged({ status, sagaInfo });
                     break;
 
                 case StatusCode.already_synced:
@@ -3146,14 +3140,16 @@ export abstract class MetaspaceBase implements MetaspaceService {
             if (!sagaInfo.syncStatus$?.error) {
                 throw new Error(`(UNEXPECTED) sagaInfo.syncStatus$.error falsy? (E: 36cc488835aeb12e1ae6b7a49d0d8523)`);
             }
-            sagaInfo.syncStatus$.error(emsg);
+            await sagaInfo.syncStatus$.error(emsg);
         }
     };
 
     protected async _handleSyncStatus_Merged({
         status,
+        sagaInfo,
     }: {
         status: SyncStatusIbGib,
+        sagaInfo: SyncSagaInfo,
     }): Promise<void> {
         const lc = `${this.lc}[${this._handleSyncStatus_Merged.name}]`;
         try {
@@ -3171,6 +3167,13 @@ export abstract class MetaspaceBase implements MetaspaceService {
 
             if (logalot) { console.log(`${lc} validated.`); }
 
+
+            const participants_src = sagaInfo.participants.filter(x => x.s_d === 'src');
+            if (participants_src.length !== 1) { throw new Error(`(UNEXPECTED) participants_src.length !== 1? atow (03/2024) only one src participant is expected. (E: ed4b3ae15f5da34c77655553aaf82224)`); }
+            const localSpaceId = participants_src.at(0)!.id;
+            const localSpace = await this.getLocalUserSpace({ localSpaceId });
+            if (!localSpace) { throw new Error(`(UNEXPECTED) couldn't get src participant with space id (${localSpaceId}) in the middle of a saga? (E: c75732b748f6a168254e38dc5548e824)`); }
+
             // first, we will store the newly created ibgibs in the local space. Then
             // we want to rebase our local timeline to point to the new one. I believe
             // we can do this simply by registering the latest created ibgib which
@@ -3192,7 +3195,7 @@ export abstract class MetaspaceBase implements MetaspaceService {
                     const timeline = timelines[tjpAddr];
                     const latestIbGibInTimeline = timeline[timeline.length - 1];
                     // registerNewIbGib is idempotent if already registered as latest
-                    await this.registerNewIbGib({ ibGib: latestIbGibInTimeline });
+                    await this.registerNewIbGib({ ibGib: latestIbGibInTimeline, space: localSpace });
                 }
             };
 
@@ -3201,7 +3204,7 @@ export abstract class MetaspaceBase implements MetaspaceService {
             // meanwhile, we must collect all ibgib timelines (with tjps) to register
             if (status.createdIbGibs?.length ?? 0 > 0) {
                 if (logalot) { console.log(`${lc} putting createdIbGibs (${status.createdIbGibs!.length}): ${status.createdIbGibs!.map(x => getIbGibAddr({ ibGib: x })).join('\n')}.`); }
-                const resPutCreated = await this.put({ ibGibs: status.createdIbGibs });
+                const resPutCreated = await this.put({ ibGibs: status.createdIbGibs, space: localSpace });
                 if (!resPutCreated.success) { throw new Error(`Couldn't save created ibGibs locally? (E: f8bc91259c5043d589cd2e7ad2220c1f)`); }
                 if (status.storeOnlyIbGibs) {
                     await registerLatestInTimelines(status.storeOnlyIbGibs)
@@ -3214,7 +3217,7 @@ export abstract class MetaspaceBase implements MetaspaceService {
             if (status.storeOnlyIbGibs?.length ?? 0 > 0) {
                 if (logalot) { console.log(`${lc} putting storeOnlyIbGibs (${status.storeOnlyIbGibs!.length}): ${status.storeOnlyIbGibs!.map(x => getIbGibAddr({ ibGib: x })).join('\n')}.`); }
                 console.warn(`${lc} putting storeOnlyIbGibs (${status.storeOnlyIbGibs!.length}): ${status.storeOnlyIbGibs!.map(x => getIbGibAddr({ ibGib: x })).join('\n')}.`);
-                const resPutStoreOnly = await this.put({ ibGibs: status.storeOnlyIbGibs });
+                const resPutStoreOnly = await this.put({ ibGibs: status.storeOnlyIbGibs, space: localSpace });
                 if (!resPutStoreOnly.success) { throw new Error(`Couldn't save storeonly ibGibs locally? (E: c5ab044718ab42bba27f5852149b7ddc)`); }
                 await registerLatestInTimelines(status.storeOnlyIbGibs!)
             } else {
@@ -3229,7 +3232,7 @@ export abstract class MetaspaceBase implements MetaspaceService {
             for (let i = 0; i < newLatestIbGibs.length; i++) {
                 const latestIbGib = newLatestIbGibs[i];
                 if (logalot) { console.log(`${lc} registering latestIbGib in localUserSpace: ${getIbGibAddr({ ibGib: latestIbGib })}`); }
-                await this.registerNewIbGib({ ibGib: latestIbGib });
+                await this.registerNewIbGib({ ibGib: latestIbGib, space: localSpace });
             }
 
             if (logalot) { console.log(`${lc} complete.`); }

package/src/witness/space/metaspace/metaspace-types.mts

@@ -588,6 +588,10 @@ export interface MetaspaceService {
      * outerspaces.
      */
     syncIbGibs(arg: {
+        /**
+         * which local space to use. will use default local user space if falsy
+         */
+        localSpace: IbGibSpaceAny,
         /**
          * ibgibs to be synced.
          */

package/src/witness/space/outer-space/outer-space-types.mts

@@ -83,21 +83,30 @@ export const StatusCode = {
      */
     updated: 'updated' as StatusCode,
     /**
-     * When syncing, this means that we've created new ibgib to merge into an
-     * existing timeline in the sync space BY APPLYING ALL UN-APPLIED LOCAL
-     * TRANSFORMS to the latest ibgib in the store.
+     * When syncing, this means that we've reconciled one or more timeline(s)
+     * between the local and sync spaces. The process of this was by
+     * automatically applying dna ibgibs that did not exist in one or the other
+     * timelines, so that the end result is that the dna at the end is
+     * "effectively equal". this does not guarantee order, it only guarantees
+     * application.  anything sensitive to order must be done with locality.
      *
      * Note that in this case, we've created new ibgib to fulfill the operation
      * (besides the derivative metadata ibgibs created in the communication).
+     * These ibgibs should be found on the status ibgib.
+     *
+     * @see {@link merged_state}
      */
     merged_dna: 'merged_dna' as StatusCode,
     /**
-     * When syncing, this means that we've created new ibgib to merge into an
-     * existing timeline in the sync space BY MANUALLY SYNCHRONIZING ALL
-     * DATA AND REL8NS with the latest ibgib in the store.
+     * Similar to {@link merged_dna}, but we didn't have dna to work with. So we
+     * fudged and did our best guess at merging the state using some opinionated
+     * algorithms.
      *
      * Note that in this case, we've created new ibgib to fulfill the operation
      * (besides the derivative metadata ibgibs created in the communication).
+     * These ibgibs should be found on the status ibgib.
+     *
+     * @see {@link merged_dna}
      */
     merged_state: 'merged_state' as StatusCode,
     /**