driggsby 0.10.2 → 0.10.4

package/dist/replay/feed-frame.js

@@ -6,6 +6,12 @@
 import { CALL, LINES, OFFER_AT, STEPS } from "./att-story.js";
 import { line, padTo, seg, width } from "./paint.js";
 import { toPlay, toReal } from "./timeline.js";
+// The replay starts at 1.5x; f steps to 2x, then 1x, then back to 1.5x.
+export const SPEEDS = [1.5, 2, 1];
+export function nextSpeed(speed) {
+    const at = SPEEDS.findIndex((s) => s === speed);
+    return SPEEDS[(at + 1) % SPEEDS.length] ?? SPEEDS[0];
+}
 const C = {
     text: "#EDEDED", soft: "#C9CDD3", mute: "#8B9099", faint: "#5A5F68", ghost: "#30343B", agent: "#7DB4FF",
     music: "#A99BFB", money: "#4ADE80", live: "#F87171", liveDim: "#7A2E2E", keys: "#F5C451", ink: "#0B0C0E",
@@ -205,7 +211,7 @@ function bottomBar(real, pt, ended, w, narrow, timeline) {
 function help(input, w, narrow) {
     const keys = narrow
         ? [["space", input.paused ? "play" : "pause"], ["q", "quit"]]
-        : [["space", input.paused ? "play" : "pause"], ["f", input.fast ? "1×" : "2×"], ["r", "replay"], ["q", "quit"]];
+        : [["space", input.paused ? "play" : "pause"], ["f", `${String(nextSpeed(input.speed))}×`], ["r", "replay"], ["q", "quit"]];
     const left = keys.flatMap(([key, what], i) => [seg((i > 0 ? (narrow ? "  " : "  ·  ") : "") + key, C.mute), seg(` ${what}`, C.faint)]);
     // j belongs to the ending: nothing about it shows while the call plays.
     if (input.pt < input.timeline.endStart)

package/dist/replay/replay-command.js

@@ -1,29 +1,28 @@
 // driggsby replay att: a replay of an agent's call with AT&T about an
 // internet bill, in the terminal. On a Mac it plays with sound (recreated
 // voices, the call's real words), paced around them; elsewhere, or with
-// --quiet, it plays silently and faster. Space pauses, f plays at 2x, r
-// starts over, the arrows move two seconds, and q quits. Once the call has
-// played to the end, j votes to roll the feature out: signed in, the vote counts
-// in place; signed out, it signs in first, votes, and the command ends.
-import { spawn } from "node:child_process";
-import { existsSync } from "node:fs";
-import { fileURLToPath } from "node:url";
+// --quiet, it plays silently and faster. It starts at 1.5x. Space pauses, f
+// steps the speed (2x, 1x, back to 1.5x), r starts over, the arrows move two
+// seconds, and q quits; the voice follows each of them in place. Once the
+// call has played to the end, j votes to roll the feature out: signed in, the
+// vote counts in place; signed out, it signs in first, votes, and the command
+// ends.
 import { CliError } from "../cli-error.js";
 import { defaultCredentialEnvironment, readStoredToken } from "../credentials/store.js";
 import { deployFailure, requireDeploySession } from "../deploy/api-session.js";
 import { runLogin } from "../login/login.js";
 import { CUES, SILENT, VOICED } from "./att-story.js";
-import { MIN_COLS, MIN_ROWS, renderFrame } from "./feed-frame.js";
+import { MIN_COLS, MIN_ROWS, nextSpeed, renderFrame, SPEEDS } from "./feed-frame.js";
+import { lineAt, startVoice } from "./voice.js";
 import { castVote } from "./vote.js";
-const PLAYER = "/usr/bin/afplay";
 const TICK_MS = 33;
 const RETRY_COMMAND = "npx driggsby@latest replay att";
 export async function runReplay(options, environment = defaultCredentialEnvironment()) {
     if (!process.stdin.isTTY || !process.stdout.isTTY) {
         throw new CliError(`The replay plays in an interactive terminal. Open one and run:\n  ${RETRY_COMMAND}`, 1);
     }
-    const sound = !options.quiet && process.platform === "darwin" && existsSync(PLAYER);
-    const ending = await play(sound ? VOICED : SILENT, sound, environment);
+    const voice = options.quiet ? null : await startVoice();
+    const ending = await play(voice === null ? SILENT : VOICED, voice, environment);
     if (ending === "quit")
         return 0;
     // Signing in needs the terminal: the replay has ended, so sign in, vote, done.
@@ -47,32 +46,12 @@ async function voteSignedIn(environment) {
         return "failed";
     }
 }
-function play(timeline, sound, environment) {
+function play(timeline, voice, environment) {
     const stdin = process.stdin;
     const stdout = process.stdout;
-    const playing = new Set();
-    // SIGKILL, so a line frozen by a pause (SIGSTOP) stops too.
-    const hush = () => {
-        for (const child of playing)
-            child.kill("SIGKILL");
-        playing.clear();
-    };
-    // A pause freezes whatever is being said and a resume picks it up where it
-    // stopped, instead of cutting it off until the next line.
-    const freeze = (frozen) => {
-        for (const child of playing)
-            child.kill(frozen ? "SIGSTOP" : "SIGCONT");
-    };
-    const playCue = (file, fast) => {
-        const path = fileURLToPath(new URL(`../../assets/replay/${file}`, import.meta.url));
-        const child = spawn(PLAYER, fast ? ["-r", "2", path] : [path], { stdio: "ignore" });
-        child.on("error", () => playing.delete(child));
-        child.on("exit", () => playing.delete(child));
-        playing.add(child);
-    };
     let pt = 0;
     let paused = false;
-    let fast = false;
+    let speed = SPEEDS[0];
     let vote = "idle";
     let last = Date.now();
     // A full-screen app: the whole terminal, the header at the top and the
@@ -80,12 +59,19 @@ function play(timeline, sound, environment) {
     const draw = () => {
         const cols = Math.max(MIN_COLS, stdout.columns - 1);
         const rows = Math.max(MIN_ROWS, stdout.rows);
-        const frame = renderFrame({ pt, nowMs: Date.now(), cols, rows, timeline, vote, paused, fast });
+        const frame = renderFrame({ pt, nowMs: Date.now(), cols, rows, timeline, vote, paused, speed });
         stdout.write(`\u001b[H${frame.join("\r\n")}`);
     };
+    // A jump picks up whatever line is being said at the new moment, mid-word.
     const seek = (to) => {
-        hush();
         pt = Math.max(0, Math.min(timeline.total, to));
+        if (voice === null)
+            return;
+        const line = lineAt(CUES, pt);
+        if (line === null)
+            voice.stop();
+        else
+            voice.play(line.file, line.offset, speed, paused);
     };
     return new Promise((resolve) => {
         stdout.write("\u001b[?1049h\u001b[?25l\u001b[2J");
@@ -97,7 +83,7 @@ function play(timeline, sound, environment) {
                 return;
             done = true;
             clearInterval(timer);
-            hush();
+            voice?.close();
             stdin.off("data", onKey);
             stdin.setRawMode(false);
             stdin.pause();
@@ -139,15 +125,18 @@ function play(timeline, sound, environment) {
             }
             else if (key === " ") {
                 paused = !paused;
-                freeze(paused);
+                if (paused)
+                    voice?.pause();
+                else
+                    voice?.resume();
             }
             else if (key === "f") {
-                // The line being said finishes at its own speed; the next plays faster.
-                fast = !fast;
+                speed = nextSpeed(speed);
+                voice?.rate(speed);
             }
             else if (key === "r") {
-                seek(0);
                 paused = false;
+                seek(0);
             }
             else if (key === "\u001b[C")
                 seek(pt + 2);
@@ -160,11 +149,11 @@ function play(timeline, sound, environment) {
             const dt = (now - last) / 1000;
             last = now;
             if (!paused && pt < timeline.total) {
-                const next = Math.min(timeline.total, pt + dt * (fast ? 2 : 1));
-                if (sound)
+                const next = Math.min(timeline.total, pt + dt * speed);
+                if (voice !== null)
                     for (const cue of CUES)
                         if (cue.at > pt && cue.at <= next)
-                            playCue(cue.file, fast);
+                            voice.play(cue.file, 0, speed, false);
                 pt = next;
             }
             draw();

package/dist/replay/voice.js

@@ -0,0 +1,130 @@
+// The replay's voice on a Mac: one player, macOS's own, driven over a pipe
+// through the built-in osascript. It pauses, resumes, changes speed and
+// stops in place and at once, and only one line ever plays. When the replay
+// ends, or its process dies, the pipe closes and the player stops and exits.
+import { spawn } from "node:child_process";
+import { existsSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+const OSASCRIPT = "/usr/bin/osascript";
+const READY_MS = 3_000;
+// Commands arrive one per line, tab-separated: play <path> <offset> <rate>
+// <paused 0|1>, pause, resume, rate <rate>, stop. A play past the end of its
+// file stays silent, and a resume only continues a line a pause (or a paused
+// jump) held, never one that had already finished. End of input stops the
+// player and exits.
+const PLAYER_SCRIPT = `
+ObjC.import("AVFoundation");
+ObjC.import("Foundation");
+function run() {
+  const input = $.NSFileHandle.fileHandleWithStandardInput;
+  const output = $.NSFileHandle.fileHandleWithStandardOutput;
+  output.writeData($("ready\\n").dataUsingEncoding($.NSUTF8StringEncoding));
+  let player = null;
+  let held = false;
+  let buffer = "";
+  for (;;) {
+    const data = input.availableData;
+    if (Number(data.length) === 0) break;
+    buffer += $.NSString.alloc.initWithDataEncoding(data, $.NSUTF8StringEncoding).js;
+    let end;
+    while ((end = buffer.indexOf("\\n")) >= 0) {
+      const parts = buffer.slice(0, end).split("\\t");
+      buffer = buffer.slice(end + 1);
+      const command = parts[0];
+      if (command === "play") {
+        if (player) player.stop;
+        player = null;
+        held = false;
+        const next = $.AVAudioPlayer.alloc.initWithContentsOfURLError($.NSURL.fileURLWithPath(parts[1]), null);
+        const offset = Number(parts[2]);
+        if (!next.isNil() && offset >= 0 && offset < next.duration) {
+          next.enableRate = true;
+          next.prepareToPlay;
+          next.rate = Number(parts[3]);
+          next.currentTime = offset;
+          if (parts[4] === "1") held = true;
+          else next.play;
+          player = next;
+        }
+      } else if (command === "pause") {
+        held = Boolean(player && player.playing);
+        if (held) player.pause;
+      } else if (command === "resume") {
+        if (held) player.play;
+        held = false;
+      } else if (command === "rate") {
+        if (player) player.rate = Number(parts[1]);
+      } else if (command === "stop") {
+        if (player) player.stop;
+        player = null;
+        held = false;
+      }
+    }
+  }
+  if (player) player.stop;
+}
+`;
+// The line under a moment of the replay: the last sound started at or before
+// it, and how far into it the moment is (past its end, the player stays silent).
+export function lineAt(cues, pt) {
+    let found = null;
+    for (const cue of cues) {
+        if (cue.at > pt)
+            break;
+        found = cue;
+    }
+    return found === null ? null : { file: found.file, offset: pt - found.at };
+}
+// One command line for the player; null for a path it couldn't carry.
+export function playerCommand(parts) {
+    const fields = parts.map(String);
+    return fields.some((field) => /[\t\n\r]/.test(field)) ? null : `${fields.join("\t")}\n`;
+}
+// The player, ready to speak, or null where there is none (not a Mac, or it
+// didn't start): the replay then plays silently.
+export function startVoice() {
+    if (process.platform !== "darwin" || !existsSync(OSASCRIPT))
+        return Promise.resolve(null);
+    return new Promise((resolve) => {
+        const child = spawn(OSASCRIPT, ["-l", "JavaScript", "-e", PLAYER_SCRIPT], { stdio: ["pipe", "pipe", "ignore"] });
+        let settled = false;
+        const settle = (voice) => {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(timer);
+            if (voice === null)
+                child.kill();
+            resolve(voice);
+        };
+        const timer = setTimeout(() => { settle(null); }, READY_MS);
+        child.on("error", () => { settle(null); });
+        child.on("exit", () => { settle(null); });
+        // The player may be gone before a write lands; a lost line is silence.
+        child.stdin.on("error", () => undefined);
+        child.stdout.on("data", (chunk) => {
+            if (chunk.toString("utf8").includes("ready"))
+                settle(voiceOver(child));
+        });
+    });
+}
+function voiceOver(child) {
+    const send = (parts) => {
+        const line = playerCommand(parts);
+        if (line !== null && child.stdin.writable)
+            child.stdin.write(line);
+    };
+    return {
+        play: (file, offset, rate, paused) => {
+            send(["play", fileURLToPath(new URL(`../../assets/replay/${file}`, import.meta.url)), offset.toFixed(3), rate, paused ? 1 : 0]);
+        },
+        pause: () => { send(["pause"]); },
+        resume: () => { send(["resume"]); },
+        rate: (rate) => { send(["rate", rate]); },
+        stop: () => { send(["stop"]); },
+        close: () => {
+            send(["stop"]);
+            child.stdin.end();
+        },
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "driggsby",
-  "version": "0.10.2",
+  "version": "0.10.4",
   "description": "Set up and build on Driggsby, the MCP server for personal finance.",
   "license": "Apache-2.0 AND OFL-1.1",
   "repository": {
@@ -31,7 +31,7 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@driggsby/deploy": "0.10.2",
-    "@driggsby/sdk": "0.10.2"
+    "@driggsby/deploy": "0.10.4",
+    "@driggsby/sdk": "0.10.4"
   }
 }