ollanet 0.5.0 → 0.6.0

package/dist/prompt.js

@@ -16,6 +16,7 @@ import { appendMessage, cleanTopic, createChat, loadChat, saveChat, toApiMessage
 import { configPath, defaultModelForHost, loadConfig, machineSettingsForHost, mergeSettings, parseFormat, settingsFromEnv, settingsSummary, configFromPartial, } from "./config.js";
 import { discoverHosts, envInt, findDiscoveredHost, ollamaBaseUrl, resolveHost, shortName, } from "./hosts.js";
 import { ollamaChat } from "./ollama-chat.js";
+import { assemblePrompt, readPromptFile } from "./prompt-input.js";
 /** Prompt/chat HTTP timeout (ms). 0 = no timeout. Separate from scan's OLLAMA_TIMEOUT_MS. */
 function promptTimeoutMs() {
     return envInt("OLLAMA_PROMPT_TIMEOUT_MS", 600_000);
@@ -30,6 +31,7 @@ Examples:
   ollanet prompt localhost "Explain MagicDNS"
   ollanet prompt --chat a1b2c3d4e5f6 "Give an example"
   ollanet prompt localhost --temperature 0.2 --num-predict 64 "2+2?"
+  ollanet prompt localhost --file ./notes.md
   ollanet chats
 
 Each reply is saved under responses/<hash>.json and the hash is printed so you
@@ -51,6 +53,7 @@ Options:
   --format <json|schema> Force JSON mode or a JSON schema string
   --think                Enable model thinking (qwen3 etc.); streams to stderr
   --no-think             Disable thinking (default) so tokens go to the reply
+  --file <path>          Prompt from a .txt or .md file (joins argv / stdin)
   --no-stream            Wait for the full response
   --json                 Emit final response JSON (implies --no-stream)`);
     process.exit(1);
@@ -137,6 +140,7 @@ function parseArgs(argv) {
     let machineFlag;
     let modelFlag;
     let chatId;
+    let file;
     let stream = true;
     let json = false;
     let save = true;
@@ -181,6 +185,10 @@ function parseArgs(argv) {
             modelFlag = arg.includes("=") ? arg.slice("--model=".length) : takeValue(args, "--model");
             continue;
         }
+        if (arg === "--file" || arg === "-f" || arg.startsWith("--file=")) {
+            file = arg.includes("=") ? arg.slice("--file=".length) : takeValue(args, "--file");
+            continue;
+        }
         if (arg === "--system" || arg.startsWith("--system=")) {
             settings.system = arg.includes("=")
                 ? arg.slice("--system=".length)
@@ -235,7 +243,7 @@ function parseArgs(argv) {
     }
     // Continue (--chat): all positionals are the prompt. Optional machine override
     // via --machine, or a leading discovered-host name peeled in main().
-    return { machine, model, promptParts, stream, json, save, chatId, settings };
+    return { machine, model, promptParts, file, stream, json, save, chatId, settings };
 }
 async function readStdinIfPiped() {
     if (stdinStream.isTTY)
@@ -261,7 +269,7 @@ async function readStdinIfPiped() {
         const onEnd = () => done(true);
         stdinStream.once("readable", onReadable);
         stdinStream.once("end", onEnd);
-        const timer = setTimeout(() => done(stdinStream.readableLength > 0), 25);
+        const timer = setTimeout(() => done(stdinStream.readableLength > 0), 100);
     });
     if (!hasData)
         return "";
@@ -436,6 +444,17 @@ export async function main() {
     const { stream, json, save } = parsed;
     let promptParts = parsed.promptParts;
     const fromStdin = await readStdinIfPiped();
+    let fromFile = "";
+    if (parsed.file) {
+        try {
+            fromFile = await readPromptFile(parsed.file);
+        }
+        catch (err) {
+            console.error(err instanceof Error ? err.message : err);
+            process.exitCode = 1;
+            return;
+        }
+    }
     const config = await loadConfig();
     const { hosts: targets } = await discoverHosts({
         hosts: config.hosts,
@@ -460,13 +479,17 @@ export async function main() {
             usage();
         }
         const host = resolveHost(targets, machineQuery);
-        const peeled = await maybePeelModel(host, promptParts, fromStdin);
+        const peeled = await maybePeelModel(host, promptParts, fromStdin || fromFile);
         peeledModel = peeled.model;
         promptParts = peeled.promptParts;
     }
-    const promptText = [promptParts.join(" ").trim(), fromStdin].filter(Boolean).join("\n\n").trim();
+    const promptText = assemblePrompt({
+        argv: promptParts.join(" "),
+        file: fromFile,
+        stdin: fromStdin,
+    });
     if (!promptText) {
-        console.error("No prompt provided (pass args and/or pipe stdin).");
+        console.error("No prompt provided (pass args, --file, and/or pipe stdin).");
         usage();
     }
     try {

package/dist/scan-store.d.ts

@@ -0,0 +1,15 @@
+import type { ScanPayload } from "./scan.js";
+export interface StoredScan extends ScanPayload {
+    scanned_at: string;
+    lan: boolean;
+    include_offline: boolean;
+}
+/** Path for the last-scan snapshot. Read at call time so import stays safe. */
+export declare function lastScanPath(): string;
+export declare function saveLastScan(payload: ScanPayload, meta: {
+    lan: boolean;
+    includeOffline: boolean;
+}): Promise<string>;
+export declare function loadLastScan(): Promise<StoredScan | null>;
+/** Last saved scan, or null if none. Does not probe the network. */
+export declare function lastScan(): Promise<StoredScan | null>;

package/dist/scan-store.js

@@ -0,0 +1,41 @@
+import { mkdir, readFile, writeFile } from "node:fs/promises";
+import path from "node:path";
+import { defaultLastScanPath } from "./paths.js";
+/** Path for the last-scan snapshot. Read at call time so import stays safe. */
+export function lastScanPath() {
+    return process.env.OLLANET_LAST_SCAN ?? defaultLastScanPath();
+}
+export async function saveLastScan(payload, meta) {
+    const stored = {
+        ...payload,
+        scanned_at: new Date().toISOString(),
+        lan: meta.lan,
+        include_offline: meta.includeOffline,
+    };
+    const file = lastScanPath();
+    await mkdir(path.dirname(file), { recursive: true });
+    await writeFile(file, `${JSON.stringify(stored, null, 2)}\n`, "utf8");
+    return file;
+}
+export async function loadLastScan() {
+    const file = lastScanPath();
+    let text;
+    try {
+        text = await readFile(file, "utf8");
+    }
+    catch (err) {
+        const code = err && typeof err === "object" && "code" in err ? err.code : "";
+        if (code === "ENOENT")
+            return null;
+        throw err;
+    }
+    const parsed = JSON.parse(text);
+    if (!parsed || !Array.isArray(parsed.servers)) {
+        throw new Error(`Invalid last-scan file: ${file}`);
+    }
+    return parsed;
+}
+/** Last saved scan, or null if none. Does not probe the network. */
+export async function lastScan() {
+    return loadLastScan();
+}

package/dist/scan.d.ts

@@ -1,7 +1,7 @@
 /**
  * Scan reachable networks for Ollama servers and list available models.
  *
- * Usage: ollanet scan [--lan] [--json] [--all]
+ * Usage: ollanet scan [--lan] [--json] [--all] [--last]
  */
 import { type AppConfig } from "./config.js";
 export interface ScanOptions {
@@ -13,6 +13,11 @@ export interface ScanOptions {
      * is not read. Omit to keep CLI/MCP file behavior.
      */
     config?: Partial<AppConfig>;
+    /**
+     * Persist this result as the last scan. Default true when `config` is omitted
+     * (CLI / MCP). Default false when `config` is passed (hermetic apps/tests).
+     */
+    save?: boolean;
 }
 export interface ScannedServer {
     hostname: string;
@@ -34,12 +39,18 @@ export interface ScannedServer {
         tuned: boolean;
     }>;
 }
+export interface ScanFailure {
+    name: string;
+    ip: string;
+    error: string;
+}
 export interface ScanPayload {
     network: string;
     sources: string[];
     port: number;
     scanned: number;
     servers: ScannedServer[];
+    failures?: ScanFailure[];
 }
 /** Programmatic scan used by CLI `--json`, MCP, and `import { scanNetwork } from "ollanet"`. */
 export declare function scanNetwork(options?: ScanOptions): Promise<ScanPayload>;

package/dist/scan.js

@@ -1,10 +1,11 @@
 /**
  * Scan reachable networks for Ollama servers and list available models.
  *
- * Usage: ollanet scan [--lan] [--json] [--all]
+ * Usage: ollanet scan [--lan] [--json] [--all] [--last]
  */
 import { configFromPartial, loadConfig } from "./config.js";
 import { discoverHosts, envInt, ollamaPort, shortName, } from "./hosts.js";
+import { lastScanPath, loadLastScan, saveLastScan } from "./scan-store.js";
 import { looksTuned } from "./tuned.js";
 function scanTimeoutMs() {
     return envInt("OLLAMA_TIMEOUT_MS", 2500);
@@ -76,48 +77,53 @@ async function scanHost(host) {
         return { host, ok: false, models: [], error, url };
     }
 }
-function printResults(results, networkLabel, sources) {
-    const found = results.filter((r) => r.ok);
-    const offline = results.filter((r) => r.error === "offline").length;
-    const probed = results.length - offline;
-    console.log(`Network: ${networkLabel}`);
-    console.log(`Discovery: ${sources.join(", ") || "none"}`);
-    console.log(`Probing Ollama on ${results.length} host(s) (${probed} online/reachable candidates)\n`);
-    if (found.length === 0) {
+function printPayload(payload, cached) {
+    if (cached?.scanned_at) {
+        const flags = [
+            cached.lan ? "lan" : null,
+            cached.include_offline ? "all" : null,
+        ].filter(Boolean);
+        console.log(`Cached scan from ${cached.scanned_at}${flags.length ? ` (${flags.join(", ")})` : ""}`);
+        console.log(`File: ${lastScanPath()}\n`);
+    }
+    console.log(`Network: ${payload.network}`);
+    console.log(`Discovery: ${payload.sources.join(", ") || "none"}`);
+    console.log(`Probing Ollama on ${payload.scanned} host(s)\n`);
+    if (payload.servers.length === 0) {
         console.log("No Ollama servers found.");
         console.log("Tip: add hosts to config.json, set OLLANET_HOSTS, pass --lan, or prompt an IP directly.");
-        const interesting = results.filter((r) => r.error && r.error !== "offline");
+        const interesting = (payload.failures ?? []).filter((f) => f.error !== "offline");
         if (interesting.length > 0) {
             console.log("\nNon-timeout failures (first few):");
-            for (const r of interesting.slice(0, 5)) {
-                console.log(`  - ${shortName(r.host)} (${r.host.ip}): ${r.error}`);
+            for (const f of interesting.slice(0, 5)) {
+                console.log(`  - ${f.name} (${f.ip}): ${f.error}`);
             }
         }
         return;
     }
-    for (const result of found) {
-        const label = result.host.dnsName || result.host.hostname;
-        const selfTag = result.host.isSelf ? " [this device]" : "";
+    for (const server of payload.servers) {
+        const label = server.dnsName || server.hostname;
+        const selfTag = server.self ? " [this device]" : "";
         console.log(`${label}${selfTag}`);
-        console.log(`  IP: ${result.host.ip}  source: ${result.host.source}  OS: ${result.host.os}`);
-        console.log(`  Endpoint: http://${result.host.ip}:${result.host.port}`);
-        if (result.models.length === 0) {
+        console.log(`  IP: ${server.ip}  source: ${server.source}  OS: ${server.os}`);
+        console.log(`  Endpoint: ${server.endpoint}`);
+        if (server.models.length === 0) {
             console.log("  Models: (none)");
         }
         else {
-            console.log(`  Models (${result.models.length}):`);
-            for (const model of result.models) {
+            console.log(`  Models (${server.models.length}):`);
+            for (const model of server.models) {
                 const size = formatBytes(model.size);
-                const params = model.details?.parameter_size;
-                const quant = model.details?.quantization_level;
+                const params = model.parameter_size;
+                const quant = model.quantization_level;
                 const meta = [params, quant, size].filter(Boolean).join(" · ");
-                const tag = looksTuned(model.name) ? " [tuned]" : "";
+                const tag = model.tuned ? " [tuned]" : "";
                 console.log(meta ? `    - ${model.name}  (${meta})${tag}` : `    - ${model.name}${tag}`);
             }
         }
         console.log("");
     }
-    console.log(`Found ${found.length} Ollama server(s) with ${found.reduce((n, r) => n + r.models.length, 0)} model entrie(s).`);
+    console.log(`Found ${payload.servers.length} Ollama server(s) with ${payload.servers.reduce((n, s) => n + s.models.length, 0)} model entrie(s).`);
 }
 function toPayload(results, networkLabel, sources) {
     return {
@@ -146,6 +152,13 @@ function toPayload(results, networkLabel, sources) {
                 tuned: looksTuned(m.name),
             })),
         })),
+        failures: results
+            .filter((r) => !r.ok)
+            .map((r) => ({
+            name: shortName(r.host),
+            ip: r.host.ip,
+            error: r.error ?? "unknown",
+        })),
     };
 }
 /** Programmatic scan used by CLI `--json`, MCP, and `import { scanNetwork } from "ollanet"`. */
@@ -161,31 +174,49 @@ export async function scanNetwork(options = {}) {
         throw new Error("No hosts to scan. Add config.hosts, set OLLANET_HOSTS, or enable Tailscale/LAN discovery.");
     }
     const results = await mapPool(hosts, scanConcurrency(), scanHost);
-    return toPayload(results, networkLabel, sources);
+    const payload = toPayload(results, networkLabel, sources);
+    const shouldSave = options.save ?? options.config == null;
+    if (shouldSave) {
+        await saveLastScan(payload, {
+            lan: options.lanScan ?? false,
+            includeOffline: options.includeOffline ?? false,
+        });
+    }
+    return payload;
 }
 export async function main() {
     const includeOffline = process.argv.includes("--all");
     const jsonOut = process.argv.includes("--json");
     const lanScan = process.argv.includes("--lan");
-    const config = await loadConfig();
-    const { hosts, sources, networkLabel } = await discoverHosts({
-        hosts: config.hosts,
-        discovery: config.discovery,
-        includeOffline,
-        lanScan,
-    });
-    if (hosts.length === 0) {
-        console.error("No hosts to scan. Add config.hosts, set OLLANET_HOSTS, or enable Tailscale/LAN discovery.");
-        process.exitCode = 1;
+    const cached = process.argv.includes("--last") || process.argv.includes("--cached");
+    if (cached) {
+        const stored = await loadLastScan();
+        if (!stored) {
+            console.error(`No saved scan at ${lastScanPath()}. Run ollanet scan first.`);
+            process.exitCode = 1;
+            return;
+        }
+        if (jsonOut) {
+            console.log(JSON.stringify(stored, null, 2));
+            return;
+        }
+        printPayload(stored, stored);
         return;
     }
-    const results = await mapPool(hosts, scanConcurrency(), scanHost);
-    if (jsonOut) {
-        console.log(JSON.stringify(toPayload(results, networkLabel, sources), null, 2));
-        return;
+    try {
+        const payload = await scanNetwork({ includeOffline, lanScan });
+        if (jsonOut) {
+            console.log(JSON.stringify(payload, null, 2));
+        }
+        else {
+            printPayload(payload);
+        }
+        if (payload.servers.length === 0) {
+            process.exitCode = 2;
+        }
     }
-    printResults(results, networkLabel, sources);
-    if (!results.some((r) => r.ok)) {
-        process.exitCode = 2;
+    catch (err) {
+        console.error(err instanceof Error ? err.message : err);
+        process.exitCode = 1;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ollanet",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Discover and talk to Ollama on any reachable network — CLI, MCP, and a Node library",
   "type": "module",
   "bin": {
@@ -29,6 +29,7 @@
     "ollanet": "tsx src/cli.ts",
     "scan": "tsx src/cli.ts scan",
     "prompt": "tsx src/cli.ts prompt",
+    "compare": "tsx src/cli.ts compare",
     "pull": "tsx src/cli.ts pull",
     "show": "tsx src/cli.ts show",
     "rm": "tsx src/cli.ts rm",