@olane/os 0.7.24 → 0.7.26

package/dist/src/o-olane-os/o-os.d.ts

@@ -17,6 +17,11 @@ export declare class OlaneOS extends oObject {
     addLeader(leader: oLeaderNode): void;
     addNode(node: OlaneOSNode): Promise<void>;
     private loadConfig;
+    /**
+     * Load config from o://os-config storage backend
+     * This is called after the leader is started and tools are initialized
+     */
+    private loadConfigFromStorage;
     getOSInstanceName(): Promise<string | undefined>;
     startNodes(type: NodeType): Promise<void>;
     runSavedPlans(): Promise<void>;

package/dist/src/o-olane-os/o-os.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"o-os.d.ts","sourceRoot":"","sources":["../../../src/o-olane-os/o-os.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAG5D,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAIzC,OAAO,EAAG,SAAS,EAAE,MAAM,eAAe,CAAC;AAK3C,KAAK,WAAW,GAAG,SAAS,GAAG,WAAW,CAAC;AAC3C,qBAAa,OAAQ,SAAQ,OAAO;IAClC,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,KAAK,CAAqB;IAC3B,UAAU,EAAE,WAAW,GAAG,IAAI,CAAQ;IACtC,MAAM,EAAG,mBAAmB,CAAC;IACpC,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,eAAe,CAAa;gBAExB,MAAM,EAAE,aAAa;IAKjC,SAAS,IAAI,SAAS,GAAG,WAAW;IAMpC,SAAS,CAAC,MAAM,EAAE,WAAW;IAOvB,OAAO,CAAC,IAAI,EAAE,WAAW;YAiBjB,UAAU;IAwClB,iBAAiB;IASjB,UAAU,CAAC,IAAI,EAAE,QAAQ;IAsDzB,aAAa;IA6Bb,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG;IASnC,KAAK,IAAI,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,UAAU,EAAE,CAAA;KAAE,CAAC;IAiC9D,IAAI;IAwBJ,OAAO;CAKd"}
+{"version":3,"file":"o-os.d.ts","sourceRoot":"","sources":["../../../src/o-olane-os/o-os.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAG5D,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAIzC,OAAO,EAAG,SAAS,EAAE,MAAM,eAAe,CAAC;AAK3C,KAAK,WAAW,GAAG,SAAS,GAAG,WAAW,CAAC;AAC3C,qBAAa,OAAQ,SAAQ,OAAO;IAClC,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,KAAK,CAAqB;IAC3B,UAAU,EAAE,WAAW,GAAG,IAAI,CAAQ;IACtC,MAAM,EAAG,mBAAmB,CAAC;IACpC,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,eAAe,CAAa;gBAExB,MAAM,EAAE,aAAa;IAKjC,SAAS,IAAI,SAAS,GAAG,WAAW;IAMpC,SAAS,CAAC,MAAM,EAAE,WAAW;IAOvB,OAAO,CAAC,IAAI,EAAE,WAAW;YAiBjB,UAAU;IAyCxB;;;OAGG;YACW,qBAAqB;IAkE7B,iBAAiB;IASjB,UAAU,CAAC,IAAI,EAAE,QAAQ;IAsDzB,aAAa;IAwEb,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG;IASnC,KAAK,IAAI,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,UAAU,EAAE,CAAA;KAAE,CAAC;IAuC9D,IAAI;IAwBJ,OAAO;CAKd"}

package/dist/src/o-olane-os/o-os.js

@@ -46,7 +46,8 @@ export class OlaneOS extends oObject {
         parent.addChildNode(node);
     }
     async loadConfig() {
-        // TODO make this a promise based function
+        // Load config from filesystem first to get initial structure
+        // Then we'll migrate to using o://os-config for persistence
         if (this.config.configFilePath) {
             try {
                 await touch(this.config.configFilePath);
@@ -83,6 +84,61 @@ export class OlaneOS extends oObject {
             this.logger.warn('No config file path provided, using default config');
         }
     }
+    /**
+     * Load config from o://os-config storage backend
+     * This is called after the leader is started and tools are initialized
+     */
+    async loadConfigFromStorage() {
+        if (!this.rootLeader) {
+            this.logger.warn('No root leader available, skipping storage config load');
+            return;
+        }
+        try {
+            const osInstanceName = await this.getOSInstanceName();
+            if (!osInstanceName) {
+                this.logger.warn('No OS instance name available, skipping storage config load');
+                return;
+            }
+            this.logger.debug(`Loading config from o://os-config for: ${osInstanceName}`);
+            // Try to load existing config from storage
+            const loadResult = await this.rootLeader.use(new oAddress('o://os-config'), {
+                method: 'load_config',
+                params: { osName: osInstanceName },
+            });
+            if (loadResult.result?.success) {
+                const loadedConfig = loadResult.result.data;
+                this.logger.debug('Loaded config from storage:', loadedConfig);
+                // Merge storage config with current config, prioritizing storage for lanes
+                if (loadedConfig.oNetworkConfig) {
+                    this.config = {
+                        ...this.config,
+                        lanes: loadedConfig.oNetworkConfig.lanes || this.config.lanes || [],
+                    };
+                }
+                this.logger.info(`Loaded config from storage: ${this.config.lanes?.length || 0} saved lanes`);
+            }
+            else {
+                this.logger.debug('No config found in storage, creating default:', loadResult.result?.error);
+                // Create default config in storage
+                await this.rootLeader.use(new oAddress('o://os-config'), {
+                    method: 'save_config',
+                    params: {
+                        osName: osInstanceName,
+                        config: {
+                            oNetworkConfig: {
+                                lanes: this.config.lanes || [],
+                            },
+                        },
+                    },
+                });
+                this.logger.info('Created default config in storage');
+            }
+        }
+        catch (error) {
+            this.logger.error('Failed to load config from storage (non-fatal):', error);
+            // Don't throw - allow OS to continue with filesystem config
+        }
+    }
     async getOSInstanceName() {
         if (this.config.configFilePath) {
             const osConfig = await ConfigManager.getOSConfigFromPath(this.config.configFilePath);
@@ -138,28 +194,57 @@ export class OlaneOS extends oObject {
         }
     }
     async runSavedPlans() {
-        const laneCIDs = Array.from(new Set(this.config?.lanes || []));
-        if (laneCIDs.length === 0) {
-            this.logger.debug('No saved lanes to replay');
+        if (!this.rootLeader) {
+            this.logger.warn('No root leader available, skipping lane replay');
             return;
         }
-        this.logger.info(`Replaying ${laneCIDs.length} saved lane(s) to restore network state...`);
-        for (const cid of laneCIDs) {
-            this.logger.debug('Replaying lane with CID: ' + cid);
-            try {
-                // Use the entry node's lane tool to replay the lane
-                const result = await this.use(this.entryNode().address, {
-                    method: 'replay',
-                    params: { cid },
-                });
-                this.logger.info('Lane replay completed successfully: ' + cid, result);
+        try {
+            const osInstanceName = await this.getOSInstanceName();
+            if (!osInstanceName) {
+                this.logger.warn('No OS instance name available, skipping lane replay');
+                return;
             }
-            catch (error) {
-                this.logger.error('Failed to replay lane: ' + cid, error);
-                // Continue with other lanes even if one fails
+            this.logger.debug(`Loading saved lanes for OS: ${osInstanceName}`);
+            // Get lanes from o://os-config storage (same as cloud pattern)
+            const lanesResult = await this.rootLeader.use(new oAddress('o://os-config'), {
+                method: 'get_lanes',
+                params: { osName: osInstanceName },
+            });
+            const lanes = lanesResult.result?.data?.lanes || [];
+            if (!Array.isArray(lanes) || lanes.length === 0) {
+                this.logger.debug('No saved lanes found to replay');
+                return;
+            }
+            this.logger.info(`Found ${lanes.length} saved lane(s) to replay: ${lanes.join(', ')}`);
+            const replayedLanes = [];
+            // Replay each lane
+            for (const cid of lanes) {
+                try {
+                    this.logger.debug(`Replaying lane: ${cid}`);
+                    // Use the entry node's lane tool to replay the lane
+                    const replayResult = await this.use(this.entryNode().address, {
+                        method: 'replay',
+                        params: { cid },
+                    });
+                    if (replayResult.result?.success !== false) {
+                        replayedLanes.push(cid);
+                        this.logger.info(`Successfully replayed lane: ${cid}`);
+                    }
+                    else {
+                        this.logger.warn(`Failed to replay lane ${cid}:`, replayResult.result?.error);
+                    }
+                }
+                catch (error) {
+                    this.logger.error(`Error replaying lane ${cid}:`, error);
+                    // Continue with other lanes even if one fails
+                }
             }
+            this.logger.info(`Replayed ${replayedLanes.length} of ${lanes.length} lane(s)`);
+        }
+        catch (error) {
+            this.logger.error('Error loading and replaying saved lanes:', error);
+            // Don't throw - allow OS to continue even if replay fails
         }
-        this.logger.info('All saved lanes replayed');
     }
     async use(oAddress, params) {
         const entryNode = this.entryNode();
@@ -180,6 +265,11 @@ export class OlaneOS extends oObject {
         this.logger.debug('Leaders started...');
         await this.startNodes(NodeType.NODE);
         this.logger.debug('Nodes started...');
+        // Load config from o://os-config storage backend (after tools are initialized)
+        // This merges any saved lanes from persistent storage
+        await this.loadConfigFromStorage();
+        this.logger.debug('Config loaded from storage...');
+        // Replay saved lanes from storage
         await this.runSavedPlans();
         this.logger.debug('Saved plans run...');
         this.logger.debug('OS instance started...');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olane/os",
-  "version": "0.7.24",
+  "version": "0.7.26",
   "type": "module",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -58,23 +58,23 @@
     "typescript": "5.4.5"
   },
   "dependencies": {
-    "@olane/o-client-limited": "0.7.24",
-    "@olane/o-config": "0.7.24",
-    "@olane/o-core": "0.7.24",
-    "@olane/o-intelligence": "0.7.24",
-    "@olane/o-lane": "0.7.24",
-    "@olane/o-leader": "0.7.24",
-    "@olane/o-login": "0.7.24",
-    "@olane/o-protocol": "0.7.24",
-    "@olane/o-storage": "0.7.24",
-    "@olane/o-tool": "0.7.24",
-    "@olane/o-tool-registry": "0.7.24",
-    "@olane/o-tools-common": "0.7.24",
+    "@olane/o-client-limited": "0.7.26",
+    "@olane/o-config": "0.7.26",
+    "@olane/o-core": "0.7.26",
+    "@olane/o-intelligence": "0.7.26",
+    "@olane/o-lane": "0.7.26",
+    "@olane/o-leader": "0.7.26",
+    "@olane/o-login": "0.7.26",
+    "@olane/o-protocol": "0.7.26",
+    "@olane/o-storage": "0.7.26",
+    "@olane/o-tool": "0.7.26",
+    "@olane/o-tool-registry": "0.7.26",
+    "@olane/o-tools-common": "0.7.26",
     "chalk": "^5.4.1",
     "debug": "^4.4.1",
     "dotenv": "^16.5.0",
     "fs-extra": "^11.3.0",
     "touch": "^3.1.1"
   },
-  "gitHead": "6f3520b1a7e24d39c0b0d9e6f7b7b3c26145738c"
+  "gitHead": "ded249359b4d2d0eb2e1bf438ce59287ba9dfd58"
 }