ollanet 0.6.8 → 0.6.10

package/README.md

@@ -4,11 +4,11 @@
 
 # ollanet
 
-Talk to **Ollama** on any network you can reach: LAN, localhost, Tailscale, VPN, or a raw IP.
+Find, manage, and use Ollama models on the hosts you choose.
 
 **CLI** for humans · **MCP** for agents · **Node** for apps.
 
-Scan for hosts, send a prompt, continue a chat by a short hash. No browser UI. **Node 20+ · zero runtime deps.**
+Discover hosts, give models convenient aliases, and prompt or compare them. A reachable host is not a trusted host. LAN scan is opt-in. Node 20+, zero runtime deps.
 
 **Docs:** [ollanet.dev/docs](https://ollanet.dev/docs) · **Site:** [ollanet.dev](https://ollanet.dev)
 
@@ -27,19 +27,57 @@ Or one-off: `npx ollanet scan`
 ollanet scan
 ollanet alias add desk studio gemma3:12b
 ollanet prompt desk "What is MagicDNS?"
-ollanet bench desk --hot
-ollanet mcp
 ```
 
+`alias` writes local config. `prompt` sends that text to the selected host. `pull` and `rm` change models on the remote host. `scan`, `show`, `ps`, and `alias` do not install or delete models.
+
 Host-first: `ollanet <cmd> <machine> …`. The machine is a MagicDNS name, a config name, an IP, or an alias for a machine + model pair.
 
-## What you get
+## Three jobs
+
+**Discover.** Probe localhost, config, env, and Tailscale. `--lan` is an opt-in TCP sweep of your subnet on port `11434`.
+
+**Manage.** `pull`, `show`, `rm`, and `ps` on a named machine. Comparisons and benches are deeper workflows on [ollanet.dev/docs](https://ollanet.dev/docs).
+
+**Use.** Prompt, continue a chat by hash, or call the same inventory from MCP and the Node library.
+
+## Reachability and trust
+
+ollanet talks to Ollama endpoints you configure or select. A scan that gets an answer means the port responded. It does not mean you should send prompts or pull models there. Authentication and network protection depend on how that Ollama host is deployed. Discovery is not a security boundary, and a LAN is not inherently safe.
+
+## Network effects
 
-Discover hosts. `pull` / `show` / `rm` / `ps`. Aliases. Prompt and hash-addressed chats. Compare. Bench. MCP. Node library. Flags and config live in the [docs](https://ollanet.dev/docs).
+This package does not include vendor telemetry. Commands still cause network traffic to the hosts you name.
+
+| Operation | Client sends | Remote host may do | Stored where |
+| --- | --- | --- | --- |
+| `scan` | Health and model-list probes to discovered or configured hosts | Answer with tags | Last scan on this machine (`last-scan.json`) |
+| `scan --lan` | Extra TCP probes on local `/24`s, port `11434` | Same, if something answers | Same |
+| `prompt`, `compare`, `bench` | Prompt text, and prior turns when you continue a chat | Run inference | Chats, compares, or benches on this machine unless you pass `--no-save` |
+| `pull` | `POST /api/pull` | Fetch the model from the Ollama registry onto that host | Model files on the remote host |
+| `show`, `ps` | Read requests | Return metadata or loaded-model rows | Nothing new on disk |
+| `rm` | Delete request (`--yes`) | Remove that model from the host | Model removed on the remote host |
+| `alias` | None to Ollama | None | Local `config.json` |
+| `chats` | None to Ollama | None | Reads local transcripts |
+
+Other machines see a saved chat only if they share the responses directory (or the same `~/.ollanet/` when installed). This table covers the operations inspected in this repo. It does not prove every possible data path is listed.
 
 ## Finetuna
 
-On the machine that *runs* Ollama, **[Finetuna](https://finetuna.net)** shapes a GPU-tuned named variant. ollanet finds that name from anywhere on the network.
+[Finetuna](https://finetuna.net) can shape a GPU-tuned named variant on the machine that runs Ollama. That pairing is optional. Each tool works alone.
+
+| Role | Tool | Where |
+| --- | --- | --- |
+| Host-side runtime settings | Finetuna | The GPU box |
+| Client-side discover, manage, use | ollanet | Any machine that can reach that host |
+
+```bash
+ollanet show studio gemma4-ctx32k
+ollanet prompt studio gemma4-ctx32k "What is MagicDNS?"
+ollanet bench studio gemma4-ctx32k --hot --runs 5
+```
+
+`bench` `quick` reports median tok/s on a 256-token counted decode, plus ping, math, and haiku checks, for that host, model, suite, and run count. Those checks are not a general quality ranking and do not compare across hardware without the same conditions.
 
 <!-- xfacts-nutrition-label -->
 

package/dist/cli.js

@@ -13,10 +13,11 @@
  *   ollanet chats
  *   ollanet mcp
  */
-const HELP = `ollanet — Ollama over your network
+const HELP = `ollanet: find, manage, and use Ollama on hosts you choose
 
 Discover hosts, manage models, prompt and compare, bench tok/s, and continue
 chats by hash. CLI for humans, MCP for agents, Node for apps.
+A reachable host is not a trusted host. pull and rm change the remote host.
 
 Usage:
   ollanet scan [--json] [--all] [--lan] [--last]

package/dist/config.js

@@ -247,6 +247,8 @@ export function hostLookupKeys(host) {
         host.dnsName,
         host.dnsName.split(".")[0] ?? "",
         host.ip,
+        ...(host.also ?? []),
+        ...(host.isSelf ? ["localhost"] : []),
     ]
         .map((k) => k.toLowerCase())
         .filter(Boolean);

package/dist/hosts.d.ts

@@ -23,6 +23,12 @@ export interface HostTarget {
     hostname: string;
     dnsName: string;
     ip: string;
+    /**
+     * Other IPs that reach this same instance. Used when loopback and Tailscale
+     * Self (or a LAN NIC) are the same machine — we probe once and keep both
+     * addresses for resolve / display.
+     */
+    also?: string[];
     online: boolean;
     os: string;
     isSelf: boolean;
@@ -44,6 +50,11 @@ export interface DiscoverOptions {
 }
 export declare function shortName(host: HostTarget): string;
 export declare function ollamaBaseUrl(host: HostTarget, port?: number): string;
+/**
+ * Collapse loopback, Tailscale Self, and this machine's NIC IPs into one host
+ * per port so scan does not list the same Ollama twice.
+ */
+export declare function foldLocalHosts(hosts: HostTarget[]): HostTarget[];
 /** Discover candidate Ollama hosts from localhost, config, env, Tailscale, and optional LAN scan. */
 export declare function discoverHosts(opts?: DiscoverOptions): Promise<DiscoveryResult>;
 /**

package/dist/hosts.js

@@ -37,10 +37,12 @@ export function ollamaBaseUrl(host, port = host.port || ollamaPort()) {
     return `http://${hostPart}:${port}`;
 }
 function makeHost(partial) {
+    const also = [...new Set((partial.also ?? []).filter((ip) => ip && ip !== partial.ip))];
     return {
         hostname: partial.hostname,
         dnsName: partial.dnsName ?? "",
         ip: partial.ip,
+        ...(also.length > 0 ? { also } : {}),
         online: partial.online ?? true,
         os: partial.os ?? "unknown",
         isSelf: partial.isSelf ?? false,
@@ -71,6 +73,7 @@ function mergeHosts(hosts) {
             os: existing.os !== "unknown" ? existing.os : host.os,
             isSelf: existing.isSelf || host.isSelf,
             source: existing.source === "direct" ? host.source : existing.source,
+            also: [...new Set([...(existing.also ?? []), ...(host.also ?? [])])].filter((ip) => ip !== existing.ip && ip !== host.ip),
         });
     }
     return [...byKey.values()].sort((a, b) => {
@@ -79,6 +82,96 @@ function mergeHosts(hosts) {
         return shortName(a).localeCompare(shortName(b));
     });
 }
+function isIpv4Literal(value) {
+    return /^\d{1,3}(\.\d{1,3}){3}$/.test(value);
+}
+function localIdentityIps() {
+    const ips = new Set(["127.0.0.1", "::1"]);
+    for (const entries of Object.values(os.networkInterfaces())) {
+        for (const entry of entries ?? []) {
+            if (entry.family === "IPv4")
+                ips.add(entry.address);
+        }
+    }
+    return ips;
+}
+function isThisDevice(host, localIps) {
+    return host.isSelf || localIps.has(host.ip);
+}
+function nameQuality(host) {
+    const n = host.hostname;
+    if (!n || isIpv4Literal(n) || n.toLowerCase() === "localhost")
+        return 0;
+    if (host.source === "config" || host.source === "env")
+        return 3;
+    if (host.source === "tailscale")
+        return 2;
+    return 1;
+}
+function dnsQuality(dns) {
+    if (!dns || dns.toLowerCase() === "localhost" || isIpv4Literal(dns))
+        return 0;
+    if (dns.includes("."))
+        return 2;
+    return 1;
+}
+function pickFoldSource(group, probeIsLoopback) {
+    const sources = new Set(group.map((h) => h.source));
+    if (sources.has("config"))
+        return "config";
+    if (sources.has("env"))
+        return "env";
+    if (sources.has("localhost") && probeIsLoopback)
+        return "localhost";
+    if (sources.has("tailscale"))
+        return "tailscale";
+    return group[0].source;
+}
+function mergeThisDevice(group) {
+    const ips = [...new Set(group.flatMap((h) => [h.ip, ...(h.also ?? [])]))];
+    const loopback = ips.find((ip) => ip === "127.0.0.1" || ip === "::1");
+    const ip = loopback ?? ips[0];
+    const named = [...group].sort((a, b) => nameQuality(b) - nameQuality(a))[0];
+    const dnsHost = [...group].sort((a, b) => dnsQuality(b.dnsName) - dnsQuality(a.dnsName))[0];
+    return makeHost({
+        hostname: named.hostname,
+        dnsName: dnsQuality(dnsHost.dnsName) > 0 ? dnsHost.dnsName : named.dnsName,
+        ip,
+        also: ips.filter((addr) => addr !== ip),
+        online: group.some((h) => h.online),
+        os: group.find((h) => h.os !== "unknown")?.os ?? named.os,
+        isSelf: true,
+        source: pickFoldSource(group, Boolean(loopback)),
+        port: group[0].port,
+    });
+}
+/**
+ * Collapse loopback, Tailscale Self, and this machine's NIC IPs into one host
+ * per port so scan does not list the same Ollama twice.
+ */
+export function foldLocalHosts(hosts) {
+    const localIps = localIdentityIps();
+    const groups = new Map();
+    const rest = [];
+    for (const host of hosts) {
+        if (!isThisDevice(host, localIps)) {
+            rest.push(host);
+            continue;
+        }
+        const list = groups.get(host.port) ?? [];
+        list.push(host);
+        groups.set(host.port, list);
+    }
+    const folded = [];
+    for (const group of groups.values()) {
+        folded.push(group.length === 1 ? { ...group[0], isSelf: true } : mergeThisDevice(group));
+    }
+    return [...folded, ...rest].sort((a, b) => {
+        if (a.isSelf !== b.isSelf)
+            return a.isSelf ? -1 : 1;
+        return shortName(a).localeCompare(shortName(b));
+    });
+}
 function localhostTargets() {
     const hostname = os.hostname() || "localhost";
     return [
@@ -378,7 +471,7 @@ export async function discoverHosts(opts = {}) {
             sources.push("lan");
         }
     }
-    const hosts = mergeHosts(collected);
+    const hosts = foldLocalHosts(mergeHosts(collected));
     const networkLabel = labels[0] ??
         (sources.includes("tailscale")
             ? "tailscale"
@@ -388,7 +481,10 @@ export async function discoverHosts(opts = {}) {
     return { hosts, sources, networkLabel };
 }
 function hostNameMatches(host, q) {
-    const names = [host.hostname, host.dnsName, shortName(host), host.ip].map((n) => n.toLowerCase());
+    const names = [host.hostname, host.dnsName, shortName(host), host.ip, ...(host.also ?? [])].map((n) => n.toLowerCase());
+    if (host.isSelf || host.ip === "127.0.0.1" || (host.also ?? []).includes("127.0.0.1")) {
+        names.push("localhost");
+    }
     return names.includes(q) || names.some((n) => n.startsWith(`${q}.`));
 }
 /**

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 /**
- * ollanet — Node library for discovering and talking to Ollama on any
- * reachable network (loopback, LAN, Tailscale, VPN).
+ * ollanet: Node library for discovering and talking to Ollama on hosts
+ * you configure or select (loopback, LAN, Tailscale, VPN).
  *
  * Node 20+ only. Not for the browser. LAN scan is opt-in.
  *
@@ -11,7 +11,7 @@ export { scanNetwork } from "./scan.js";
 export type { ScanOptions, ScanPayload, ScannedServer, ScanFailure } from "./scan.js";
 export { lastScan, lastScanPath, loadLastScan } from "./scan-store.js";
 export type { StoredScan } from "./scan-store.js";
-export { discoverHosts, resolveHost, ollamaBaseUrl, shortName, ollamaPort, } from "./hosts.js";
+export { discoverHosts, foldLocalHosts, resolveHost, ollamaBaseUrl, shortName, ollamaPort, } from "./hosts.js";
 export type { DiscoverOptions, DiscoveryResult, HostTarget, HostSource, HostConfigEntry, } from "./hosts.js";
 export { loadConfig, defaultModelForHost, mergeSettings, configFromPartial, lookupAlias, expandMachineModel, } from "./config.js";
 export type { AppConfig, DiscoveryConfig, GenerateSettings, ModelAlias } from "./config.js";

package/dist/index.js

@@ -1,6 +1,6 @@
 /**
- * ollanet — Node library for discovering and talking to Ollama on any
- * reachable network (loopback, LAN, Tailscale, VPN).
+ * ollanet: Node library for discovering and talking to Ollama on hosts
+ * you configure or select (loopback, LAN, Tailscale, VPN).
  *
  * Node 20+ only. Not for the browser. LAN scan is opt-in.
  *
@@ -9,7 +9,7 @@
  */
 export { scanNetwork } from "./scan.js";
 export { lastScan, lastScanPath, loadLastScan } from "./scan-store.js";
-export { discoverHosts, resolveHost, ollamaBaseUrl, shortName, ollamaPort, } from "./hosts.js";
+export { discoverHosts, foldLocalHosts, resolveHost, ollamaBaseUrl, shortName, ollamaPort, } from "./hosts.js";
 export { loadConfig, defaultModelForHost, mergeSettings, configFromPartial, lookupAlias, expandMachineModel, } from "./config.js";
 export { runPrompt } from "./prompt.js";
 export { runCompare, DEFAULT_COMPARE_PROMPT } from "./compare.js";

package/dist/mcp.js

@@ -29,9 +29,10 @@ const PROTOCOL_VERSION = "2024-11-05";
 const TOOLS = [
     {
         name: "ollanet_scan",
-        description: "Discover reachable Ollama hosts and list their models. " +
-            "Use this before routing work to pick a host/model. " +
-            "Optional LAN TCP scan (off unless lan=true; equivalent to CLI --lan) and include offline Tailscale peers.",
+        description: "Discover configured or selected Ollama hosts and list their models. " +
+            "A responding host is reachable, not automatically trusted. " +
+            "Optional LAN TCP scan is off unless lan=true (CLI --lan). " +
+            "all=true also probes offline Tailscale peers.",
         inputSchema: {
             type: "object",
             properties: {

package/dist/scan.d.ts

@@ -23,6 +23,8 @@ export interface ScannedServer {
     hostname: string;
     dnsName: string;
     ip: string;
+    /** Extra IPs for the same instance (loopback + Tailscale Self, etc.). */
+    also?: string[];
     port: number;
     os: string;
     source: string;

package/dist/scan.js

@@ -105,8 +105,9 @@ function printPayload(payload, cached) {
     for (const server of payload.servers) {
         const label = server.dnsName || server.hostname;
         const selfTag = server.self ? " [this device]" : "";
+        const also = server.also?.length ? `  also: ${server.also.join(", ")}` : "";
         console.log(`${label}${selfTag}`);
-        console.log(`  IP: ${server.ip}  source: ${server.source}  OS: ${server.os}`);
+        console.log(`  IP: ${server.ip}${also}  source: ${server.source}  OS: ${server.os}`);
         console.log(`  Endpoint: ${server.endpoint}`);
         if (server.models.length === 0) {
             console.log("  Models: (none)");
@@ -138,6 +139,7 @@ function toPayload(results, networkLabel, sources) {
             hostname: r.host.hostname,
             dnsName: r.host.dnsName,
             ip: r.host.ip,
+            ...(r.host.also?.length ? { also: r.host.also } : {}),
             port: r.host.port,
             os: r.host.os,
             source: r.host.source,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ollanet",
-  "version": "0.6.8",
-  "description": "Talk to Ollama on any reachable network. CLI for humans, MCP for agents, Node for apps",
+  "version": "0.6.10",
+  "description": "Find, manage, and use Ollama models on the hosts you choose. CLI for humans, MCP for agents, Node for apps",
   "type": "module",
   "bin": {
     "ollanet": "./dist/cli.js"