@audiofool/moondog 0.2.0-beta.6 → 0.2.0

package/src/surfaces/brand/logo.mjs

@@ -0,0 +1,237 @@
+// Moondog's logo, drawn from numbers. Every shape is measured from the selected 2026-09-02 picture
+// (assets/brand/moondog-lunar-record): the dog's outline, the headphones, the record's grooves and
+// craters, and the tonearm. The picture's paper and its bar mosaic stay with that key visual; the
+// logo is one ink on nothing, so it sits on any background.
+//
+// Coordinates are the picture's 1024 px square with the record's centre moved to (512, 512).
+// scripts/generate-logo.mjs writes the files in assets/brand, the app icons and the site's images
+// from this module; the window's title-bar mark and the terminal's record draw the same dog.
+
+const f = (n) => Number(n.toFixed(2));
+const pt = ([x, y]) => `${f(x)} ${f(y)}`;
+
+export const RECORD = Object.freeze({ cx: 512, cy: 512, rim: 426.7, inner: 222, pitch: 9.75 });
+
+// The earcup is a small record of its own, its rings on the record's own pitch.
+const CUP = Object.freeze({ cx: 362.5, cy: 504, r: 67, rings: [5, 14, 23, 32, 41, 50, 59] });
+
+// The band, its outer edge first, from inside the earcup up over the crown to the ear's tip, then
+// back down its inner edge. Its foot reaches into the earcup, so the gap round the cup cuts it.
+const BAND_OUTER = [[334, 452], [334.6, 418], [335.2, 396.1], [339.3, 371.8], [345.7, 353.1], [353.5, 336.1], [365.6, 317.1],
+  [379.8, 300.7], [389.7, 291], [400.7, 282.9], [413.5, 275.6], [426.9, 267.9], [436, 262.3]];
+const BAND_TIP = [[441, 262.4], [444.6, 267.6], [447.6, 276.4]];
+const BAND_INNER = [[446.3, 281.5], [436.7, 284.8], [419.5, 296], [401.3, 311.1], [389, 324.5], [380.3, 338], [373.4, 351.8],
+  [367.4, 368], [363.2, 386], [361.1, 405], [361, 452]];
+
+// The head, clockwise from the ear's tip: down the ear, the brow and the muzzle, round the nose, back
+// under the jaw, down the throat and the chest, along the bottom and up the back of the neck into
+// the earcup's gap. The corners are the ear, the throat, the chest's step and the bottom's two ends.
+const HEAD = [
+  [447.6, 281], [469.5, 347.5],
+  [481, 359.8], [494, 377.2], [512, 389.2], [542, 401.2], [577, 417], [603, 435.2],
+  [611.5, 449], [620.5, 461], [629, 473.5], [641, 483.6], [655, 490.4], [681, 501], [704.4, 508.6], [720, 512],
+  [729, 515.8], [733, 522.5], [733.4, 530.6], [731, 539.5],
+  [724.3, 553.2], [719.4, 565.9], [712.5, 577.5], [696.5, 593.6], [679.4, 604.9], [657.5, 612.9], [638, 617],
+  [592.5, 618.1], [578.2, 621.5], [568.6, 628.9], [563.5, 636],
+  [563.3, 661], [565.6, 690], [566.3, 728.3],
+  [546.2, 740.3], [528, 746.8],
+  [525.2, 790], [527.5, 838.8],
+  [480, 833.5], [434, 825], [392, 813.6], [350, 800], [312, 775], [275, 750], [245, 727], [220.3, 699.5],
+  [236, 664], [252, 630], [265, 600], [276, 566], [287.7, 533.7], [292, 522],
+];
+const HEAD_CORNERS = [0, 1, 30, 33, 35, 37, 45];
+
+// Craters, each an inner arc, a ring and one or two dashed rings.
+const CRATERS = [
+  { cx: 321.5, cy: 236.7, r: 39 }, { cx: 712.8, cy: 277.2, r: 36 }, { cx: 212, cy: 490.9, r: 27.5 },
+  { cx: 816.5, cy: 618.4, r: 16.5 }, { cx: 256.5, cy: 786.9, r: 30.5 }, { cx: 640.8, cy: 848.7, r: 40 },
+];
+
+// The tonearm in its own coordinates: t runs down the arm from the headshell's middle, s across it.
+const ARM = Object.freeze({ origin: [900.3, 201.2], down: [-0.61433, 0.78905] });
+
+// A centripetal Catmull-Rom curve through the nodes, as cubic Béziers: it passes through every node
+// and never loops at a sharp turn. A node in `corners` keeps its point; the curve meets it straight.
+function segments(nodes, { closed = true, corners = [] } = {}) {
+  const sharp = new Set(corners);
+  const count = nodes.length;
+  const at = (index) => (closed ? nodes[(index + count) % count] : nodes[Math.max(0, Math.min(count - 1, index))]);
+  const tangent = (a, b, c, index) => {
+    if (sharp.has((index + count) % count)) return [0, 0];
+    const before = Math.hypot(b[0] - a[0], b[1] - a[1]) ** 0.5 || 1e-6;
+    const after = Math.hypot(c[0] - b[0], c[1] - b[1]) ** 0.5 || 1e-6;
+    return [0, 1].map((axis) => (b[axis] - a[axis]) / before - (c[axis] - a[axis]) / (before + after) + (c[axis] - b[axis]) / after);
+  };
+  const list = [];
+  for (let index = 0; index < (closed ? count : count - 1); index += 1) {
+    const [p0, p1, p2, p3] = [at(index - 1), at(index), at(index + 1), at(index + 2)];
+    const span = Math.hypot(p2[0] - p1[0], p2[1] - p1[1]) ** 0.5;
+    const [m1, m2] = [tangent(p0, p1, p2, index), tangent(p1, p2, p3, index + 1)];
+    list.push([p1, [p1[0] + m1[0] * span / 3, p1[1] + m1[1] * span / 3], [p2[0] - m2[0] * span / 3, p2[1] - m2[1] * span / 3], p2]);
+  }
+  return { list, closed };
+}
+const toPath = ({ list, closed }) => `M${pt(list[0][0])}${list.map(([, c1, c2, end]) => `C${pt(c1)} ${pt(c2)} ${pt(end)}`).join("")}${closed ? "Z" : ""}`;
+function toPoints({ list }, steps = 8) {
+  const points = [];
+  for (const [a, b, c, d] of list) {
+    for (let step = 0; step < steps; step += 1) {
+      const t = step / steps, s = 1 - t;
+      points.push([0, 1].map((axis) => s ** 3 * a[axis] + 3 * s * s * t * b[axis] + 3 * s * t * t * c[axis] + t ** 3 * d[axis]));
+    }
+  }
+  points.push(list.at(-1)[3]);
+  return points;
+}
+
+// Moves each node of an open line sideways by `by`: positive is to the right of the way it runs.
+function offset(nodes, by) {
+  return nodes.map((point, index) => {
+    const a = nodes[Math.max(0, index - 1)], b = nodes[Math.min(nodes.length - 1, index + 1)];
+    const length = Math.hypot(b[0] - a[0], b[1] - a[1]);
+    return [point[0] - ((b[1] - a[1]) / length) * by, point[1] + ((b[0] - a[0]) / length) * by];
+  });
+}
+
+// The dog's three shapes and the gap between band and head. The head closes through the earcup and
+// just inside the band, so head and band overlap without a seam; the gaps are cut from all three.
+function figure(gap) {
+  const band = segments([...BAND_OUTER, ...BAND_TIP, ...BAND_INNER], { corners: [0, BAND_OUTER.length + BAND_TIP.length + BAND_INNER.length - 1] });
+  const along = offset([...BAND_INNER].reverse(), -1.5).slice(0, -1);
+  const head = segments([...HEAD, [330, 505], [358, 455], ...along], {
+    corners: [...HEAD_CORNERS, HEAD.length - 1, HEAD.length, HEAD.length + 1, HEAD.length + along.length - 1],
+  });
+  // The band's gap runs beside its inner edge, from the middle of the earcup's gap out past the ear.
+  const edge = [...BAND_INNER.slice(0, -1), [361.1, CUP.cy - CUP.r - gap / 2]];
+  const [first, second] = edge;
+  const bandGap = segments(offset([[first[0] + (first[0] - second[0]) * 1.2, first[1] + (first[1] - second[1]) * 1.2], ...edge], -gap / 2), { closed: false });
+  return { head, band, bandGap };
+}
+
+const toArm = (t, s) => [ARM.origin[0] + t * ARM.down[0] + s * ARM.down[1], ARM.origin[1] + t * ARM.down[1] - s * ARM.down[0]];
+const quad = (corners) => `M${corners.map((corner) => pt(toArm(...corner))).join("L")}Z`;
+// The full tonearm: tube, collar, headshell, the block under it, finger lift, cartridge, stylus.
+function tonearm(reach) {
+  return {
+    parts: [
+      quad([[-reach, -7.25], [-reach, 7.25], [-38, 7.25], [-38, -7.25]]), quad([[-36.5, -11], [-36.5, 11], [-28, 11], [-28, -11]]),
+      quad([[-26.5, -17.5], [-26.5, 17.5], [25, 17.5], [25, -20]]), quad([[27, -26], [27, 21.5], [70, 19.5], [70, -28]]),
+      quad([[21.75, 17], [21.75, 54], [30.25, 54], [30.25, 17]]),
+      quad([[71.5, -13.5], [71.5, 8.5], [97.5, 6.25], [97.5, -11.25]]), quad([[97.5, -6.5], [97.5, 1.5], [104, 0], [104, -5]]),
+    ],
+    liftEnd: toArm(26, 54),
+    screw: toArm(-11.25, 0),
+    holes: [toArm(50, -12.5), toArm(50, 7)],
+  };
+}
+// The small version, for 64 px and below: the rim and two heavy grooves, the clear margin they keep
+// from the dog, gaps wide enough to last, and the earcup's one ring and its middle.
+const SMALL = Object.freeze({ gap: 30, halo: 22, grooves: [[RECORD.rim - 15, 30], [362, 22], [312, 22]], cupRing: [34, 14], cupDot: 14 });
+// Its arm is one tube, one headshell and a cartridge, heavy enough to show at 32 px.
+const heavyArm = (reach) => [[[-reach, -15], [-reach, 15], [-30, 15], [-30, -15]], [[-26, -30], [-26, 26], [74, 24], [74, -32]],
+  [[78, -17], [78, 11], [104, 8], [104, -14]]];
+
+function arc(cx, cy, r, from, to) {
+  const point = (angle) => [cx + r * Math.cos((angle * Math.PI) / 180), cy + r * Math.sin((angle * Math.PI) / 180)];
+  return `M${pt(point(from))}A${f(r)} ${f(r)} 0 ${to - from > 180 ? 1 : 0} 1 ${pt(point(to))}`;
+}
+const ring = (cx, cy, r, width, paint, more = "") =>
+  `<circle cx="${f(cx)}" cy="${f(cy)}" r="${f(r)}" fill="none" stroke="${paint}" stroke-width="${f(width)}"${more}/>`;
+const crater = ({ cx, cy, r }, ink, line) => {
+  const large = r > 25;
+  return [
+    `<path d="${arc(cx, cy, r * 0.27, 200, 470)}" fill="none" stroke="${ink}" stroke-width="${line}" stroke-linecap="round"/>`,
+    ring(cx, cy, r * 0.46, line * 1.15, ink),
+    ring(cx, cy, r * (large ? 0.72 : 1), line, ink, ` stroke-dasharray="${f(r * 0.5)} ${f(r * 0.12)}" stroke-dashoffset="${f(r * 0.2)}"`),
+    large ? ring(cx, cy, r, line * 0.85, ink, ` stroke-dasharray="${f(r * 0.28)} ${f(r * 0.1)} ${f(r * 0.06)} ${f(r * 0.1)}"`) : "",
+  ].join("");
+};
+// A standalone file takes the reader's light or dark; drawn inside a page, the logo takes the page's colour.
+const SCHEME = "<style>svg{color:#141414}@media (prefers-color-scheme:dark){svg{color:#f2f2f2}}</style>";
+
+/**
+ * The logo as SVG. The full logo has every groove, the craters and the whole tonearm. `small` is
+ * the one for 64 px and below: the rim, two heavy grooves, a heavy tonearm, and gaps wide enough
+ * to last. `ink` paints it; `standalone` adds the light and dark colours a file on its own needs.
+ * `id` keeps the masks of several logos on one page apart.
+ */
+export function logoSvg({ small = false, ink = "currentColor", standalone = false, id = "moondog-logo", reach = 200, line = 1.4 } = {}) {
+  const gap = small ? SMALL.gap : 11;
+  const halo = small ? SMALL.halo : 6;
+  const { head, band, bandGap } = figure(gap);
+  const arm = tonearm(reach);
+  const armParts = small ? heavyArm(reach + 60).map(quad) : arm.parts;
+  const liftEnd = small ? "" : `<circle cx="${f(arm.liftEnd[0])}" cy="${f(arm.liftEnd[1])}" r="4.25"/>`;
+  const dog = `<path d="${toPath(head)}"/><path d="${toPath(band)}"/><circle cx="${CUP.cx}" cy="${CUP.cy}" r="${CUP.r}"/>`;
+  const grooves = [];
+  if (small) grooves.push(...SMALL.grooves);
+  else for (let r = RECORD.rim, index = 0; r >= RECORD.inner - 0.01; r -= RECORD.pitch, index += 1) grooves.push([r, index ? line : line * 1.6]);
+  const cupRings = small
+    ? `${ring(CUP.cx, CUP.cy, ...SMALL.cupRing, "#000")}<circle cx="${CUP.cx}" cy="${CUP.cy}" r="${SMALL.cupDot}" fill="#000"/>`
+    : CUP.rings.map((r) => ring(CUP.cx, CUP.cy, r, 3.2, "#000")).join("");
+  const mask = (name, body) => `<mask id="${id}-${name}" maskUnits="userSpaceOnUse" x="0" y="0" width="1024" height="1024"><rect width="1024" height="1024" fill="#fff"/>${body}</mask>`;
+  // Grooves stop short of the dog, the arm and the craters; the gaps cut the dog into head, band and cup.
+  const clear = `<g fill="#000" stroke="#000" stroke-width="${halo * 2}" stroke-linejoin="round">${dog}${armParts.map((d) => `<path d="${d}"/>`).join("")}${liftEnd}</g>`
+    + (small ? "" : CRATERS.map((c) => `<circle cx="${c.cx}" cy="${c.cy}" r="${c.r + 10}" fill="#000"/>`).join(""));
+  const cuts = `${ring(CUP.cx, CUP.cy, CUP.r + gap / 2, gap, "#000")}<path d="${toPath(bandGap)}" fill="none" stroke="#000" stroke-width="${gap}"/>${cupRings}`;
+  const armDetail = small ? "" : ring(...arm.screw, 7.5, 1.8, "#000") + arm.holes.map(([x, y]) => `<circle cx="${f(x)}" cy="${f(y)}" r="5.5" fill="#000"/>`).join("")
+    + `<path d="M${pt(arm.holes[0])}L${pt(arm.holes[1])}" stroke="#000" stroke-width="1.6"/>`;
+  return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="${small ? "40 40 944 944" : "0 0 1024 1024"}">${standalone ? SCHEME : ""}`
+    + `<defs>${mask("clear", clear)}${mask("cut", cuts)}${small ? "" : mask("arm", armDetail)}</defs>`
+    + `<g mask="url(#${id}-clear)">${grooves.map(([r, width]) => ring(RECORD.cx, RECORD.cy, r, width, ink)).join("")}</g>`
+    + (small ? "" : CRATERS.map((c) => crater(c, ink, line)).join(""))
+    + `<g mask="url(#${id}-cut)" fill="${ink}">${dog}</g>`
+    + `<g fill="${ink}"${small ? "" : ` mask="url(#${id}-arm)"`}>${armParts.map((d) => `<path d="${d}"/>`).join("")}${liftEnd}</g></svg>`;
+}
+
+/**
+ * The app icon's tile on its 1024 canvas: a superellipse, the shape of a macOS icon, `half` from the
+ * center to each side. Larger halves draw the same shape round the tile, as a ring that follows it.
+ */
+export function iconShape(half = 412) {
+  const corner = Array.from({ length: 160 }, (_, index) => {
+    const angle = (index / 160) * 2 * Math.PI, cos = Math.cos(angle), sin = Math.sin(angle);
+    return [512 + half * Math.sign(cos) * Math.abs(cos) ** 0.4, 512 + half * Math.sign(sin) * Math.abs(sin) ** 0.4];
+  });
+  return `M${corner.map(pt).join("L")}Z`;
+}
+
+/**
+ * The Mac app icon: the full logo on a rounded square of Apple's 824 px grid, its tonearm reaching in
+ * from beyond the tile's corner. Light is the app's own icon; dark is the one the listener can choose.
+ */
+export function appIconSvg({ dark = false, id = "moondog-icon" } = {}) {
+  const [tile, ink] = dark ? ["#151515", "#f2f2f2"] : ["#ffffff", "#141414"];
+  const shape = iconShape();
+  const art = logoSvg({ ink, id, reach: 340, line: 1.8 }).replace(/^<svg[^>]*>/u, "").replace(/<\/svg>$/u, "");
+  // The soft shadow under the tile that Mac icons draw in their own margin.
+  return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024"><defs><clipPath id="${id}-tile"><path d="${shape}"/></clipPath>`
+    + `<filter id="${id}-shadow" x="-10%" y="-10%" width="120%" height="125%"><feDropShadow dx="0" dy="10" stdDeviation="12" flood-color="#000" flood-opacity="0.28"/></filter></defs>`
+    + `<path d="${shape}" fill="${tile}" filter="url(#${id}-shadow)"/><g clip-path="url(#${id}-tile)"><g transform="translate(512 512) scale(0.74) translate(-512 -512)">${art}</g></g></svg>`;
+}
+
+/**
+ * The small logo for surfaces that draw it themselves, such as the window's title-bar mark and the
+ * terminal's record, in the record's unit coordinates (the disc has radius 1 around 0, 0): the dog's
+ * outlines as points, its gaps, the rim and grooves as [radius, width], the margin they keep from the
+ * dog, and the heavy arm's parts, its tube `reach` long.
+ */
+export function logoFigure({ reach = 190 } = {}) {
+  const { head, band, bandGap } = figure(SMALL.gap);
+  const scale = (length) => length / RECORD.rim;
+  const unit = ([x, y]) => [scale(x - RECORD.cx), scale(y - RECORD.cy)];
+  return {
+    // The head to fill, and its outer edge alone, from the ear's tip round to the back of the neck.
+    head: toPoints(head).map(unit),
+    headEdge: toPoints(segments(HEAD, { closed: false, corners: HEAD_CORNERS })).map(unit),
+    // The band to fill, and the line down its middle, from the ear's tip to the earcup.
+    band: toPoints(band).map(unit),
+    bandCenter: toPoints(segments(offset(BAND_INNER, 12.5), { closed: false })).map(unit),
+    bandGap: toPoints(bandGap, 4).map(unit),
+    gap: scale(SMALL.gap),
+    cup: { center: unit([CUP.cx, CUP.cy]), radius: scale(CUP.r), ring: scale(SMALL.cupRing[0]), ringWidth: scale(SMALL.cupRing[1]), dot: scale(SMALL.cupDot) },
+    grooves: SMALL.grooves.map(([radius, width]) => [scale(radius), scale(width)]),
+    halo: scale(SMALL.halo),
+    tonearm: heavyArm(reach).map((corners) => corners.map((corner) => unit(toArm(...corner)))),
+  };
+}

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

@@ -8,22 +8,22 @@ import {
 } from "../../runtime/pi/authentication.mjs";
 import { sanitizeTerminalText } from "./format-output.mjs";
 
-const DEFAULT_AUTH_PROVIDER = "openai-codex";
+const DEFAULT_AUTH_PROVIDER = "openai";
 
 export function authHelpText() {
   return `# Moondog authentication
 
 Commands:
 
-- \`moondog auth login openai-codex\` - start a browser OAuth login
-- \`moondog auth login openai-codex --device-code\` - use headless device login
+- \`moondog auth login openai --chatgpt\` - sign in with your ChatGPT subscription in the browser
 - \`moondog auth login <provider>\` - save an API key using hidden terminal input
 - \`moondog auth status [provider] [--json]\` - inspect saved or environment credentials
 - \`moondog auth logout <provider> [--json]\` - remove that provider's saved credential
 
-API key providers: ${supportedAuthProviderIds.filter((id) => id !== DEFAULT_AUTH_PROVIDER && !serviceKeyProviders.some((service) => service.id === id)).join(", ")}.
+API key providers: ${supportedAuthProviderIds.filter((id) => !serviceKeyProviders.some((service) => service.id === id)).join(", ")}.
 Web search keys: ${serviceKeyProviders.map((service) => `${service.id} for ${service.name} (or ${service.variable})`).join(", ")}; a deepseek key also searches and reads pages.
-Use zai for GLM, moonshotai or moonshotai-cn for Kimi, xai for Grok, openai for GPT, and anthropic for Claude.
+Use openai for GPT, anthropic for Claude, google for Gemini, xai for Grok, zai for GLM, and moonshotai or moonshotai-cn for Kimi.
+OpenAI takes either a ChatGPT sign-in or an API key; the newer one replaces the other.
 Moondog keeps credentials in its own private local store.
 API keys are entered interactively, never as command arguments.
 It does not read, modify, or log out the Codex CLI or ChatGPT desktop session.`;
@@ -39,19 +39,11 @@ function parseAuthArguments(args) {
       action: "help",
       provider: undefined,
       extra: [],
-      loginMethod: "browser",
+      chatgpt: false,
     };
   }
-  const deviceCodeIndex = values.indexOf("--device-code");
-  const browserIndex = values.indexOf("--browser");
-  const deviceCode = deviceCodeIndex !== -1;
-  const browser = browserIndex !== -1;
-  if (deviceCode) values.splice(deviceCodeIndex, 1);
-  const adjustedBrowserIndex = values.indexOf("--browser");
-  if (adjustedBrowserIndex !== -1) values.splice(adjustedBrowserIndex, 1);
-  if (deviceCode && browser) {
-    throw new Error("Choose either --browser or --device-code, not both.");
-  }
+  const chatgptIndex = values.indexOf("--chatgpt");
+  if (chatgptIndex !== -1) values.splice(chatgptIndex, 1);
   const unknownOption = values.find((value) => value.startsWith("-"));
   if (unknownOption) {
     throw new Error(
@@ -62,7 +54,7 @@ function parseAuthArguments(args) {
     action: values[0],
     provider: values[1],
     extra: values.slice(2),
-    loginMethod: deviceCode ? "device_code" : "browser",
+    chatgpt: chatgptIndex !== -1,
   };
 }
 
@@ -80,7 +72,8 @@ function formatStatus(value) {
   return `${value.provider}: not configured`;
 }
 
-function createReadlineOutput(output) {
+// A readline output that can go quiet, so a key typed into it is never echoed.
+export function createReadlineOutput(output) {
   let muted = false;
   const stream = new Writable({
     write(chunk, encoding, callback) {
@@ -105,7 +98,6 @@ function createReadlineOutput(output) {
 function createAuthInteraction({
   input,
   output,
-  loginMethod,
   signal,
   interactive,
   apiKeyLogin,
@@ -126,15 +118,9 @@ function createAuthInteraction({
       signal,
       async prompt(prompt) {
         if (prompt.type === "select") {
-          const selected = prompt.options.find(
-            (option) => option.id === loginMethod,
+          throw new Error(
+            "The installed Pi provider asked for a login choice Moondog doesn't offer.",
           );
-          if (!selected) {
-            throw new Error(
-              "The installed Pi provider does not support the requested login method.",
-            );
-          }
-          return selected.id;
         }
         if (prompt.type === "secret" && !interactive) {
           throw new Error(
@@ -175,12 +161,6 @@ function createAuthInteraction({
             writeLine(output, event.url);
             if (event.instructions) writeLine(output, event.instructions);
             break;
-          case "device_code":
-            writeLine(output);
-            writeLine(output, "Open this URL to sign in with ChatGPT:");
-            writeLine(output, event.verificationUri);
-            writeLine(output, `Device code: ${event.userCode}`);
-            break;
           case "info":
             writeLine(output, event.message);
             for (const link of event.links ?? []) {
@@ -202,7 +182,7 @@ function createAuthInteraction({
 // Pi's login errors can carry provider response bodies. Every surface that signs
 // in shows only these fixed messages and codes.
 export function wrapLoginError(error, provider) {
-  const name = provider === DEFAULT_AUTH_PROVIDER ? "OpenAI Codex" : provider;
+  const name = provider === DEFAULT_AUTH_PROVIDER ? "OpenAI" : provider;
   if (error?.name === "AbortError" || error?.code === "ABORT_ERR") {
     const cancelled = new Error(`${name} login was cancelled.`);
     cancelled.code = "auth_login_cancelled";
@@ -248,11 +228,8 @@ export async function runAuthCommand({
   if (!["login", "status", "logout"].includes(options.action)) {
     throw new Error("Unknown auth command. Use login, status, logout, or help.");
   }
-  if (
-    options.action !== "login" &&
-    (options.loginMethod !== "browser" || args.includes("--browser"))
-  ) {
-    throw new Error("Login method options are valid only for auth login.");
+  if (options.action !== "login" && options.chatgpt) {
+    throw new Error("--chatgpt is valid only for auth login.");
   }
 
   const provider = options.provider ??
@@ -265,15 +242,10 @@ export async function runAuthCommand({
       `Unsupported auth provider. Choose ${supportedAuthProviderIds.join(", ")}.`,
     );
   }
-  const apiKeyLogin = provider !== DEFAULT_AUTH_PROVIDER;
-  if (
-    apiKeyLogin &&
-    (args.includes("--device-code") || args.includes("--browser"))
-  ) {
-    throw new Error(
-      "Browser and device-code options apply only to openai-codex OAuth login.",
-    );
+  if (options.chatgpt && provider !== DEFAULT_AUTH_PROVIDER) {
+    throw new Error("Only openai signs in with ChatGPT; other providers take an API key.");
   }
+  const apiKeyLogin = !options.chatgpt;
 
   if (options.action === "status") {
     const authentication = await createAuthentication({ environment });
@@ -299,9 +271,7 @@ export async function runAuthCommand({
       writeLine(output, formatStatus(status));
       writeLine(
         output,
-        apiKeyLogin
-          ? "Moondog's saved API key was removed. Environment credentials remain available until unset."
-          : "Moondog's local credential was removed. Codex CLI and ChatGPT desktop login were not changed.",
+        "Moondog's saved credential was removed. Environment credentials remain available until unset; the Codex CLI and ChatGPT desktop sign-ins were not changed.",
       );
     }
     return;
@@ -315,9 +285,9 @@ export async function runAuthCommand({
       "API key login requires an interactive terminal with hidden input. For headless use, set the provider's API key environment variable.",
     );
   }
-  if (!apiKeyLogin && options.loginMethod === "browser" && !interactive) {
+  if (!apiKeyLogin && !interactive) {
     throw new Error(
-      "Browser OAuth login requires an interactive terminal. Use --device-code for a headless session.",
+      "ChatGPT sign-in requires an interactive terminal. For headless use, set OPENAI_API_KEY instead.",
     );
   }
 
@@ -328,7 +298,6 @@ export async function runAuthCommand({
   const login = createAuthInteraction({
     input,
     output: progressOutput,
-    loginMethod: options.loginMethod,
     signal: controller.signal,
     interactive,
     apiKeyLogin,
@@ -336,7 +305,7 @@ export async function runAuthCommand({
   try {
     let status;
     try {
-      status = await authentication.login(provider, login.interaction);
+      status = await authentication.login(provider, login.interaction, { method: apiKeyLogin ? "api_key" : "oauth" });
     } catch (error) {
       throw wrapLoginError(error, provider);
     }
@@ -352,8 +321,8 @@ export async function runAuthCommand({
       : "Next, return to Moondog and run /model.");
     if (!apiKeyLogin) {
       writeLine(output, "For a non-interactive launch, use environment overrides:");
-      writeLine(output, "  export MOONDOG_PROVIDER=openai-codex");
-      writeLine(output, "  export MOONDOG_MODEL=gpt-5.6-terra");
+      writeLine(output, "  export MOONDOG_PROVIDER=openai");
+      writeLine(output, "  export MOONDOG_MODEL=gpt-6.1-sol");
       writeLine(output, "  moondog");
     }
   } finally {

package/src/surfaces/cli/brand-components.mjs

@@ -564,5 +564,5 @@ function wrapDescription(text, width) {
 }
 
 export function listeningHelp() {
-  return tr("# Your listening room\n\n## 01 / Listen and discover\n\nJust type to talk about music, ask for a playlist, or go exploring.\nTo talk, Moondog needs a model: `/auth` signs you in, then `/model` picks one.\nWhile an answer is coming, each step shows in the conversation, and the footer names the one in progress.\n\n- `/taste` - your profile: open any song or artist to see why it's there\n- `/taste report` - the whole picture on one page\n- `/import` - bring in your history, your library, or a playlist\n- `/lyrics` - the lyrics on the sleeve; `/lyrics sync` finds more\n- `/spotify` - play, queue, and make playlists in Spotify\n- Ask to move playback onto your iPhone, computer, or another Spotify device by name\n- `/web search <query>` or `/web read <url>` - look things up on public music sites\n\n## 02 / Make it yours\n\n- `/profile` - the same profile as `/taste`\n- `/profile corrections` - everything you've told me\n- `/profile retract <id>` - undo one of those\n- `/profile help` - the full set of profile commands\n- `/remember <text>`, `/memory`, `/forget <id>` - what I remember between conversations\n\n## 03 / Around the room\n\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- `/commands` or Ctrl+P - search every command; your message stays put\n- Page Up and Page Down scroll the conversation. The header and your draft stay put\n- Up and Down in the draft recall what you typed in this conversation\n- `/resume` - pick up a saved conversation (type to filter, Enter opens)\n- `/new` - start fresh; this conversation stays saved\n- `/status`, `/sources`, `/tools`, `/doctor` - see what's connected and working\n- `/reload` - reload model settings and sign-ins\n- `/update [--check] [--channel latest|beta]` - check for a release, or close this room and install it\n- `/help all` - every command, including the ones for the shell\n- `/language` - choose the language Moondog uses\n- `/quit` - leave\n\nTab moves to the menu on the home screen. Esc goes back to typing.\nEnter sends, and Shift+Enter starts a new line.\nTab or Enter accepts a suggestion.\nCtrl+C stops a model or web request, or leaves when nothing is running.\nIn the profile, type to filter, Tab switches lists, and Enter shows what you can do.\nCtrl+R refreshes it and Ctrl+O opens the full report.\nYour profile works without a model.\nPut quotes around paths, titles, and names that have spaces.");
+  return tr("# Your listening room\n\n## 01 / Listen and discover\n\nJust type to talk about music, ask for a playlist, or go exploring.\nTo talk, Moondog needs a model: `/auth` signs you in, then `/model` picks one.\nWhile an answer is coming, each step shows in the conversation, and the footer names the one in progress.\n\n- `/taste` - your profile: open any song or artist to see why it's there\n- `/taste report` - the whole picture on one page\n- `/import` - bring in your history, your library, or a playlist\n- `/lyrics` - the lyrics on the sleeve; `/lyrics sync` finds more\n- `/service` - choose where I play music: Spotify, Apple Music, or NetEase\n- `/spotify` - play, queue, and make playlists in Spotify\n- Ask to move playback onto your iPhone, computer, or another Spotify device by name\n- `/web search <query>` or `/web read <url>` - look things up on public music sites\n\n## 02 / Make it yours\n\n- `/profile` - the same profile as `/taste`\n- `/profile corrections` - everything you've told me\n- `/profile retract <id>` - undo one of those\n- `/profile help` - the full set of profile commands\n- `/remember <text>`, `/memory`, `/forget <id>` - what I remember between conversations\n\n## 03 / Around the room\n\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- `/commands` or Ctrl+P - search every command; your message stays put\n- Page Up and Page Down scroll the conversation. The header and your draft stay put\n- Up and Down in the draft recall what you typed in this conversation\n- `/resume` - pick up a saved conversation (type to filter, Enter opens)\n- `/new` - start fresh; this conversation stays saved\n- `/status`, `/sources`, `/tools`, `/doctor` - see what's connected and working\n- `/reload` - reload model settings and sign-ins\n- `/update [--check] [--channel latest|beta]` - check for a release, or close this room and install it\n- `/help all` - every command, including the ones for the shell\n- `/language` - choose the language Moondog uses\n- `/quit` - leave\n\nTab moves to the menu on the home screen. Esc goes back to typing.\nEnter sends, and Shift+Enter starts a new line.\nTab or Enter accepts a suggestion.\nCtrl+C stops a model or web request, or leaves when nothing is running.\nIn the profile, type to filter, Tab switches lists, and Enter shows what you can do.\nCtrl+R refreshes it and Ctrl+O opens the full report.\nYour profile works without a model.\nPut quotes around paths, titles, and names that have spaces.");
 }

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

@@ -19,6 +19,11 @@ const artChoices = choices([
   ["auto", N_("Choose artwork for this terminal")],
 ]);
 const motionChoices = choices([["on", N_("Animate the character artwork")], ["off", N_("Keep the artwork still")]]);
+const serviceChoices = choices([
+  ["spotify", N_("Whole songs on your Spotify devices")],
+  ["apple_music", N_("30-second previews, played here")],
+  ["netease", N_("Whole songs through ncm-cli")],
+]);
 const webChoices = choices([
   ["search", N_("Search public music sites")],
   ["read", N_("Read a public page")],
@@ -87,6 +92,7 @@ export function withCommandCompletions(commands, {
     theme: { argumentHint: "[paper|charcoal|terminal|auto]", choices: firstArgument(themeChoices) },
     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) },
     lyrics: { argumentHint: "[sync]", choices: firstArgument(choices([["sync", N_("Check profile songs for lyrics")]])) },
     web: { argumentHint: "search <query> | read <url> | status", choices: firstArgument(webChoices) },
     spotify: {
@@ -94,6 +100,14 @@ export function withCommandCompletions(commands, {
       choices: (previous) => previous.length === 0 ? spotifyChoices
         : previous.length === 1 ? spotifyArguments.get(previous[0]) ?? [] : [],
     },
+    endpoint: {
+      argumentHint: "[add | remove <id>]",
+      choices: (previous) => previous.length === 0
+        ? choices([["add", N_("Add an endpoint by its address")], ["remove", N_("Remove an endpoint and its key")]])
+        : previous.length === 1 && previous[0] === "remove"
+          ? providers().filter((provider) => provider.id.startsWith("endpoint-")).map((provider) => ({ value: provider.id, label: provider.id, description: provider.name }))
+          : [],
+    },
     auth: {
       argumentHint: "[provider]",
       choices: (previous) => previous.length === 0 ? providers()

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

@@ -0,0 +1,106 @@
+import { createInterface } from "node:readline/promises";
+
+import { ENDPOINT_FORMATS, readEndpoints } from "../../runtime/pi/custom-endpoints.mjs";
+import { createModelSettings } from "../../runtime/pi/model-settings.mjs";
+import { createReadlineOutput } from "./auth-command.mjs";
+import { sanitizeTerminalText } from "./format-output.mjs";
+
+// Endpoints from the terminal, as Settings › Model adds them in the window: any service that speaks
+// OpenAI's Chat Completions or Anthropic's Messages, by its address, an optional key and its model IDs.
+export function endpointHelpText() {
+  return `# Moondog endpoints
+
+- \`moondog endpoint\` - list the endpoints you added
+- \`moondog endpoint add\` - add one; Moondog asks for its name, address, format, key and model IDs
+- \`moondog endpoint remove <id>\` - remove one with its key
+
+The key is typed out of sight and kept in Moondog's private endpoints.json, never in a command.
+Leave the model IDs empty and Moondog asks the endpoint for its list.
+Then pick a model with /model <id>.`;
+}
+
+const line = (stream, value = "") => stream.write(`${sanitizeTerminalText(value)}\n`);
+const host = (address) => { try { return new URL(address).host; } catch { return address; } };
+
+export function describeEndpoints(endpoints) {
+  if (!endpoints.length) return "No endpoints yet. Add one with moondog endpoint add, or /endpoint add in Moondog.";
+  return endpoints.map((endpoint) => `${endpoint.id} - ${endpoint.name}, ${endpoint.format === "anthropic" ? "Anthropic" : "OpenAI"} format at ${host(endpoint.baseUrl)}, ` +
+    `${endpoint.models.length} model${endpoint.models.length === 1 ? "" : "s"}${endpoint.key ? ", key saved" : ""}`).join("\n");
+}
+
+// The questions an endpoint needs, one by one, on a paused terminal. The key is asked with the output
+// muted; an empty answer keeps the endpoint keyless, as a server on this Mac often is.
+async function askEndpoint({ input, output, signal }) {
+  const quiet = createReadlineOutput(output);
+  const readline = createInterface({ input, output: quiet.stream, terminal: Boolean(input.isTTY) });
+  const ask = (question) => readline.question(`${sanitizeTerminalText(question)} `, { signal });
+  try {
+    line(output);
+    line(output, "Add an endpoint. Press Ctrl+C to stop.");
+    const name = (await ask("Name (for example DeepSeek):")).trim();
+    const baseUrl = (await ask("Address (for example https://api.deepseek.com):")).trim();
+    const said = (await ask("Format, openai or anthropic [openai]:")).trim().toLowerCase();
+    const format = said.startsWith("a") ? "anthropic" : "openai";
+    if (said && !ENDPOINT_FORMATS.some((value) => value.startsWith(said[0]))) throw Object.assign(new Error("Answer openai or anthropic."), { code: "endpoint_format_invalid" });
+    line(output, "Key (hidden; leave empty for none):");
+    quiet.setMuted(true);
+    let key;
+    try { key = (await readline.question("", { signal })).trim(); } finally { quiet.setMuted(false); line(output); }
+    const models = (await ask("Model IDs, separated by commas (leave empty to ask the endpoint):")).trim();
+    return { name, baseUrl, format, key, models };
+  } finally {
+    readline.close();
+  }
+}
+
+export async function runEndpointCommand({
+  args = [],
+  json = false,
+  environment = process.env,
+  input = process.stdin,
+  output = process.stdout,
+  progressOutput = process.stderr,
+  signalTarget = process,
+  interactive = Boolean(input.isTTY && progressOutput.isTTY),
+  settings = createModelSettings({ environment }),
+} = {}) {
+  const [action = "list", ...rest] = args;
+  if (action === "help" || action === "--help" || action === "-h") {
+    line(output, endpointHelpText());
+    return null;
+  }
+  if (action === "list") {
+    if (rest.length) throw new Error("moondog endpoint list takes nothing after it.");
+    const endpoints = await readEndpoints(environment);
+    line(output, json ? JSON.stringify(endpoints.map(({ key, ...shown }) => ({ ...shown, keySaved: Boolean(key) })), null, 2) : describeEndpoints(endpoints));
+    return endpoints;
+  }
+  if (action === "remove") {
+    const wanted = rest.join(" ").trim().toLowerCase();
+    if (!wanted) throw new Error("Name the endpoint to remove: moondog endpoint remove <id>.");
+    const endpoint = (await readEndpoints(environment)).find((entry) => entry.id === wanted || entry.id === `endpoint-${wanted}` || entry.name.toLowerCase() === wanted);
+    if (!endpoint) throw new Error("No endpoint has that id or name. moondog endpoint lists them.");
+    await settings.removeEndpoint(endpoint.id);
+    line(output, `Removed ${endpoint.name} and its key.`);
+    return { id: endpoint.id, name: endpoint.name, removed: true };
+  }
+  if (action !== "add") throw new Error("Unknown endpoint command. Use add, remove, list, or help.");
+  if (rest.length) throw new Error("moondog endpoint add asks for everything it needs; type the key only at its hidden prompt.");
+  if (!interactive) throw new Error("Adding an endpoint asks for its key out of sight, so it needs an interactive terminal.");
+  const controller = new AbortController();
+  const stop = () => controller.abort();
+  signalTarget.once("SIGINT", stop);
+  try {
+    const answers = await askEndpoint({ input, output: progressOutput, signal: controller.signal });
+    if (answers.models === "") line(progressOutput, "Asking the endpoint for its models...");
+    const saved = await settings.saveEndpoint(answers);
+    line(output, `Saved ${saved.name} as ${saved.id}, with ${saved.models.length} model${saved.models.length === 1 ? "" : "s"}${saved.keySaved ? " and its key" : ""}.`);
+    line(output, `Next, pick one with /model ${saved.id}.`);
+    return saved;
+  } catch (error) {
+    if (controller.signal.aborted) throw Object.assign(new Error("Adding the endpoint was cancelled."), { code: "endpoint_cancelled" });
+    throw error;
+  } finally {
+    signalTarget.removeListener("SIGINT", stop);
+  }
+}