ollanet 0.6.2 → 0.6.4

package/dist/prompt.js

@@ -13,7 +13,7 @@
  */
 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 { configPath, defaultModelForHost, loadConfig, lookupAlias, machineSettingsForHost, mergeSettings, parseFormat, settingsFromEnv, settingsSummary, configFromPartial, } from "./config.js";
 import { envInt, findDiscoveredHost, ollamaBaseUrl, resolveHost, shortName, } from "./hosts.js";
 import { ollamaChat } from "./ollama-chat.js";
 import { assemblePrompt, readPromptFile } from "./prompt-input.js";
@@ -31,14 +31,20 @@ export function helpText() {
 
 Examples:
   ollanet prompt localhost "Explain MagicDNS"
+  ollanet prompt desk "hello"              # alias → machine + model
   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
+  ollanet alias add desk studio gemma3:12b
 
 Each reply is saved under responses/<hash>.json and the hash is printed so you
 can continue later with --chat. Use --no-save to skip persistence.
 
+The first token may be an alias from config (\`ollanet alias\`) instead of a
+machine name — that fills both host and model unless you pass --model / a
+positional model.
+
 Config: ${configPath()}
 Precedence: CLI > env > machineDefaults > defaults
 
@@ -298,6 +304,9 @@ export async function runPrompt(opts) {
     if (!machineQuery) {
         throw new Error("Machine is required for a new chat (or pass chatId).");
     }
+    const alias = lookupAlias(config, machineQuery);
+    if (alias)
+        machineQuery = alias.machine;
     const host = await resolveTarget(machineQuery, config);
     let peeledModel;
     if (!opts.chatId && !opts.model) {
@@ -309,7 +318,11 @@ export async function runPrompt(opts) {
     if (!promptText) {
         throw new Error("No prompt provided.");
     }
-    const model = opts.model ?? peeledModel ?? chat?.model ?? defaultModelForHost(config, host);
+    const model = opts.model ??
+        peeledModel ??
+        alias?.model ??
+        chat?.model ??
+        defaultModelForHost(config, host);
     if (!model) {
         throw new Error(`No model specified for "${shortName(host)}" and no default in ${configPath()}.\n` +
             `Pass a model or add it under defaultModels.`);
@@ -414,6 +427,9 @@ export async function main() {
     const config = await loadConfig();
     const targets = await listTargets(config);
     let machineQuery = parsed.machine;
+    const alias = machineQuery ? lookupAlias(config, machineQuery) : undefined;
+    if (alias)
+        machineQuery = alias.machine;
     if (parsed.chatId) {
         // Allow `ollanet prompt <host> --chat HASH "follow-up"` only when the
         // leading token matches an already-discovered host (not direct-address fallback).
@@ -447,7 +463,9 @@ export async function main() {
     }
     try {
         const result = await runPrompt({
-            machine: machineQuery,
+            // Pass the original alias name when present so runPrompt can apply alias.model
+            // after peel; otherwise pass the resolved machine.
+            machine: alias ? parsed.machine : machineQuery,
             model: parsed.model ?? peeledModel,
             prompt: promptText,
             chatId: parsed.chatId,
@@ -456,6 +474,7 @@ export async function main() {
             writeStdout: !json,
             stream: json ? false : stream,
             quiet: json,
+            config,
         });
         if (json) {
             console.log(JSON.stringify({

package/dist/ps.d.ts

@@ -8,7 +8,12 @@ import { type AppConfig } from "./config.js";
 export declare function helpText(): string;
 export interface LoadedModel {
     name: string;
+    size?: number;
     size_vram?: number;
+    cpu_percent?: number;
+    gpu_percent?: number;
+    /** Same wording as `ollama ps` PROCESSOR (e.g. "100% GPU", "83%/17% CPU/GPU"). */
+    processor?: string;
     context_length?: number;
     digest?: string;
     tuned: boolean;
@@ -28,5 +33,11 @@ export interface PsOptions {
 export interface PsResult {
     hosts: LoadedHost[];
 }
+/** Match `ollama ps` PROCESSOR: CPU% from (size - size_vram) / size. */
+export declare function processorSplit(size?: number, sizeVram?: number): {
+    cpu_percent?: number;
+    gpu_percent?: number;
+    processor?: string;
+};
 export declare function listLoaded(opts?: PsOptions): Promise<PsResult>;
 export declare function main(): Promise<void>;

package/dist/ps.js

@@ -4,7 +4,7 @@
  *   ollanet ps
  *   ollanet ps studio
  */
-import { configFromPartial, loadConfig } from "./config.js";
+import { configFromPartial, expandMachineModel, loadConfig } from "./config.js";
 import { discoverHosts, envInt, ollamaBaseUrl, shortName, } from "./hosts.js";
 import { ollamaPs, ollamaPsRequired } from "./ollama-chat.js";
 import { failUsage, isHelpFlag, printHelp, takeFlag } from "./argv.js";
@@ -21,9 +21,11 @@ export function helpText() {
 Examples:
   ollanet ps
   ollanet ps studio
+  ollanet ps desk
   ollanet ps studio --json
 
-scan lists models on disk. ps lists what is loaded in VRAM right now.
+scan lists models on disk. ps lists what is loaded and the CPU/GPU split
+(same rule as ollama ps: size_vram / size). An alias name resolves to its machine.
 
 Options:
   --machine <name>   One host (default: every discovered host)
@@ -76,11 +78,31 @@ function formatBytes(bytes) {
     }
     return `${value.toFixed(unit === 0 ? 0 : 1)} ${units[unit]}`;
 }
+/** Match `ollama ps` PROCESSOR: CPU% from (size - size_vram) / size. */
+export function processorSplit(size, sizeVram) {
+    const total = size ?? 0;
+    const vram = sizeVram ?? 0;
+    if (vram === 0 && total === 0)
+        return {};
+    if (vram === 0)
+        return { cpu_percent: 100, gpu_percent: 0, processor: "100% CPU" };
+    if (total > 0 && vram === total) {
+        return { cpu_percent: 0, gpu_percent: 100, processor: "100% GPU" };
+    }
+    if (vram > total || total === 0)
+        return { processor: "Unknown" };
+    const cpu = Math.round(((total - vram) / total) * 100);
+    const gpu = 100 - cpu;
+    return { cpu_percent: cpu, gpu_percent: gpu, processor: `${cpu}%/${gpu}% CPU/GPU` };
+}
 function toLoaded(m) {
     const name = (m.name ?? m.model ?? "").trim();
+    const split = processorSplit(m.size, m.size_vram);
     return {
         name,
+        size: m.size,
         size_vram: m.size_vram,
+        ...split,
         context_length: m.context_length,
         digest: m.digest,
         tuned: looksTuned(name),
@@ -143,7 +165,7 @@ function printPs(result) {
                 const vram = formatBytes(m.size_vram);
                 const ctx = m.context_length != null ? `ctx ${m.context_length}` : "";
                 const tag = m.tuned ? " [tuned]" : "";
-                const meta = [vram ? `VRAM ${vram}` : "", ctx].filter(Boolean).join("  ");
+                const meta = [vram ? `VRAM ${vram}` : "", m.processor, ctx].filter(Boolean).join("  ");
                 process.stdout.write(meta ? `  ${m.name}  ${meta}${tag}\n` : `  ${m.name}${tag}\n`);
             }
         }
@@ -152,7 +174,11 @@ function printPs(result) {
 }
 export async function main() {
     const parsed = parseArgs(process.argv.slice(2));
-    const result = await listLoaded({ machine: parsed.machine });
+    const config = await loadConfig();
+    const machine = parsed.machine
+        ? expandMachineModel(config, parsed.machine, undefined).machine
+        : undefined;
+    const result = await listLoaded({ machine, config });
     if (parsed.json) {
         process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
         return;

package/dist/pull.js

@@ -6,6 +6,7 @@
  * `studio` is the machine (discovered name, MagicDNS, hostname, or IP).
  * The *server* downloads from the registry; ollanet only sends POST /api/pull.
  */
+import { expandMachineModel, loadConfig } from "./config.js";
 import { envInt, ollamaBaseUrl, shortName } from "./hosts.js";
 import { ollamaPull } from "./ollama-chat.js";
 import { failUsage, isHelpFlag, printHelp, takeFlag } from "./argv.js";
@@ -17,16 +18,18 @@ function pullTimeoutMs() {
 export function helpText() {
     return `Usage:
   ollanet pull <machine> <model>
+  ollanet pull <alias>
   ollanet pull --machine <name> --model <name>
 
 Examples:
   ollanet pull studio gemma3:12b
+  ollanet pull desk
   ollanet pull localhost llama3.2:1b
   ollanet pull 192.168.1.50 gemma3:12b --json
 
 The named machine downloads the model onto its own disk. ollanet does not
 upload weights. Re-pulling the same name updates it when the registry has a
-newer digest.
+newer digest. A single alias name expands to that alias's machine + model.
 
 Options:
   --machine <name>   Host (discovered name, MagicDNS, hostname, or IP[:port])
@@ -171,20 +174,23 @@ export async function pullModel(opts) {
 }
 export async function main() {
     const parsed = parseArgs(process.argv.slice(2));
-    if (!parsed.machine || !parsed.model) {
-        if (!parsed.machine)
+    const config = await loadConfig();
+    const expanded = expandMachineModel(config, parsed.machine, parsed.model);
+    if (!expanded.machine || !expanded.model) {
+        if (!expanded.machine)
             console.error("Machine is required.");
         else
             console.error("Model is required.");
         usage();
     }
     const result = await pullModel({
-        machine: parsed.machine,
-        model: parsed.model,
+        machine: expanded.machine,
+        model: expanded.model,
         insecure: parsed.insecure,
         stream: parsed.stream,
         writeStdout: true,
         quiet: false,
+        config,
     });
     if (parsed.json) {
         process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);

package/dist/rm.d.ts

@@ -3,7 +3,7 @@
  *
  *   ollanet rm studio llama3.2:1b --yes
  */
-import type { AppConfig } from "./config.js";
+import { type AppConfig } from "./config.js";
 export declare function helpText(): string;
 export interface RemoveOptions {
     machine: string;

package/dist/rm.js

@@ -8,20 +8,24 @@ import { envInt, ollamaBaseUrl, shortName } from "./hosts.js";
 import { ollamaDelete } from "./ollama-chat.js";
 import { failUsage, isHelpFlag, printHelp, takeFlag } from "./argv.js";
 import { resolveTarget } from "./target.js";
+import { expandMachineModel, loadConfig } from "./config.js";
 function rmTimeoutMs() {
     return envInt("OLLAMA_RM_TIMEOUT_MS", 30_000);
 }
 export function helpText() {
     return `Usage:
   ollanet rm <machine> <model> --yes
+  ollanet rm <alias> --yes
   ollanet rm --machine <name> --model <name> --yes
 
 Examples:
   ollanet rm studio llama3.2:1b --yes
+  ollanet rm desk --yes
   ollanet rm localhost old-model:7b --yes --json
 
 Deletes the named model from that host's disk (POST /api/delete).
 Non-interactive use (pipes, MCP, CI) requires --yes / confirm: true.
+A single alias name expands to that alias's machine + model.
 
 Options:
   --machine <name>   Host (discovered name, MagicDNS, hostname, or IP[:port])
@@ -111,17 +115,20 @@ export async function removeModel(opts) {
 }
 export async function main() {
     const parsed = parseArgs(process.argv.slice(2));
-    if (!parsed.machine || !parsed.model) {
-        if (!parsed.machine)
+    const config = await loadConfig();
+    const expanded = expandMachineModel(config, parsed.machine, parsed.model);
+    if (!expanded.machine || !expanded.model) {
+        if (!expanded.machine)
             console.error("Machine is required.");
         else
             console.error("Model is required.");
         usage();
     }
     const result = await removeModel({
-        machine: parsed.machine,
-        model: parsed.model,
+        machine: expanded.machine,
+        model: expanded.model,
         yes: parsed.yes,
+        config,
     });
     if (parsed.json) {
         process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);

package/dist/show.d.ts

@@ -4,7 +4,7 @@
  *   ollanet show studio gemma4-ctx32k
  */
 import { type OllamaShowInfo } from "./ollama-chat.js";
-import type { AppConfig } from "./config.js";
+import { type AppConfig } from "./config.js";
 export declare function helpText(): string;
 export interface ShowOptions {
     machine: string;

package/dist/show.js

@@ -8,20 +8,24 @@ import { ollamaShow } from "./ollama-chat.js";
 import { failUsage, isHelpFlag, printHelp, takeFlag } from "./argv.js";
 import { resolveTarget } from "./target.js";
 import { looksTuned } from "./tuned.js";
+import { expandMachineModel, loadConfig } from "./config.js";
 function showTimeoutMs() {
     return envInt("OLLAMA_SHOW_TIMEOUT_MS", 30_000);
 }
 export function helpText() {
     return `Usage:
   ollanet show <machine> <model>
+  ollanet show <alias>
   ollanet show --machine <name> --model <name>
 
 Examples:
   ollanet show studio gemma4-ctx32k
+  ollanet show desk
   ollanet show localhost llama3.2:1b --json
 
 Reads /api/show on that host — Modelfile, parameters, capabilities.
 Tuned Finetuna-style names are marked [tuned].
+A single alias name expands to that alias's machine + model.
 
 Options:
   --machine <name>   Host (discovered name, MagicDNS, hostname, or IP[:port])
@@ -112,14 +116,20 @@ function printShow(result) {
 }
 export async function main() {
     const parsed = parseArgs(process.argv.slice(2));
-    if (!parsed.machine || !parsed.model) {
-        if (!parsed.machine)
+    const config = await loadConfig();
+    const expanded = expandMachineModel(config, parsed.machine, parsed.model);
+    if (!expanded.machine || !expanded.model) {
+        if (!expanded.machine)
             console.error("Machine is required.");
         else
             console.error("Model is required.");
         usage();
     }
-    const result = await showModel({ machine: parsed.machine, model: parsed.model });
+    const result = await showModel({
+        machine: expanded.machine,
+        model: expanded.model,
+        config,
+    });
     if (parsed.json) {
         process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ollanet",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "Discover and talk to Ollama on any reachable network — CLI, MCP, and a Node library",
   "type": "module",
   "bin": {
@@ -36,6 +36,7 @@
     "ps": "tsx src/cli.ts ps",
     "chats": "tsx src/cli.ts chats",
     "bench": "tsx src/cli.ts bench",
+    "alias": "tsx src/cli.ts alias",
     "mcp": "tsx src/cli.ts mcp",
     "start": "tsx src/cli.ts scan",
     "typecheck": "tsc --noEmit",