ollanet 0.6.0 → 0.6.1

package/README.md

@@ -176,7 +176,7 @@ await scanNetwork({
 
 `pullModel({ machine, model })` asks that host to download (or update) a library model. The bits never transit ollanet. `showModel`, `removeModel({ yes: true })`, and `listLoaded` are the inspect / delete / VRAM trio.
 
-Requires **ollanet ≥ 0.4.0** (library). **Model management (`pull` / `show` / `rm` / `ps`) needs ≥ 0.5.0.** **Compare, `lastScan`, and bench `--hot` need ≥ 0.6.0.** Bundlers (Vite / SvelteKit SSR):
+Requires **ollanet ≥ 0.4.0** (library). **Model management (`pull` / `show` / `rm` / `ps`) needs ≥ 0.5.0.** **Compare, `lastScan`, and bench `--hot` need ≥ 0.6.0.** **`resolveTarget` / `listTargets` need ≥ 0.6.1.** Bundlers (Vite / SvelteKit SSR):
 
 ```ts
 // vite.config.ts

package/dist/argv.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Shared CLI flag helpers. Commands keep their own usage() and unique flags.
+ */
+import type { GenerateSettings } from "./config.js";
+export type UsageFn = () => never;
+export declare function takeValue(args: string[], flag: string, usage: UsageFn): string;
+/** `--name value` or `--name=value`. Returns undefined if `arg` is not this flag. */
+export declare function takeFlag(arg: string, name: string, args: string[], usage: UsageFn): string | undefined;
+export declare function parseNumberFlag(raw: string, flag: string, usage: UsageFn): number;
+export declare function parseKeepAlive(raw: string): string | number;
+export interface SettingsFlagOpts {
+    temperature?: boolean;
+    numPredict?: boolean;
+    system?: boolean;
+}
+/** Shared generate-settings flags. Returns true when `arg` was consumed. */
+export declare function consumeSettingsFlag(arg: string, args: string[], settings: GenerateSettings, usage: UsageFn, opts?: SettingsFlagOpts): boolean;

package/dist/argv.js

@@ -0,0 +1,73 @@
+export function takeValue(args, flag, usage) {
+    const value = args.shift();
+    if (!value) {
+        console.error(`${flag} requires a value`);
+        usage();
+    }
+    return value;
+}
+/** `--name value` or `--name=value`. Returns undefined if `arg` is not this flag. */
+export function takeFlag(arg, name, args, usage) {
+    if (arg === name)
+        return takeValue(args, name, usage);
+    if (arg.startsWith(`${name}=`))
+        return arg.slice(name.length + 1);
+    return undefined;
+}
+export function parseNumberFlag(raw, flag, usage) {
+    const n = Number(raw);
+    if (!Number.isFinite(n)) {
+        console.error(`${flag} must be a number (got "${raw}")`);
+        usage();
+    }
+    return n;
+}
+export function parseKeepAlive(raw) {
+    const asNum = Number(raw);
+    return raw.trim() !== "" && Number.isFinite(asNum) && String(asNum) === raw ? asNum : raw;
+}
+/** Shared generate-settings flags. Returns true when `arg` was consumed. */
+export function consumeSettingsFlag(arg, args, settings, usage, opts = {}) {
+    if (arg === "--think") {
+        settings.think = true;
+        return true;
+    }
+    if (arg === "--no-think") {
+        settings.think = false;
+        return true;
+    }
+    if (opts.system) {
+        const system = takeFlag(arg, "--system", args, usage);
+        if (system !== undefined) {
+            settings.system = system;
+            return true;
+        }
+    }
+    if (opts.temperature) {
+        if (arg === "-t" || arg === "--temperature" || arg.startsWith("--temperature=")) {
+            const raw = arg === "-t" || arg === "--temperature"
+                ? takeValue(args, "--temperature", usage)
+                : arg.slice("--temperature=".length);
+            settings.temperature = parseNumberFlag(raw, "--temperature", usage);
+            return true;
+        }
+    }
+    if (opts.numPredict) {
+        const raw = takeFlag(arg, "--num-predict", args, usage);
+        if (raw !== undefined) {
+            settings.num_predict = Math.trunc(parseNumberFlag(raw, "--num-predict", usage));
+            return true;
+        }
+    }
+    const numCtx = takeFlag(arg, "--num-ctx", args, usage);
+    if (numCtx !== undefined) {
+        settings.num_ctx = Math.trunc(parseNumberFlag(numCtx, "--num-ctx", usage));
+        return true;
+    }
+    const keepAlive = takeFlag(arg, "--keep-alive", args, usage);
+    if (keepAlive !== undefined) {
+        settings.keep_alive = parseKeepAlive(keepAlive);
+        return true;
+    }
+    return false;
+}

package/dist/bench.js

@@ -5,7 +5,9 @@ import { defaultModelForHost, loadConfig, machineSettingsForHost, mergeSettings,
 import { comparabilityKey, getSuiteCases, median, suiteRevision, } from "./bench-suite.js";
 import { benchmarksDir, newBenchId, saveBenchmark } from "./bench-store.js";
 import { readFile } from "node:fs/promises";
-import { discoverHosts, envInt, ollamaBaseUrl, resolveHost, shortName, } from "./hosts.js";
+import { envInt, ollamaBaseUrl, shortName } from "./hosts.js";
+import { consumeSettingsFlag, parseNumberFlag, takeFlag } from "./argv.js";
+import { resolveTarget } from "./target.js";
 import { projectPath } from "./paths.js";
 import { contextLengthForModel, isCompletionCapable, isVisionCapable, ollamaChat, ollamaShow, ollamaTags, ollamaUnload, ollamaVersion, ollamaPs, psHasModel, shouldWarnNoThinking, vramForModel, waitUntilUnloaded, } from "./ollama-chat.js";
 const MODEL_COL = 34;
@@ -41,22 +43,6 @@ Options:
 See docs/bench-spec.md for measurement rules.`);
     process.exit(1);
 }
-function takeValue(args, flag) {
-    const value = args.shift();
-    if (!value) {
-        console.error(`${flag} requires a value`);
-        usage();
-    }
-    return value;
-}
-function parseNumberFlag(raw, flag) {
-    const n = Number(raw);
-    if (!Number.isFinite(n)) {
-        console.error(`${flag} must be a number (got "${raw}")`);
-        usage();
-    }
-    return n;
-}
 function isLoopback(host) {
     return (host.source === "localhost" ||
         host.ip === "127.0.0.1" ||
@@ -157,57 +143,35 @@ function parseArgs(argv) {
             failOnError = true;
             continue;
         }
-        if (arg === "--think") {
-            settings.think = true;
-            continue;
-        }
-        if (arg === "--no-think") {
-            settings.think = false;
-            continue;
-        }
         if (arg === "--judge") {
             judge = true;
             continue;
         }
-        if (arg === "--suite" || arg.startsWith("--suite=")) {
-            const raw = arg.includes("=") ? arg.slice("--suite=".length) : takeValue(args, "--suite");
-            if (raw !== "quick" && raw !== "full") {
-                console.error(`Unknown suite "${raw}" (use quick|full)`);
-                usage();
-            }
-            suite = raw;
-            continue;
-        }
-        if (arg === "--runs" || arg.startsWith("--runs=")) {
-            const raw = arg.includes("=") ? arg.slice("--runs=".length) : takeValue(args, "--runs");
-            runs = Math.max(1, Math.trunc(parseNumberFlag(raw, "--runs")));
+        if (consumeSettingsFlag(arg, args, settings, usage)) {
             continue;
         }
-        if (arg === "--num-predict" || arg.startsWith("--num-predict=")) {
-            const raw = arg.includes("=")
-                ? arg.slice("--num-predict=".length)
-                : takeValue(args, "--num-predict");
-            throughputNumPredict = Math.trunc(parseNumberFlag(raw, "--num-predict"));
+        const suiteRaw = takeFlag(arg, "--suite", args, usage);
+        if (suiteRaw !== undefined) {
+            if (suiteRaw !== "quick" && suiteRaw !== "full") {
+                console.error(`Unknown suite "${suiteRaw}" (use quick|full)`);
+                usage();
+            }
+            suite = suiteRaw;
             continue;
         }
-        if (arg === "--num-ctx" || arg.startsWith("--num-ctx=")) {
-            const raw = arg.includes("=") ? arg.slice("--num-ctx=".length) : takeValue(args, "--num-ctx");
-            settings.num_ctx = Math.trunc(parseNumberFlag(raw, "--num-ctx"));
+        const runsRaw = takeFlag(arg, "--runs", args, usage);
+        if (runsRaw !== undefined) {
+            runs = Math.max(1, Math.trunc(parseNumberFlag(runsRaw, "--runs", usage)));
             continue;
         }
-        if (arg === "--keep-alive" || arg.startsWith("--keep-alive=")) {
-            const raw = arg.includes("=")
-                ? arg.slice("--keep-alive=".length)
-                : takeValue(args, "--keep-alive");
-            const asNum = Number(raw);
-            settings.keep_alive =
-                raw.trim() !== "" && Number.isFinite(asNum) && String(asNum) === raw ? asNum : raw;
+        const predictRaw = takeFlag(arg, "--num-predict", args, usage);
+        if (predictRaw !== undefined) {
+            throughputNumPredict = Math.trunc(parseNumberFlag(predictRaw, "--num-predict", usage));
             continue;
         }
-        if (arg === "--judge-model" || arg.startsWith("--judge-model=")) {
-            judgeModel = arg.includes("=")
-                ? arg.slice("--judge-model=".length)
-                : takeValue(args, "--judge-model");
+        const judgeRaw = takeFlag(arg, "--judge-model", args, usage);
+        if (judgeRaw !== undefined) {
+            judgeModel = judgeRaw;
             continue;
         }
         if (arg.startsWith("-")) {
@@ -527,11 +491,7 @@ function pad(s, n) {
 export async function main() {
     const parsed = parseArgs(process.argv.slice(2));
     const config = await loadConfig();
-    const { hosts: targets } = await discoverHosts({
-        hosts: config.hosts,
-        discovery: config.discovery,
-    });
-    const host = resolveHost(targets, parsed.machine);
+    const host = await resolveTarget(parsed.machine, config);
     const baseUrl = ollamaBaseUrl(host);
     const machineLabel = shortName(host);
     const tags = await ollamaTags(baseUrl, Math.min(BENCH_TIMEOUT_MS, 15_000));

package/dist/chats.js

@@ -7,6 +7,7 @@
  *   ollanet chats --id a1b2c3d4e5f6
  */
 import { loadChat, listChats, responsesDir, } from "./chat-store.js";
+import { takeFlag } from "./argv.js";
 function usage() {
     console.error(`Usage: ollanet chats [--json] [--id <hash>]
 
@@ -31,12 +32,9 @@ function parseArgs(argv) {
             json = true;
             continue;
         }
-        if (arg === "--id" || arg.startsWith("--id=")) {
-            id = arg.includes("=") ? arg.slice("--id=".length) : args.shift();
-            if (!id) {
-                console.error("--id requires a value");
-                usage();
-            }
+        const idFlag = takeFlag(arg, "--id", args, usage);
+        if (idFlag !== undefined) {
+            id = idFlag;
             continue;
         }
         console.error(`Unknown flag: ${arg}`);

package/dist/compare.js

@@ -5,7 +5,9 @@
  *   ollanet compare studio m1 m2 --file task.md
  */
 import { configFromPartial, loadConfig, machineSettingsForHost, mergeSettings, settingsFromEnv, } from "./config.js";
-import { discoverHosts, envInt, ollamaBaseUrl, resolveHost, shortName } from "./hosts.js";
+import { envInt, ollamaBaseUrl, shortName } from "./hosts.js";
+import { consumeSettingsFlag, takeFlag, takeValue } from "./argv.js";
+import { resolveTarget } from "./target.js";
 import { ollamaChat, ollamaTags, ollamaUnload, waitUntilUnloaded, } from "./ollama-chat.js";
 import { assemblePrompt, readPromptFile } from "./prompt-input.js";
 import { comparesDir, newCompareId, saveCompare } from "./compare-store.js";
@@ -50,22 +52,6 @@ Options:
   --json                 Emit the full record on stdout`);
     process.exit(1);
 }
-function takeValue(args, flag) {
-    const value = args.shift();
-    if (!value) {
-        console.error(`${flag} requires a value`);
-        usage();
-    }
-    return value;
-}
-function parseNumberFlag(raw, flag) {
-    const n = Number(raw);
-    if (!Number.isFinite(n)) {
-        console.error(`${flag} must be a number (got "${raw}")`);
-        usage();
-    }
-    return n;
-}
 function parseArgs(argv) {
     const args = [...argv];
     let prompt;
@@ -93,48 +79,19 @@ function parseArgs(argv) {
             unload = true;
             continue;
         }
-        if (arg === "--think") {
-            settings.think = true;
-            continue;
-        }
-        if (arg === "--no-think") {
-            settings.think = false;
-            continue;
-        }
-        if (arg === "--prompt" || arg === "-p" || arg.startsWith("--prompt=")) {
-            prompt = arg.includes("=") ? arg.slice("--prompt=".length) : takeValue(args, "--prompt");
+        if (consumeSettingsFlag(arg, args, settings, usage, {
+            temperature: true,
+            numPredict: true,
+            system: true,
+        })) {
             continue;
         }
-        if (arg === "--file" || arg === "-f" || arg.startsWith("--file=")) {
-            file = arg.includes("=") ? arg.slice("--file=".length) : takeValue(args, "--file");
+        if (arg === "-p" || arg === "--prompt" || arg.startsWith("--prompt=")) {
+            prompt = arg === "-p" ? takeValue(args, "--prompt", usage) : takeFlag(arg, "--prompt", args, usage);
             continue;
         }
-        if (arg === "--system" || arg.startsWith("--system=")) {
-            settings.system = arg.includes("=")
-                ? arg.slice("--system=".length)
-                : takeValue(args, "--system");
-            continue;
-        }
-        if (arg === "--temperature" || arg === "-t" || arg.startsWith("--temperature=")) {
-            const raw = arg.includes("=") ? arg.slice("--temperature=".length) : takeValue(args, "--temperature");
-            settings.temperature = parseNumberFlag(raw, "--temperature");
-            continue;
-        }
-        if (arg === "--num-predict" || arg.startsWith("--num-predict=")) {
-            const raw = arg.includes("=") ? arg.slice("--num-predict=".length) : takeValue(args, "--num-predict");
-            settings.num_predict = Math.trunc(parseNumberFlag(raw, "--num-predict"));
-            continue;
-        }
-        if (arg === "--num-ctx" || arg.startsWith("--num-ctx=")) {
-            const raw = arg.includes("=") ? arg.slice("--num-ctx=".length) : takeValue(args, "--num-ctx");
-            settings.num_ctx = Math.trunc(parseNumberFlag(raw, "--num-ctx"));
-            continue;
-        }
-        if (arg === "--keep-alive" || arg.startsWith("--keep-alive=")) {
-            const raw = arg.includes("=") ? arg.slice("--keep-alive=".length) : takeValue(args, "--keep-alive");
-            const asNum = Number(raw);
-            settings.keep_alive =
-                raw.trim() !== "" && Number.isFinite(asNum) && String(asNum) === raw ? asNum : raw;
+        if (arg === "-f" || arg === "--file" || arg.startsWith("--file=")) {
+            file = arg === "-f" ? takeValue(args, "--file", usage) : takeFlag(arg, "--file", args, usage);
             continue;
         }
         if (arg.startsWith("-")) {
@@ -189,14 +146,7 @@ export async function runCompare(opts) {
     const defaulted = !assembled;
     const prompt = assembled || DEFAULT_COMPARE_PROMPT;
     const config = opts.config ? configFromPartial(opts.config) : await loadConfig();
-    const { hosts } = await discoverHosts({
-        hosts: config.hosts,
-        discovery: config.discovery,
-    });
-    const host = resolveHost(hosts, opts.machine);
-    if (!host.online && !host.isSelf && host.source === "tailscale") {
-        throw new Error(`Machine "${shortName(host)}" appears offline.`);
-    }
+    const host = await resolveTarget(opts.machine, config);
     const baseUrl = ollamaBaseUrl(host);
     const timeoutMs = opts.timeoutMs ?? compareTimeoutMs();
     let available = null;

package/dist/index.d.ts

@@ -29,5 +29,6 @@ export type { RemoveOptions, RemoveResult } from "./rm.js";
 export { listLoaded } from "./ps.js";
 export type { PsOptions, PsResult, LoadedHost, LoadedModel } from "./ps.js";
 export { looksTuned } from "./tuned.js";
+export { resolveTarget, listTargets } from "./target.js";
 export { ollamaChat, ollamaTags, ollamaShow, ollamaPs, ollamaPsRequired, ollamaPull, ollamaDelete, } from "./ollama-chat.js";
 export type { PullChunk, OllamaPullOptions, OllamaPullResult, OllamaShowInfo, } from "./ollama-chat.js";

package/dist/index.js

@@ -19,4 +19,5 @@ export { showModel } from "./show.js";
 export { removeModel } from "./rm.js";
 export { listLoaded } from "./ps.js";
 export { looksTuned } from "./tuned.js";
+export { resolveTarget, listTargets } from "./target.js";
 export { ollamaChat, ollamaTags, ollamaShow, ollamaPs, ollamaPsRequired, ollamaPull, ollamaDelete, } from "./ollama-chat.js";

package/dist/prompt.js

@@ -14,9 +14,11 @@
 import { stdin as stdinStream } from "node:process";
 import { appendMessage, cleanTopic, createChat, loadChat, saveChat, toApiMessages, topicFromPrompt, } from "./chat-store.js";
 import { configPath, defaultModelForHost, loadConfig, machineSettingsForHost, mergeSettings, parseFormat, settingsFromEnv, settingsSummary, configFromPartial, } from "./config.js";
-import { discoverHosts, envInt, findDiscoveredHost, ollamaBaseUrl, resolveHost, shortName, } from "./hosts.js";
+import { envInt, findDiscoveredHost, ollamaBaseUrl, resolveHost, shortName, } from "./hosts.js";
 import { ollamaChat } from "./ollama-chat.js";
 import { assemblePrompt, readPromptFile } from "./prompt-input.js";
+import { consumeSettingsFlag, takeFlag, takeValue } from "./argv.js";
+import { listTargets, resolveTarget } from "./target.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);
@@ -119,22 +121,6 @@ async function maybePeelModel(host, promptParts, fromStdin) {
     }
     return { promptParts };
 }
-function takeValue(args, flag) {
-    const value = args.shift();
-    if (!value) {
-        console.error(`${flag} requires a value`);
-        usage();
-    }
-    return value;
-}
-function parseNumberFlag(raw, flag) {
-    const n = Number(raw);
-    if (!Number.isFinite(n)) {
-        console.error(`${flag} must be a number (got "${raw}")`);
-        usage();
-    }
-    return n;
-}
 function parseArgs(argv) {
     const args = [...argv];
     let machineFlag;
@@ -165,59 +151,34 @@ function parseArgs(argv) {
             save = false;
             continue;
         }
-        if (arg === "--think") {
-            settings.think = true;
+        if (consumeSettingsFlag(arg, args, settings, usage, {
+            temperature: true,
+            numPredict: true,
+            system: true,
+        })) {
             continue;
         }
-        if (arg === "--no-think") {
-            settings.think = false;
+        const chat = takeFlag(arg, "--chat", args, usage);
+        if (chat !== undefined) {
+            chatId = chat;
             continue;
         }
-        if (arg === "--chat" || arg.startsWith("--chat=")) {
-            chatId = arg.includes("=") ? arg.slice("--chat=".length) : takeValue(args, "--chat");
+        const machine = takeFlag(arg, "--machine", args, usage);
+        if (machine !== undefined) {
+            machineFlag = machine;
             continue;
         }
-        if (arg === "--machine" || arg.startsWith("--machine=")) {
-            machineFlag = arg.includes("=") ? arg.slice("--machine=".length) : takeValue(args, "--machine");
+        const model = takeFlag(arg, "--model", args, usage);
+        if (model !== undefined) {
+            modelFlag = model;
             continue;
         }
-        if (arg === "--model" || arg.startsWith("--model=")) {
-            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)
-                : takeValue(args, "--system");
-            continue;
-        }
-        if (arg === "--temperature" || arg === "-t" || arg.startsWith("--temperature=")) {
-            const raw = arg.includes("=") ? arg.slice("--temperature=".length) : takeValue(args, "--temperature");
-            settings.temperature = parseNumberFlag(raw, "--temperature");
-            continue;
-        }
-        if (arg === "--num-predict" || arg.startsWith("--num-predict=")) {
-            const raw = arg.includes("=") ? arg.slice("--num-predict=".length) : takeValue(args, "--num-predict");
-            settings.num_predict = Math.trunc(parseNumberFlag(raw, "--num-predict"));
-            continue;
-        }
-        if (arg === "--num-ctx" || arg.startsWith("--num-ctx=")) {
-            const raw = arg.includes("=") ? arg.slice("--num-ctx=".length) : takeValue(args, "--num-ctx");
-            settings.num_ctx = Math.trunc(parseNumberFlag(raw, "--num-ctx"));
-            continue;
-        }
-        if (arg === "--keep-alive" || arg.startsWith("--keep-alive=")) {
-            const raw = arg.includes("=") ? arg.slice("--keep-alive=".length) : takeValue(args, "--keep-alive");
-            const asNum = Number(raw);
-            settings.keep_alive = raw.trim() !== "" && Number.isFinite(asNum) && String(asNum) === raw ? asNum : raw;
+        if (arg === "-f" || arg === "--file" || arg.startsWith("--file=")) {
+            file = arg === "-f" ? takeValue(args, "--file", usage) : takeFlag(arg, "--file", args, usage);
             continue;
         }
         if (arg === "--format" || arg.startsWith("--format=")) {
-            const raw = arg.includes("=") ? arg.slice("--format=".length) : takeValue(args, "--format");
+            const raw = takeFlag(arg, "--format", args, usage) ?? "";
             const format = parseFormat(raw);
             if (format !== undefined)
                 settings.format = format;
@@ -325,10 +286,6 @@ export async function runPrompt(opts) {
     const writeStdout = opts.writeStdout !== false;
     let promptParts = opts.prompt ? [opts.prompt] : [];
     const config = opts.config ? configFromPartial(opts.config) : await loadConfig();
-    const { hosts: targets } = await discoverHosts({
-        hosts: config.hosts,
-        discovery: config.discovery,
-    });
     let chat;
     let isNewChat = false;
     let machineQuery = opts.machine;
@@ -339,10 +296,7 @@ export async function runPrompt(opts) {
     if (!machineQuery) {
         throw new Error("Machine is required for a new chat (or pass chatId).");
     }
-    const host = resolveHost(targets, machineQuery);
-    if (!host.online && !host.isSelf && host.source === "tailscale") {
-        throw new Error(`Machine "${shortName(host)}" appears offline.`);
-    }
+    const host = await resolveTarget(machineQuery, config);
     let peeledModel;
     if (!opts.chatId && !opts.model) {
         const peeled = await maybePeelModel(host, promptParts, "");
@@ -456,10 +410,7 @@ export async function main() {
         }
     }
     const config = await loadConfig();
-    const { hosts: targets } = await discoverHosts({
-        hosts: config.hosts,
-        discovery: config.discovery,
-    });
+    const targets = await listTargets(config);
     let machineQuery = parsed.machine;
     if (parsed.chatId) {
         // Allow `ollanet prompt <host> --chat HASH "follow-up"` only when the

package/dist/ps.js

@@ -7,6 +7,7 @@
 import { configFromPartial, loadConfig } from "./config.js";
 import { discoverHosts, envInt, ollamaBaseUrl, shortName, } from "./hosts.js";
 import { ollamaPs, ollamaPsRequired } from "./ollama-chat.js";
+import { takeFlag } from "./argv.js";
 import { resolveTarget } from "./target.js";
 import { looksTuned } from "./tuned.js";
 function psTimeoutMs() {
@@ -29,14 +30,6 @@ Options:
   --json             Emit result JSON on stdout`);
     process.exit(1);
 }
-function takeValue(args, flag) {
-    const value = args.shift();
-    if (!value) {
-        console.error(`${flag} requires a value`);
-        usage();
-    }
-    return value;
-}
 function parseArgs(argv) {
     const args = [...argv];
     let machineFlag;
@@ -52,8 +45,9 @@ function parseArgs(argv) {
             json = true;
             continue;
         }
-        if (arg === "--machine") {
-            machineFlag = takeValue(args, "--machine");
+        const machine = takeFlag(arg, "--machine", args, usage);
+        if (machine !== undefined) {
+            machineFlag = machine;
             continue;
         }
         if (arg.startsWith("-")) {

package/dist/pull.js

@@ -8,6 +8,7 @@
  */
 import { envInt, ollamaBaseUrl, shortName } from "./hosts.js";
 import { ollamaPull } from "./ollama-chat.js";
+import { takeFlag } from "./argv.js";
 import { resolveTarget } from "./target.js";
 /** Pull HTTP timeout (ms). 0 = none. Large models can take hours. */
 function pullTimeoutMs() {
@@ -35,14 +36,6 @@ Options:
   --json             Emit result JSON on stdout`);
     process.exit(1);
 }
-function takeValue(args, flag) {
-    const value = args.shift();
-    if (!value) {
-        console.error(`${flag} requires a value`);
-        usage();
-    }
-    return value;
-}
 function parseArgs(argv) {
     const args = [...argv];
     let machineFlag;
@@ -69,12 +62,14 @@ function parseArgs(argv) {
             json = true;
             continue;
         }
-        if (arg === "--machine") {
-            machineFlag = takeValue(args, "--machine");
+        const machine = takeFlag(arg, "--machine", args, usage);
+        if (machine !== undefined) {
+            machineFlag = machine;
             continue;
         }
-        if (arg === "--model") {
-            modelFlag = takeValue(args, "--model");
+        const model = takeFlag(arg, "--model", args, usage);
+        if (model !== undefined) {
+            modelFlag = model;
             continue;
         }
         if (arg.startsWith("-")) {

package/dist/rm.js

@@ -6,6 +6,7 @@
 import { createInterface } from "node:readline";
 import { envInt, ollamaBaseUrl, shortName } from "./hosts.js";
 import { ollamaDelete } from "./ollama-chat.js";
+import { takeFlag } from "./argv.js";
 import { resolveTarget } from "./target.js";
 function rmTimeoutMs() {
     return envInt("OLLAMA_RM_TIMEOUT_MS", 30_000);
@@ -29,14 +30,6 @@ Options:
   --json             Emit result JSON on stdout`);
     process.exit(1);
 }
-function takeValue(args, flag) {
-    const value = args.shift();
-    if (!value) {
-        console.error(`${flag} requires a value`);
-        usage();
-    }
-    return value;
-}
 function parseArgs(argv) {
     const args = [...argv];
     let machineFlag;
@@ -58,12 +51,14 @@ function parseArgs(argv) {
             json = true;
             continue;
         }
-        if (arg === "--machine") {
-            machineFlag = takeValue(args, "--machine");
+        const machine = takeFlag(arg, "--machine", args, usage);
+        if (machine !== undefined) {
+            machineFlag = machine;
             continue;
         }
-        if (arg === "--model") {
-            modelFlag = takeValue(args, "--model");
+        const model = takeFlag(arg, "--model", args, usage);
+        if (model !== undefined) {
+            modelFlag = model;
             continue;
         }
         if (arg.startsWith("-")) {

package/dist/show.js

@@ -5,6 +5,7 @@
  */
 import { envInt, ollamaBaseUrl, shortName } from "./hosts.js";
 import { ollamaShow } from "./ollama-chat.js";
+import { takeFlag } from "./argv.js";
 import { resolveTarget } from "./target.js";
 import { looksTuned } from "./tuned.js";
 function showTimeoutMs() {
@@ -28,14 +29,6 @@ Options:
   --json             Emit result JSON on stdout`);
     process.exit(1);
 }
-function takeValue(args, flag) {
-    const value = args.shift();
-    if (!value) {
-        console.error(`${flag} requires a value`);
-        usage();
-    }
-    return value;
-}
 function parseArgs(argv) {
     const args = [...argv];
     let machineFlag;
@@ -52,12 +45,14 @@ function parseArgs(argv) {
             json = true;
             continue;
         }
-        if (arg === "--machine") {
-            machineFlag = takeValue(args, "--machine");
+        const machine = takeFlag(arg, "--machine", args, usage);
+        if (machine !== undefined) {
+            machineFlag = machine;
             continue;
         }
-        if (arg === "--model") {
-            modelFlag = takeValue(args, "--model");
+        const model = takeFlag(arg, "--model", args, usage);
+        if (model !== undefined) {
+            modelFlag = model;
             continue;
         }
         if (arg.startsWith("-")) {

package/dist/target.d.ts

@@ -1,4 +1,6 @@
 import { type AppConfig } from "./config.js";
 import { type HostTarget } from "./hosts.js";
+/** Discover hosts the same way every command does (config + Tailscale + …). */
+export declare function listTargets(config?: Partial<AppConfig>): Promise<HostTarget[]>;
 /** Resolve a machine name the same way pull / prompt / bench do. */
 export declare function resolveTarget(machine: string, config?: Partial<AppConfig>): Promise<HostTarget>;

package/dist/target.js

@@ -1,15 +1,20 @@
 import { configFromPartial, loadConfig } from "./config.js";
 import { discoverHosts, resolveHost, shortName } from "./hosts.js";
-/** Resolve a machine name the same way pull / prompt / bench do. */
-export async function resolveTarget(machine, config) {
-    const query = machine.trim();
-    if (!query)
-        throw new Error("Machine is required.");
+/** Discover hosts the same way every command does (config + Tailscale + …). */
+export async function listTargets(config) {
     const app = config ? configFromPartial(config) : await loadConfig();
     const { hosts } = await discoverHosts({
         hosts: app.hosts,
         discovery: app.discovery,
     });
+    return hosts;
+}
+/** Resolve a machine name the same way pull / prompt / bench do. */
+export async function resolveTarget(machine, config) {
+    const query = machine.trim();
+    if (!query)
+        throw new Error("Machine is required.");
+    const hosts = await listTargets(config);
     const host = resolveHost(hosts, query);
     if (!host.online && !host.isSelf && host.source === "tailscale") {
         throw new Error(`Machine "${shortName(host)}" appears offline.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ollanet",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Discover and talk to Ollama on any reachable network — CLI, MCP, and a Node library",
   "type": "module",
   "bin": {