npm - @genkaku/dsh-runtime - Versions diffs - 0.1.1 → 0.1.3 - Mend

@genkaku/dsh-runtime 0.1.1 → 0.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/dist/runtime.d.ts CHANGED Viewed

@@ -53,6 +53,10 @@ export interface Config {
     spawnOllama: boolean;
     /** local Ollama base URL */
     ollamaHost: string;
+    /** Offer every local model at the default price when the catalog is empty. */
+    autoCatalog: boolean;
+    /** 6-decimal USDC per hour for auto-listed models. */
+    defaultPricePerHour: string;
 }
 /** Validated plugin configuration. */
 export declare const Config: z<Schemastery.ObjectS<NoInfer<{
@@ -78,6 +82,14 @@ export declare const Config: z<Schemastery.ObjectS<NoInfer<{
         sessionsServed: z<number, number, "defined">;
         maxConcurrent: z<number, number, "plain">;
     }>>[], "defined">;
+    /**
+     * When the catalog is empty, offer every model Ollama already has at
+     * `defaultPricePerHour`. Without this a fresh worker starts with nothing on
+     * the board, which reads as "the plugin does nothing".
+     */
+    autoCatalog: z<boolean, boolean, "defined">;
+    /** 6-decimal USDC per hour used by autoCatalog entries. Default 6 USDC. */
+    defaultPricePerHour: z<string, string, "defined">;
     listen: z<string[], string[], "defined">;
     publishAddress: z<boolean, boolean, "defined">;
     workerName: z<string, string, "defined">;
@@ -106,6 +118,14 @@ export declare const Config: z<Schemastery.ObjectS<NoInfer<{
         sessionsServed: z<number, number, "defined">;
         maxConcurrent: z<number, number, "plain">;
     }>>[], "defined">;
+    /**
+     * When the catalog is empty, offer every model Ollama already has at
+     * `defaultPricePerHour`. Without this a fresh worker starts with nothing on
+     * the board, which reads as "the plugin does nothing".
+     */
+    autoCatalog: z<boolean, boolean, "defined">;
+    /** 6-decimal USDC per hour used by autoCatalog entries. Default 6 USDC. */
+    defaultPricePerHour: z<string, string, "defined">;
     listen: z<string[], string[], "defined">;
     publishAddress: z<boolean, boolean, "defined">;
     workerName: z<string, string, "defined">;
@@ -163,6 +183,14 @@ export declare function defineGenkakuPlugin(options: {
             sessionsServed: z<number, number, "defined">;
             maxConcurrent: z<number, number, "plain">;
         }>>[], "defined">;
+        /**
+         * When the catalog is empty, offer every model Ollama already has at
+         * `defaultPricePerHour`. Without this a fresh worker starts with nothing on
+         * the board, which reads as "the plugin does nothing".
+         */
+        autoCatalog: z<boolean, boolean, "defined">;
+        /** 6-decimal USDC per hour used by autoCatalog entries. Default 6 USDC. */
+        defaultPricePerHour: z<string, string, "defined">;
         listen: z<string[], string[], "defined">;
         publishAddress: z<boolean, boolean, "defined">;
         workerName: z<string, string, "defined">;
@@ -191,6 +219,14 @@ export declare function defineGenkakuPlugin(options: {
             sessionsServed: z<number, number, "defined">;
             maxConcurrent: z<number, number, "plain">;
         }>>[], "defined">;
+        /**
+         * When the catalog is empty, offer every model Ollama already has at
+         * `defaultPricePerHour`. Without this a fresh worker starts with nothing on
+         * the board, which reads as "the plugin does nothing".
+         */
+        autoCatalog: z<boolean, boolean, "defined">;
+        /** 6-decimal USDC per hour used by autoCatalog entries. Default 6 USDC. */
+        defaultPricePerHour: z<string, string, "defined">;
         listen: z<string[], string[], "defined">;
         publishAddress: z<boolean, boolean, "defined">;
         workerName: z<string, string, "defined">;

package/dist/runtime.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACpE,OAAO,CAAC,MAAM,0BAA0B,CAAA;AAqBxC,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAGjE,OAAO,EAAE,WAAW,EAAE,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAE9D,OAAO,EAAmB,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAA;AASxE;6DAC6D;AAC7D,eAAO,MAAM,mBAAmB,YAAY,CAAA;AAE5C,sEAAsE;AACtE,MAAM,MAAM,YAAY,GAAG;IACzB,0CAA0C;IAC1C,KAAK,EAAE,MAAM,CAAA;IACb,mDAAmD;IACnD,YAAY,EAAE,MAAM,CAAA;IACpB,+DAA+D;IAC/D,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,2CAA2C;IAC3C,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,iEAAiE;IACjE,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,2CAA2C;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB,CAAA;AAED,MAAM,WAAW,MAAM;IACrB,gFAAgF;IAChF,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAA;IACxB,4CAA4C;IAC5C,GAAG,EAAE,cAAc,CAAA;IACnB,+DAA+D;IAC/D,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAA;IACtB,uEAAuE;IACvE,OAAO,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAA;IAC3B;;2DAEuD;IACvD,MAAM,EAAE,OAAO,CAAA;IACf;;gEAE4D;IAC5D,OAAO,EAAE,OAAO,CAAA;IAChB,qEAAqE;IACrE,MAAM,EAAE,MAAM,CAAA;IACd,6BAA6B;IAC7B,OAAO,EAAE,YAAY,EAAE,CAAA;IACvB,0CAA0C;IAC1C,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB;iFAC6E;IAC7E,cAAc,EAAE,OAAO,CAAA;IACvB,2CAA2C;IAC3C,UAAU,EAAE,MAAM,CAAA;IAClB,sEAAsE;IACtE,WAAW,EAAE,OAAO,CAAA;IACpB,4BAA4B;IAC5B,UAAU,EAAE,MAAM,CAAA;~~CACnB~~;AAWD,sCAAsC;AACtC,eAAO,MAAM,MAAM~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAiBjB~~,CAAA;AAEF;;;;GAIG;AACH;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE;IAC3C,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,QAAQ,CAAA;IACf,iEAAiE;IACjE,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAC/B,gFAAgF;IAChF,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;CACnD;;YA8C2C,SAAS,MAAM,EAAE~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBA3CjC~~,OAAO,UAAU,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;EA+ClE;AASD,gFAAgF;AAChF,qBAAa,cAAc;IA0BvB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;IAC5B,qEAAqE;IACrE,OAAO,CAAC,QAAQ,CAAC,UAAU;IAtC7B,OAAO,CAAC,IAAI,CAAsB;IAClC,OAAO,CAAC,MAAM,CAAgC;IAC9C,OAAO,CAAC,IAAI,CAAqC;IACjD,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO,CAAC,OAAO,CAA8B;IAC7C,gFAAgF;IAChF,OAAO,CAAC,cAAc,CAWP;IACf,OAAO,CAAC,cAAc,CAA8C;IACpE,OAAO,CAAC,gBAAgB,CAAmC;IAC3D,OAAO,CAAC,UAAU,CAA8C;IAChE,OAAO,CAAC,WAAW,CAAmD;IACtE,OAAO,CAAC,YAAY,CAAQ;gBAGT,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,QAAQ,EACf,WAAW,EAAE,WAAW,EACxB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM;IAC/B;;;;OAIG;IACc,UAAU,CAAC,EAAE,QAAQ,YAAA;IACtC,qEAAqE;IACpD,UAAU,GAAE,MAA4B;IAG3D,2EAA2E;IACrE,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAShC,sEAAsE;IACtE,OAAO,CAAC,YAAY;IAKpB,gEAAgE;IAChE,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,cAAc;IAQtB,wEAAwE;IACxE,OAAO,CAAC,SAAS;IAsBjB,gFAAgF;IAChF,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAW5B,yEAAyE;YAC3D,cAAc;IA6B5B,OAAO,CAAC,YAAY;IAQpB,4EAA4E;IACtE,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiGhC,yEAAyE;IACnE,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;~~IAuHlC~~;;;kEAG8D;IAC9D,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,kBAAkB;YAMZ,cAAc;IA8D5B,yEAAyE;YAC3D,YAAY;IAS1B,iEAAiE;IAC3D,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAK9B,uCAAuC;IACjC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAG/B;AAmND,wFAAwF"}
1	+ {"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACpE,OAAO,CAAC,MAAM,0BAA0B,CAAA;AAqBxC,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAGjE,OAAO,EAAE,WAAW,EAAE,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAE9D,OAAO,EAAmB,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAA;AASxE;6DAC6D;AAC7D,eAAO,MAAM,mBAAmB,YAAY,CAAA;AAE5C,sEAAsE;AACtE,MAAM,MAAM,YAAY,GAAG;IACzB,0CAA0C;IAC1C,KAAK,EAAE,MAAM,CAAA;IACb,mDAAmD;IACnD,YAAY,EAAE,MAAM,CAAA;IACpB,+DAA+D;IAC/D,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,2CAA2C;IAC3C,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,iEAAiE;IACjE,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,2CAA2C;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB,CAAA;AAED,MAAM,WAAW,MAAM;IACrB,gFAAgF;IAChF,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAA;IACxB,4CAA4C;IAC5C,GAAG,EAAE,cAAc,CAAA;IACnB,+DAA+D;IAC/D,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAA;IACtB,uEAAuE;IACvE,OAAO,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAA;IAC3B;;2DAEuD;IACvD,MAAM,EAAE,OAAO,CAAA;IACf;;gEAE4D;IAC5D,OAAO,EAAE,OAAO,CAAA;IAChB,qEAAqE;IACrE,MAAM,EAAE,MAAM,CAAA;IACd,6BAA6B;IAC7B,OAAO,EAAE,YAAY,EAAE,CAAA;IACvB,0CAA0C;IAC1C,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB;iFAC6E;IAC7E,cAAc,EAAE,OAAO,CAAA;IACvB,2CAA2C;IAC3C,UAAU,EAAE,MAAM,CAAA;IAClB,sEAAsE;IACtE,WAAW,EAAE,OAAO,CAAA;IACpB,4BAA4B;IAC5B,UAAU,EAAE,MAAM,CAAA;IAClB,8EAA8E;IAC9E,WAAW,EAAE,OAAO,CAAA;IACpB,sDAAsD;IACtD,mBAAmB,EAAE,MAAM,CAAA;CAC5B;AAWD,sCAAsC;AACtC,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;IASjB;;;;OAIG;;IAEH,2EAA2E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAN3E;;;;OAIG;;IAEH,2EAA2E;;;;;;;aAU3E,CAAA;AAEF;;;;GAIG;AACH;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE;IAC3C,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,QAAQ,CAAA;IACf,iEAAiE;IACjE,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAC/B,gFAAgF;IAChF,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;CACnD;;YA8C2C,SAAS,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;QAzF3D;;;;WAIG;;QAEH,2EAA2E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAN3E;;;;WAIG;;QAEH,2EAA2E;;;;;;;;iBAwCjD,OAAO,UAAU,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;EA+ClE;AASD,gFAAgF;AAChF,qBAAa,cAAc;IA0BvB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;IAC5B,qEAAqE;IACrE,OAAO,CAAC,QAAQ,CAAC,UAAU;IAtC7B,OAAO,CAAC,IAAI,CAAsB;IAClC,OAAO,CAAC,MAAM,CAAgC;IAC9C,OAAO,CAAC,IAAI,CAAqC;IACjD,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO,CAAC,OAAO,CAA8B;IAC7C,gFAAgF;IAChF,OAAO,CAAC,cAAc,CAWP;IACf,OAAO,CAAC,cAAc,CAA8C;IACpE,OAAO,CAAC,gBAAgB,CAAmC;IAC3D,OAAO,CAAC,UAAU,CAA8C;IAChE,OAAO,CAAC,WAAW,CAAmD;IACtE,OAAO,CAAC,YAAY,CAAQ;gBAGT,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,QAAQ,EACf,WAAW,EAAE,WAAW,EACxB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM;IAC/B;;;;OAIG;IACc,UAAU,CAAC,EAAE,QAAQ,YAAA;IACtC,qEAAqE;IACpD,UAAU,GAAE,MAA4B;IAG3D,2EAA2E;IACrE,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAShC,sEAAsE;IACtE,OAAO,CAAC,YAAY;IAKpB,gEAAgE;IAChE,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,cAAc;IAQtB,wEAAwE;IACxE,OAAO,CAAC,SAAS;IAsBjB,gFAAgF;IAChF,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAW5B,yEAAyE;YAC3D,cAAc;IA6B5B,OAAO,CAAC,YAAY;IAQpB,4EAA4E;IACtE,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiGhC,yEAAyE;IACnE,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAiKlC;;;kEAG8D;IAC9D,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,kBAAkB;YAMZ,cAAc;IA8D5B,yEAAyE;YAC3D,YAAY;IAS1B,iEAAiE;IAC3D,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAK9B,uCAAuC;IACjC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAG/B;AAmND,wFAAwF"}

package/dist/runtime.js CHANGED Viewed

@@ -12,7 +12,7 @@ import { advertiseWorker, deactivateWorker, hasPublicAddr, locatorOf, publicClie
 import { fetchSeedPeers } from '@genkaku/protocol';
 import { loadDirectory, syncDirectory, workerAddrs } from '@genkaku/protocol';
 import { createKeyVault } from '@genkaku/protocol';
-import { createOllamaChatSource, createOllamaSource } from '@genkaku/protocol';
+import { announceToSeed, createOllamaChatSource, createOllamaSource, probeModels } from '@genkaku/protocol';
 import { createOllamaSupervisor } from '@genkaku/protocol';
 import { ModeManager } from '@genkaku/protocol';
 import { probeRpc } from '@genkaku/protocol';
@@ -45,6 +45,14 @@ export const Config = z.object({
     paywall: z.boolean().default(true),
     keyDir: z.string().min(1).default(join(homedir(), '.dsh', 'genkaku')),
     catalog: z.array(catalogEntry).default([]),
+    /**
+     * When the catalog is empty, offer every model Ollama already has at
+     * `defaultPricePerHour`. Without this a fresh worker starts with nothing on
+     * the board, which reads as "the plugin does nothing".
+     */
+    autoCatalog: z.boolean().default(true),
+    /** 6-decimal USDC per hour used by autoCatalog entries. Default 6 USDC. */
+    defaultPricePerHour: z.string().pattern(/^\d+$/).default('6000000'),
     // IPv4 and IPv6 need separate binds (a /ip6/::/ bind is v6-only), and a
     // global IPv6 address means a directly dialable worker with no NAT at all —
     // the cheapest way for a dorm/public-wifi peer to be reachable (P4.9j).
@@ -357,6 +365,28 @@ export class GenkakuRuntime {
         const workerKey = this.vault.workerKey();
         const workerWallet = this.vault.addresses().worker;
         let workerCatalog = loadCatalog(this.keyDir, this.config.catalog, this.log);
+        // First run: an empty board looks broken to the person who just installed
+        // the plugin. Advertise what Ollama already has, at a stated default price,
+        // and let the panel adjust it afterwards.
+        if (workerCatalog.length === 0 && this.config.autoCatalog) {
+            try {
+                const profiles = await probeModels(this.config.ollamaHost);
+                workerCatalog = profiles.map(profile => ({
+                    model: profile.model,
+                    pricePerHour: this.config.defaultPricePerHour,
+                }));
+                if (workerCatalog.length > 0) {
+                    persistCatalog(this.keyDir, workerCatalog, this.log);
+                    this.log.info('catalog: empty — auto-listed %d local model(s) at %s per hour', workerCatalog.length, this.config.defaultPricePerHour);
+                }
+                else {
+                    this.log.warn('catalog: empty and Ollama has no models; run `ollama pull` to serve one');
+                }
+            }
+            catch (error) {
+                this.log.warn('catalog: auto-list failed (%s) — set catalog in settings', error instanceof Error ? error.message : String(error));
+            }
+        }
         const paywall = this.config.paywall
             ? createPaywall({
                 publicC: publicClientFor(this.config.env),
@@ -439,6 +469,22 @@ export class GenkakuRuntime {
         };
         this.startAdvertiseWatch();
         this.log.info('worker %s listening on %s', sidecar.peerIdStr(), sidecar.peerAddrs().join(', '));
+        // Announce to the configured seeds so a cold client can find this worker
+        // without already knowing its multiaddr.
+        if (HARDCODED_SEEDS.length > 0) {
+            for (const seed of HARDCODED_SEEDS) {
+                void announceToSeed(sidecar.node, seed, sidecar.peerAddrs())
+                    .then((ok) => {
+                    if (ok)
+                        this.log.info('announced to seed %s', seed);
+                    else
+                        this.log.warn('seed %s did not accept the announcement', seed);
+                })
+                    .catch((error) => {
+                    this.log.warn('announce to %s failed (%s)', seed, error instanceof Error ? error.message : String(error));
+                });
+            }
+        }
         this.log.info('worker dashboard at %s', this.statusServer.url);
         this.stop = sidecar.stop;
     }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@genkaku/dsh-runtime",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "DeepSeek Harness adapter layer for the GenKaKu protocol runtime",
   "license": "MIT",
   "type": "module",
@@ -23,7 +23,7 @@
   "dependencies": {
     "@deepseek-ai/cosmokit": "1.9.0",
     "@deepseek-ai/schemastery": "^3.19.0",
-    "@genkaku/protocol": "0.1.1"
+    "@genkaku/protocol": "0.1.3"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.1.0",