ollanet 0.6.7 → 0.6.9

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

@@ -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

@@ -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/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,6 +1,6 @@
 {
   "name": "ollanet",
-  "version": "0.6.7",
+  "version": "0.6.9",
   "description": "Talk to Ollama on any reachable network. CLI for humans, MCP for agents, Node for apps",
   "type": "module",
   "bin": {