@audiofool/moondog 0.3.0-beta.10 → 0.3.0-beta.12

package/src/surfaces/cli/command-completions.mjs

@@ -38,6 +38,33 @@ const webChoices = choices([
   ["status", N_("Check whether web lookups work")],
   ["help", N_("Web lookup commands")],
 ]);
+// The picker's own words. The scale matches EFFORT_SCALE; the test holds them together.
+const effortChoices = choices([
+  ["default", N_("Moondog's default: thinking off where the model allows it")],
+  ["off", N_("No extra thinking")],
+  ["low", N_("Quick answers")],
+  ["medium", N_("Between speed and depth")],
+  ["high", N_("Thinks more before answering")],
+  ["xhigh", N_("Thinks longer; slower and costs more")],
+  ["max", N_("Thinks the most; slowest and costs the most")],
+]);
+const libraryChoices = choices([
+  ["play", N_("Play a playlist by name")],
+  ["save", N_("Keep the song playing now")],
+  ["import", N_("Copy a playlist from a link")],
+]);
+const modelRoleChoices = choices([
+  ["roles", N_("See what side tasks use")],
+  ["vision", N_("Choose the model that reads images")],
+  ["web", N_("Choose the web search service")],
+]);
+const visionAutoChoices = choices([["auto", N_("Let the chat model read images when it can")]]);
+const webServiceChoices = choices([
+  ["auto", N_("Take the first service that is set up")],
+  ["deepseek", N_("Search with DeepSeek")],
+  ["brave", N_("Search with Brave Search")],
+  ["codex", N_("Search with the Codex CLI")],
+]);
 const spotifyChoices = choices([
   ["status", N_("Check your Spotify connection")],
   ["now", N_("What's playing now")],
@@ -102,6 +129,8 @@ export function withCommandCompletions(commands, {
     art: { argumentHint: "[braille|ascii|off|auto]", choices: firstArgument(artChoices) },
     motion: { argumentHint: "[on|off]", choices: firstArgument(motionChoices) },
     service: { argumentHint: "[spotify|apple_music|netease]", choices: firstArgument(serviceChoices) },
+    library: { argumentHint: "[play <name> | save [playlist] | import <link>]", choices: firstArgument(libraryChoices) },
+    effort: { argumentHint: "[default|off|low|medium|high|xhigh|max]", choices: firstArgument(effortChoices) },
     // With the core's setup, /generation also downloads, uses and removes Moondog's own models.
     generation: generationSetup ? {
       argumentHint: "[on [folder]|off|download|use|remove|cancel]",
@@ -130,13 +159,23 @@ export function withCommandCompletions(commands, {
         .map((provider) => ({ value: provider.id, label: provider.id, description: provider.name })) : [],
     },
     model: {
-      argumentHint: "[provider] [model] | refresh [provider]",
+      argumentHint: "[provider] [model] | refresh [provider] | roles | vision auto|<provider> <model> | web auto|deepseek|brave|codex",
       choices: (previous) => {
-        if (previous.length > 1) return [];
         const available = providers().filter((provider) => provider.modelCount > 0);
+        const asChoice = (provider) => ({ value: provider.id, label: provider.id, description: provider.name });
+        const subcommand = previous[0]?.toLowerCase();
+        if (subcommand === "roles") return [];
+        if (subcommand === "web") return previous.length === 1 ? webServiceChoices : [];
+        if (subcommand === "vision") {
+          if (previous.length === 1) return [...visionAutoChoices, ...available.map(asChoice)];
+          const provider = previous[1].toLowerCase();
+          return previous.length === 2 && available.some((item) => item.id === provider)
+            ? models(provider).map((model) => ({ value: model.id, label: model.id, description: model.name })) : [];
+        }
+        if (previous.length > 1) return [];
         if (previous.length === 0) {
           return [{ value: "refresh", label: "refresh", description: translate("Refresh public model metadata; keep selection") },
-            ...available.map((provider) => ({ value: provider.id, label: provider.id, description: provider.name }))];
+            ...modelRoleChoices, ...available.map(asChoice)];
         }
         const providerId = previous[0].toLowerCase();
         if (providerId === "refresh") return available.filter(provider => authProviderIds.includes(provider.id))

package/src/surfaces/cli/format-output.mjs

@@ -558,5 +558,5 @@ export function formatLocalResult(command, value, tr = screenTranslator("en")) {
 }
 
 export function helpText(tr = screenTranslator("en")) {
-  return tr("# Every command\n\nFrom your shell:\n\n- `moondog --version` - show the installed version\n- `moondog update [--check] [--channel latest|beta]` - check for or install a published release\n- `moondog web status|search|read [arguments] [--json]` - look things up on public music sites through DeepSeek, Brave Search or the Codex CLI\n- `moondog demo-history --output <absolute-file.zip> [--json]` - make a fictional Spotify history ZIP to try the importer with\n- `moondog auth login <provider>` - sign in to a model provider; the key is typed out of sight; `openai --chatgpt` signs in with your ChatGPT subscription\n- `moondog auth status [provider]` - see which sign-ins are saved\n- `moondog auth logout <provider>` - sign out of a provider\n- `moondog spotify help` - set up and control Spotify\n- `moondog spotify login [client-id]` - connect Spotify in your browser\n- `moondog spotify now|devices|queue` - see what Spotify is playing, where, and what's next\n- `moondog spotify recent` - see what you played lately\n- `moondog spotify sync-recent` - add your latest plays to your profile\n- `moondog spotify sync-library` - add your Spotify library to your profile\n- `moondog spotify play|pause|next|previous` - control Spotify playback\n- `moondog listenbrainz import-history <listen-history.json>` - add a ListenBrainz listens file to your profile\n- `moondog catalog latest-single --artist <name> [--known-release <title> | --from <spotify-history.zip>]` - find an artist's latest single on Apple Music (US), no model needed\n- `moondog status [--json]` - see where things stand\n- `moondog taste [--json]` - your listening report\n- `moondog taste --html [--output <file.html>]` - save your report as a web page that works offline\n- `moondog taste --card [--output <file.html>]` - save a short recap you can check before sharing\n- `moondog taste --from <spotify-history.zip> --html` - a one-off report from a Spotify ZIP, without saving it\n- `moondog taste --from <account-data.zip> --from <extended-history.zip> --html` - a one-off report from both Spotify exports together\n- `moondog taste --from <spotify-history.zip> --save --html` - save the Spotify history, then show your full report\n- `moondog data inspect --scope <listening|apple|profile>` - see what's stored, and get the code needed to reset it\n- `moondog data export --scope <listening|apple|profile> --output <directory>` - export a copy, leaving the original alone\n- `moondog data reset --scope <listening|apple|profile> --confirm <token>` - set stored data aside (it is archived, not deleted)\n- `moondog profile build [--force]` - build or resume a saved profile with your connected model\n- `moondog profile saved [offset]` - read your saved profile\n- `moondog profile explain <number>` - trace a saved finding to its evidence\n- `moondog profile corrections [--all]` - everything you've told me, including earlier choices\n- `moondog profile correct --artist <name> (--like|--avoid)` - like an artist, or keep them out\n- `moondog profile correct --track <title> --by <artist> (--like|--avoid)` - like a track, or keep it out\n- `moondog profile retract <correction-id>` - undo one of your choices\n- `moondog demo --offline [--json]` - a demo with made-up data, no sign-in needed\n- `moondog demo [prompt] [--json]` - the same demo, talking through your model\n- `moondog ask <prompt>` - ask one question and exit\n- `moondog remember <text>` - ask me to remember something\n- `moondog forget <memory-id>` - forget something\n- `moondog memory reflect [--dry-run] [--json]` - let me think over recent conversations now\n- `moondog` - open the listening room\n\nInside the listening room:\n\n- `/update [--check] [--channel latest|beta]` - check for updates, or save and close this session to install one\n- `/status` or `/sources` - see where things stand\n- `/profile` or `/taste` - your profile, and why each song or artist is there\n- `/taste report` - the whole report on one page\n- `/profile build [--force]` - build or resume a saved reading; Ctrl+C keeps progress\n- `/profile saved [offset]` - read your saved profile\n- `/profile explain <number>` - inspect a saved finding's evidence\n- `/profile corrections [--all]` - everything you've told me\n- `/profile correct --track \"<title>\" --by \"<artist>\" (--like|--avoid)` - like a track, or keep it out\n- `/profile correct --artist \"<name>\" (--like|--avoid)` - like an artist, or keep them out\n- `/profile retract <correction-id>` - undo a choice\n- `/memory` - what I remember\n- `/tools` - what I can do right now\n- `/doctor` - check your setup\n- `/model` - pick the model I talk through\n- `/model <provider> <model>` - switch straight to a model\n- `/model refresh [provider]` - update public model choices; keep the selected model\n- `/auth [provider]` - sign in to a model provider\n- `/web status|search|read` - look things up on public music sites\n- `/import [path]` - bring in your history, library, or a playlist\n- `/language` - choose the language Moondog uses\n- `/service [spotify|apple_music|netease]` - choose where I play music\n- `/spotify` - Spotify commands\n- `/spotify login [client-id]` - connect Spotify\n- `/spotify now|devices|queue` - see what's playing, where, and what's next\n- `/spotify recent|sync-recent` - see or save your latest plays\n- `/spotify import-history \"/path/to/spotify-history.zip\"` - add a Spotify ZIP, no sign-in needed\n- `/skip` or `/stop` - move to the next song preview, or stop them\n- `/reload` - reload model settings and sign-ins\n- `/remember [kind] <text>` - ask me to remember something\n- `/forget <memory-id>` - forget something\n- `/rewind` or Alt+R - edit an earlier message in place; the messages after it are replaced\n- `/branch` - go on from here in a new conversation; this one stays saved\n- `/rewind latest` - edit the most recent message\n- `/resume` - pick up a saved conversation\n- `/resume <session-id>` - go straight to one\n- `/new` - start fresh; the last one stays saved\n- `/quit` - exit\n\nAnything you type that isn't a command goes to the model you picked with `/model`, or the one set in `MOONDOG_PROVIDER` and `MOONDOG_MODEL`.\nSign in with `/auth`, or set the provider's API key in your environment. `/auth openai` signs in with your ChatGPT subscription or an API key.\nOnce your profile is ready, I can search your library, explain what I see, and plan playlists with you.\nI can only control Spotify after `moondog spotify login`, and I never post, send messages, delete anything, or spend money.\nAsk me to move playback onto a device by name, such as your iPhone.");
+  return tr("# Every command\n\nFrom your shell:\n\n- `moondog --version` - show the installed version\n- `moondog update [--check] [--channel latest|beta]` - check for or install a published release\n- `moondog web status|search|read [arguments] [--json]` - look things up on public music sites through DeepSeek, Brave Search or the Codex CLI\n- `moondog demo-history --output <absolute-file.zip> [--json]` - make a fictional Spotify history ZIP to try the importer with\n- `moondog auth login <provider>` - sign in to a model provider; the key is typed out of sight; `openai --chatgpt` signs in with your ChatGPT subscription\n- `moondog auth status [provider]` - see which sign-ins are saved\n- `moondog auth logout <provider>` - sign out of a provider\n- `moondog spotify help` - set up and control Spotify\n- `moondog spotify login [client-id]` - connect Spotify in your browser\n- `moondog spotify now|devices|queue` - see what Spotify is playing, where, and what's next\n- `moondog spotify recent` - see what you played lately\n- `moondog spotify sync-recent` - add your latest plays to your profile\n- `moondog spotify sync-library` - add your Spotify library to your profile\n- `moondog spotify play|pause|next|previous` - control Spotify playback\n- `moondog listenbrainz import-history <listen-history.json>` - add a ListenBrainz listens file to your profile\n- `moondog catalog latest-single --artist <name> [--known-release <title> | --from <spotify-history.zip>]` - find an artist's latest single on Apple Music (US), no model needed\n- `moondog status [--json]` - see where things stand\n- `moondog taste [--json]` - your listening report\n- `moondog taste --html [--output <file.html>]` - save your report as a web page that works offline\n- `moondog taste --card [--output <file.html>]` - save a short recap you can check before sharing\n- `moondog taste --from <spotify-history.zip> --html` - a one-off report from a Spotify ZIP, without saving it\n- `moondog taste --from <account-data.zip> --from <extended-history.zip> --html` - a one-off report from both Spotify exports together\n- `moondog taste --from <spotify-history.zip> --save --html` - save the Spotify history, then show your full report\n- `moondog data inspect --scope <listening|apple|profile>` - see what's stored, and get the code needed to reset it\n- `moondog data export --scope <listening|apple|profile> --output <directory>` - export a copy, leaving the original alone\n- `moondog data reset --scope <listening|apple|profile> --confirm <token>` - set stored data aside (it is archived, not deleted)\n- `moondog profile build [--force]` - build or resume a saved profile with your connected model\n- `moondog profile saved [offset]` - read your saved profile\n- `moondog profile explain <number>` - trace a saved finding to its evidence\n- `moondog profile corrections [--all]` - everything you've told me, including earlier choices\n- `moondog profile correct --artist <name> (--like|--avoid)` - like an artist, or keep them out\n- `moondog profile correct --track <title> --by <artist> (--like|--avoid)` - like a track, or keep it out\n- `moondog profile retract <correction-id>` - undo one of your choices\n- `moondog demo --offline [--json]` - a demo with made-up data, no sign-in needed\n- `moondog demo [prompt] [--json]` - the same demo, talking through your model\n- `moondog ask <prompt>` - ask one question and exit\n- `moondog remember <text>` - ask me to remember something\n- `moondog forget <memory-id>` - forget something\n- `moondog memory reflect [--dry-run] [--json]` - let me think over recent conversations now\n- `moondog` - open the listening room\n\nInside the listening room:\n\n- `/update [--check] [--channel latest|beta]` - check for updates, or save and close this session to install one\n- `/status` or `/sources` - see where things stand\n- `/profile` or `/taste` - your profile, and why each song or artist is there\n- `/taste report` - the whole report on one page\n- `/profile build [--force]` - build or resume a saved reading; Ctrl+C keeps progress\n- `/profile saved [offset]` - read your saved profile\n- `/profile explain <number>` - inspect a saved finding's evidence\n- `/profile corrections [--all]` - everything you've told me\n- `/profile correct --track \"<title>\" --by \"<artist>\" (--like|--avoid)` - like a track, or keep it out\n- `/profile correct --artist \"<name>\" (--like|--avoid)` - like an artist, or keep them out\n- `/profile retract <correction-id>` - undo a choice\n- `/memory` - what I remember\n- `/tools` - what I can do right now\n- `/doctor` - check your setup\n- `/model` - pick the model I talk through\n- `/model <provider> <model>` - switch straight to a model\n- `/model refresh [provider]` - update public model choices; keep the selected model\n- `/model roles` - see what side tasks use: the model that reads images and the web search service\n- `/model vision auto|<provider> <model>` - choose the model that reads images\n- `/model web auto|deepseek|brave|codex` - choose the web search service\n- `/effort` - choose how hard the model thinks\n- `/auth [provider]` - sign in to a model provider\n- `/endpoint add` or `/endpoint remove <id>` - add a model service by its address, or remove it\n- `/web status|search|read` - look things up on public music sites\n- `/import [path]` - bring in your history, library, or a playlist\n- `/library` - your saved songs and playlists\n- `/library play <name>` - play a playlist\n- `/library save [playlist]` - keep the song playing now\n- `/library import <link>` - copy a playlist from a link\n- `/generation on|off` - let Moondog make music on this Mac, or stop\n- `/generation download|use|remove|cancel` - set up a Stable Audio 3 model\n- `/onair` - go on air, or come off it\n- `/language` - choose the language Moondog uses\n- `/service [spotify|apple_music|netease]` - choose where I play music\n- `/spotify` - Spotify commands\n- `/spotify login [client-id]` - connect Spotify\n- `/spotify now|devices|queue` - see what's playing, where, and what's next\n- `/spotify recent|sync-recent` - see or save your latest plays\n- `/spotify import-history \"/path/to/spotify-history.zip\"` - add a Spotify ZIP, no sign-in needed\n- `/skip` or `/stop` - move to the next song preview or stream track, or stop them\n- `/home` - back to the record sleeve; the conversation stays\n- `/theme paper|charcoal|terminal|auto` - change the look\n- `/art braille|ascii|off` - change the artwork\n- `/motion on|off` - turn the animation on or off\n- `/lyrics` - the lyrics on the sleeve; `/lyrics sync` finds more\n- `/reload` - reload model settings and sign-ins\n- `/remember [kind] <text>` - ask me to remember something\n- `/forget <memory-id>` - forget something\n- `/rewind` or Alt+R - edit an earlier message in place; the messages after it are replaced\n- `/branch` - go on from here in a new conversation; this one stays saved\n- `/rewind latest` - edit the most recent message\n- `/resume` - pick up a saved conversation\n- `/resume <session-id>` - go straight to one\n- `/new` - start fresh; the last one stays saved\n- `/quit` - exit\n\nAnything you type that isn't a command goes to the model you picked with `/model`, or the one set in `MOONDOG_PROVIDER` and `MOONDOG_MODEL`.\nSign in with `/auth`, or set the provider's API key in your environment. `/auth openai` signs in with your ChatGPT subscription or an API key.\nOnce your profile is ready, I can search your library, explain what I see, and plan playlists with you.\nI can only control Spotify after `moondog spotify login`. I ask before I remove anything from your library, and I never post, send messages, or spend money.\nAsk me to move playback onto a device by name, such as your iPhone.");
 }

package/src/surfaces/cli/model-roles-command.mjs

@@ -0,0 +1,60 @@
+import { MODEL_ROLES, WEB_SERVICES } from "../../runtime/pi/model-roles.mjs";
+
+// /model roles, /model vision and /model web: the terminal's side of Settings' Auxiliary models.
+// The chat model stays /model <provider> <model>.
+export const MODEL_ROLE_WORDS = Object.freeze({ roles: null, vision: "vision", web: "web_search", audio: "audio" });
+
+const titles = { chat: "Chat", vision: "Vision", web_search: "Web search", audio: "Audio" };
+const usage = "Usage: /model roles, /model vision auto|<provider> <model>, or /model web auto|deepseek|brave|codex.";
+
+const modelName = (choice) => `${choice.name ?? choice.model} (${choice.providerName ?? choice.provider})`;
+
+function describe(role) {
+  if (role.state !== "enabled") return "not available yet; its place is kept for a later Moondog";
+  if (role.id === "chat") return role.choice ? modelName(role.choice) : "none chosen; /model picks one";
+  if (role.kind === "service") {
+    const service = (id) => role.services?.find((entry) => entry.id === id || entry.provider === id);
+    if (role.choice) {
+      const chosen = service(role.choice.service);
+      return `${chosen?.name ?? role.choice.service}${chosen && !chosen.ready ? " (not set up; falls back to the next service)" : ""}`;
+    }
+    const used = service(role.search);
+    return used?.ready ? `auto, now ${used.name}` : "auto, but no service is set up; /web status says how";
+  }
+  if (role.choice) return modelName(role.choice);
+  return role.auto ? `auto, now ${modelName(role.auto)}` : "auto, but the chat model can't see images";
+}
+
+export function formatModelRoles(roles) {
+  const lines = roles.map((role) => `- ${titles[role.id] ?? role.id}: ${describe(role)}`);
+  return `# Chat and auxiliary models\n\n${lines.join("\n")}\n\n` +
+    "`/model vision <provider> <model>` gives images a model of their own, and `/model vision auto` gives them back to the chat model when it can see.\n" +
+    "`/model web deepseek|brave|codex` picks the web search service, and `/model web auto` takes the first one set up.";
+}
+
+export async function runModelRolesCommand({ args = [], modelSettings, webResearch } = {}) {
+  if (!modelSettings?.roles) throw new Error("Model roles aren't available when Moondog is started this way.");
+  const [word, ...rest] = args;
+  const roleId = MODEL_ROLE_WORDS[String(word ?? "").toLowerCase()];
+  const show = async () => formatModelRoles(await modelSettings.roles({ web: await webResearch?.services?.().catch(() => null) ?? null }));
+  if (roleId === null) {
+    if (rest.length) throw new Error(usage);
+    return show();
+  }
+  if (roleId === undefined) throw new Error(usage);
+  const role = MODEL_ROLES.find((entry) => entry.id === roleId);
+  if (role.state !== "enabled") return `${titles[roleId]} isn't available yet. Its place is kept, so a later Moondog can add it.`;
+  if (!rest.length) return show();
+  let choice;
+  if (rest.length === 1 && rest[0].toLowerCase() === "auto") choice = null;
+  else if (role.kind === "service") {
+    if (rest.length !== 1 || !WEB_SERVICES.includes(rest[0].toLowerCase())) throw new Error(usage);
+    choice = { service: rest[0].toLowerCase() };
+  } else {
+    if (rest.length !== 2) throw new Error(usage);
+    choice = { provider: rest[0], model: rest[1] };
+  }
+  await modelSettings.setRole(roleId, choice);
+  if (roleId === "web_search") await webResearch?.refresh?.();
+  return show();
+}

package/src/surfaces/cli/tui.mjs

@@ -24,6 +24,8 @@ import { getPublicPiModelCatalog } from "../../runtime/pi/public-model-catalog.m
 import { serviceKeyProviders, supportedAuthProviderIds } from "../../runtime/pi/authentication.mjs";
 import { EFFORT_LEVELS, EFFORT_SCALE } from "../../runtime/pi/runtime-settings.mjs";
 import { runtimeBehindSelection } from "../../runtime/pi/runtime-selection.mjs";
+import { MODEL_ROLE_WORDS } from "./model-roles-command.mjs";
+import { imagesFromText } from "../../runtime/pi/image-input.mjs";
 import {
   formatLocalResult,
   helpText,
@@ -129,8 +131,8 @@ const slashCommands = [
   { name: "generation", description: N_("Let Moondog make music on this Mac") },
   { name: "onair", description: N_("Go on air: Moondog keeps making music from your taste") },
   { name: "spotify", description: N_("Connect and control Spotify") },
-  { name: "skip", description: N_("Skip to the next song preview") },
-  { name: "stop", description: N_("Stop the song previews") },
+  { name: "skip", description: N_("Skip to the next song preview or stream track") },
+  { name: "stop", description: N_("Stop the song previews or the stream") },
   { name: "reload", description: N_("Reload model settings and sign-ins") },
   { name: "remember", description: N_("Ask Moondog to remember something") },
   { name: "forget", description: N_("Forget one memory by ID") },
@@ -209,6 +211,7 @@ export async function runMoondogTui({
   runProfile,
   runProfileAction,
   runWeb,
+  runModelRoles,
   checkUpdates,
   runUpdate,
   lyrics,
@@ -1440,7 +1443,7 @@ export async function runMoondogTui({
   // The window's endpoints reach /model here; an agent on an endpoint that changed is rebuilt, since its
   // address or key may have. The window's menu list and its per-conversation choices don't move this one.
   const stopWatchingModel = watchModelSettings?.((selection, changed) => {
-    if (changed === "models") return;
+    if (changed === "models" || changed === "roles") return;
     if (changed === "endpoints") void refreshEndpoints?.();
     const onEndpoint = changed === "endpoints" && String(runtimeStatus.provider ?? "").startsWith("endpoint-");
     if (!onEndpoint && !runtimeBehindSelection(runtimeStatus, selection)) return;
@@ -2550,6 +2553,13 @@ export async function runMoondogTui({
       return;
     }
     if (command === "model") {
+      // /model roles, vision, web and audio set what other models are for; the rest pick the chat model.
+      if (args[0] && Object.hasOwn(MODEL_ROLE_WORDS, args[0].toLowerCase())) {
+        if (typeof runModelRoles !== "function") throw new Error(tr("Model roles aren't available when Moondog is started this way."));
+        addMoondogMessage(await runModelRoles(args));
+        setFooter(tr("Done."), success);
+        return;
+      }
       await selectModel(args);
       return;
     }
@@ -2827,8 +2837,12 @@ export async function runMoondogTui({
     };
 
     try {
+      // An image path in the message goes with it, as Hermes Agent's terminal does; the words stay.
+      const images = await imagesFromText(value);
+      if (images.length) setFooter(tr("Looking at the attached images... Ctrl+C cancels."));
       const result = await activeRuntime.prompt(value, {
         ...(profileSeed ? { profileSeed } : {}),
+        ...(images.length ? { images } : {}),
         onTextDelta: (delta) => {
           if (cleanedUp) return;
           work.quiet();