@thedevlabs-io/labd 0.6.1 → 0.7.0

package/README.md

@@ -129,7 +129,7 @@ more columns.
 | `/sessions`, `/session` | earlier sessions here (a dialog; `enter` resumes); where this one is stored |
 | `/new` | start a fresh session; the current one stays saved |
 | `/sidebar`, `/clear` | show or hide the side panel; clear the screen |
-| `/usage` | what's left of this month's allowance |
+| `/usage` | what's left of this month's allowance, and a heatmap of your activity |
 | `/trust` | let this project load its own extensions |
 | `/reload` | reload extensions and the file list |
 | `/quit` | leave - the session is saved, and `labd --resume <id>` continues it |

package/dist/labd.js

@@ -3,6 +3,117 @@
 // packages/cli/src/index.ts
 import { resolve } from "node:path";
 
+// vendor/labd/packages/protocol/src/activity.ts
+var ACTIVITY_WEEKS = 53;
+function utcOffsetMinutes(at2 = /* @__PURE__ */ new Date()) {
+  return -at2.getTimezoneOffset();
+}
+var DAY_MS = 864e5;
+function localDate(at2 = /* @__PURE__ */ new Date()) {
+  const pad4 = (n) => String(n).padStart(2, "0");
+  return `${at2.getFullYear()}-${pad4(at2.getMonth() + 1)}-${pad4(at2.getDate())}`;
+}
+function dayNumber(date) {
+  return Math.floor(Date.parse(`${date}T00:00:00Z`) / DAY_MS);
+}
+function dateOf(day) {
+  return new Date(day * DAY_MS).toISOString().slice(0, 10);
+}
+function summariseActivity(activity, weeks, today = localDate()) {
+  const span = Math.max(1, Math.min(ACTIVITY_WEEKS, Math.floor(weeks)));
+  const last = dayNumber(today);
+  const monday = last - (last + 3) % 7;
+  const first = monday - (span - 1) * 7;
+  const earliest = monday - (ACTIVITY_WEEKS - 1) * 7;
+  const perDay = /* @__PURE__ */ new Map();
+  const perSurface = /* @__PURE__ */ new Map();
+  const totals = { turns: 0, input: 0, output: 0, activeDays: 0 };
+  for (const bucket of activity.days) {
+    const day = dayNumber(bucket.day);
+    if (!(day >= earliest && day <= last)) continue;
+    const tokens = bucket.input + bucket.output;
+    const d = perDay.get(day) ?? { turns: 0, tokens: 0 };
+    d.turns += bucket.turns;
+    d.tokens += tokens;
+    perDay.set(day, d);
+    if (day < first) continue;
+    const s = perSurface.get(bucket.surface) ?? { turns: 0, tokens: 0 };
+    s.turns += bucket.turns;
+    s.tokens += tokens;
+    perSurface.set(bucket.surface, s);
+    totals.turns += bucket.turns;
+    totals.input += bucket.input;
+    totals.output += bucket.output;
+  }
+  let run = 0;
+  let longest = 0;
+  for (let day = earliest; day <= last; day++) {
+    if ((perDay.get(day)?.turns ?? 0) > 0) {
+      run += 1;
+      longest = Math.max(longest, run);
+    } else if (day !== last) {
+      run = 0;
+    }
+  }
+  const shown = [...perDay.entries()].filter(([day]) => day >= first).map(([, d]) => d.tokens);
+  const ranked = [...new Set(shown.filter((t) => t > 0))].sort((a, b) => a - b);
+  const days = [];
+  let busiest = null;
+  for (let day = first; day <= last; day++) {
+    const d = perDay.get(day) ?? { turns: 0, tokens: 0 };
+    const entry = { date: dateOf(day), turns: d.turns, tokens: d.tokens, level: levelFor(d.tokens, ranked) };
+    days.push(entry);
+    if (d.turns > 0) totals.activeDays += 1;
+    if (d.tokens > 0 && (!busiest || d.tokens > busiest.tokens)) busiest = entry;
+  }
+  const hours = activity.hours.length === 24 ? activity.hours : [];
+  const peak = Math.max(0, ...hours);
+  return {
+    days,
+    totals,
+    streak: { current: run, longest },
+    peakHour: peak > 0 ? hours.indexOf(peak) : null,
+    busiest,
+    surfaces: [...perSurface.entries()].map(([surface, s]) => ({ surface, ...s })).sort((a, b) => b.tokens - a.tokens || a.surface.localeCompare(b.surface))
+  };
+}
+function levelFor(tokens, ranked) {
+  if (!(tokens > 0)) return 0;
+  if (ranked.length === 1) return 4;
+  return 1 + Math.round(3 * ranked.indexOf(tokens) / (ranked.length - 1));
+}
+function formatTokens(n) {
+  const units = ["", "k", "M", "B"];
+  let value = n;
+  let unit = 0;
+  while (value >= 999.5 && unit < units.length - 1) {
+    value /= 1e3;
+    unit += 1;
+  }
+  const shown = unit === 0 || value >= 10 ? String(Math.round(value)) : value.toFixed(1).replace(/\.0$/, "");
+  return `${shown}${units[unit]}`;
+}
+function surfaceLabel(surface) {
+  switch (surface) {
+    case "web":
+      return "portal";
+    case "vscode":
+      return "editor";
+    case "cli":
+      return "terminal";
+    case "memory":
+      return "memory (background)";
+    case "api":
+      return "API";
+    default:
+      return surface;
+  }
+}
+function formatHour(hour) {
+  const h = hour % 12 === 0 ? 12 : hour % 12;
+  return `${h}${hour < 12 ? "am" : "pm"}`;
+}
+
 // vendor/labd/packages/protocol/src/tags.ts
 var TAG = /(^|[\s([])@(?:"([^"\n]+)"|([^\s"]+))/g;
 var TRAILING = /[.,;:!?)\]}'"]+$/;
@@ -1556,8 +1667,6 @@ async function runTurn(question, opts) {
           needTools = true;
           return "go";
         case "done":
-          result.context = event.context;
-          result.credits = event.credits;
           ui.done?.({ credits: event.credits, context: event.context });
           return "go";
         case "error":
@@ -2001,6 +2110,18 @@ var AgentClient = class {
       return null;
     }
   }
+  /** The learner's usage by local hour, for the heatmap under `/usage`. */
+  async activity(offsetMinutes) {
+    try {
+      const res = await this.fetch(`${this.opts.baseUrl}/v1/usage/activity?offset=${offsetMinutes}`, { headers: this.headers() });
+      if (!res.ok) return null;
+      const body2 = await res.json();
+      if (!Array.isArray(body2.days) || !Array.isArray(body2.hours)) return null;
+      return { days: body2.days.filter(isBucket), hours: body2.hours.map((n) => isCount(n) ? n : 0) };
+    } catch {
+      return null;
+    }
+  }
   /**
    * Tell the server this conversation is over and can be distilled into memory.
    *
@@ -2078,6 +2199,13 @@ var AgentClient = class {
     }
   }
 };
+function isBucket(value) {
+  const b = value;
+  return typeof b?.day === "string" && typeof b.surface === "string" && [b.turns, b.input, b.output].every(isCount);
+}
+function isCount(n) {
+  return typeof n === "number" && Number.isFinite(n);
+}
 
 // packages/tui/src/theme.ts
 var ESC = "\x1B";
@@ -2103,6 +2231,14 @@ var paint = {
    * Closes the foreground only, so it can sit inside a `band` without ending it.
    */
   accent: wrap("38;5;214", "39"),
+  /**
+   * The heatmap's lower steps, walking the same orange down the cube towards
+   * brown, with `accent` as the top one. The heatmap changes glyph with each
+   * step too, so a light terminal where brown reads heavier is still legible.
+   */
+  heat1: wrap("38;5;94", "39"),
+  heat2: wrap("38;5;130", "39"),
+  heat3: wrap("38;5;172", "39"),
   bold: wrap("1", "22"),
   dim: wrap("2", "22"),
   muted: wrap("90"),
@@ -2383,8 +2519,7 @@ function statusLine(info2) {
   if (info2.effort) bits.push(paint.muted(`think ${info2.effort}`));
   const mode = info2.mode === "agent" ? paint.red(paint.bold("agent")) : info2.mode === "auto" ? paint.accent("auto") : paint.muted("ask");
   bits.push(mode);
-  const left = info2.busy ? `${paint.accent(FACE)} ${paint.dim(info2.busy)}` : paint.dim(FACE);
-  return `${left}  ${paint.dim("|")} ${bits.join(paint.dim(" | "))}`;
+  return `${paint.dim(FACE)}  ${paint.dim("|")} ${bits.join(paint.dim(" | "))}`;
 }
 function spinnerFrame(tick) {
   const dots = ".".repeat(tick % 3 + 1).padEnd(3);
@@ -3611,6 +3746,78 @@ var Viewport = class {
   }
 };
 
+// packages/tui/src/heatmap.ts
+var INDENT = "  ";
+var DAY_LABEL = ["Mon", "   ", "Wed", "   ", "Fri", "   ", "Sun"];
+var GUTTER = INDENT.length + 4;
+var MIN_WEEKS = 4;
+var GLYPH = { 0: "\xB7", 1: "\u2591", 2: "\u2592", 3: "\u2593", 4: "\u2588" };
+var SHADE = {
+  0: paint.dim,
+  1: paint.heat1,
+  2: paint.heat2,
+  3: paint.heat3,
+  4: paint.accent
+};
+function heatmapWeeks(width) {
+  return Math.max(MIN_WEEKS, Math.min(ACTIVITY_WEEKS, Math.floor((width - GUTTER) / 2)));
+}
+function heatmapLines(summary, width) {
+  const { days, totals, streak } = summary;
+  const columns = Math.ceil(days.length / 7);
+  const lines = [`${INDENT}${paint.muted(`last ${columns} weeks`)}`, `${" ".repeat(GUTTER)}${monthRow(days, columns)}`];
+  for (let row2 = 0; row2 < 7; row2++) {
+    let cells = "";
+    for (let column = 0; column < columns; column++) {
+      const day = days[column * 7 + row2];
+      cells += day ? `${SHADE[day.level](GLYPH[day.level])} ` : "  ";
+    }
+    lines.push(`${INDENT}${paint.dim(DAY_LABEL[row2])} ${cells.trimEnd()}`);
+  }
+  const legend = [0, 1, 2, 3, 4].map((l) => SHADE[l](GLYPH[l])).join(" ");
+  lines.push(`${" ".repeat(GUTTER)}${paint.dim("less")} ${legend} ${paint.dim("more")}`, "");
+  const row = (label2, value) => `${INDENT}${paint.muted(label2.padEnd(10))}${value}`;
+  lines.push(
+    row("tokens", `${paint.bold(formatTokens(totals.input + totals.output))} ${paint.dim(`${formatTokens(totals.input)} in \xB7 ${formatTokens(totals.output)} out`)}`),
+    row("requests", `${paint.bold(String(totals.turns))} ${paint.dim(`on ${plural(totals.activeDays, "day")}`)}`),
+    row("streak", `${paint.bold(plural(streak.current, "day"))} ${paint.dim(`longest ${plural(streak.longest, "day")}`)}`)
+  );
+  if (summary.busiest) {
+    lines.push(row("busiest", `${paint.bold(dayName(summary.busiest.date))} ${paint.dim(`${formatTokens(summary.busiest.tokens)} tokens`)}`));
+  }
+  if (summary.peakHour !== null) lines.push(row("peak hour", paint.bold(formatHour(summary.peakHour))));
+  const where = summary.surfaces.map((s) => `${surfaceLabel(s.surface)} ${paint.bold(formatTokens(s.tokens))}`);
+  const joined = row("where", where.join(paint.dim(" \xB7 ")));
+  if (!where.length) return lines;
+  if (visibleWidth(joined) <= width) lines.push(joined);
+  else where.forEach((w, i) => lines.push(row(i === 0 ? "where" : "", w)));
+  return lines;
+}
+function monthRow(days, columns) {
+  const starts = [];
+  for (let column = 0; column < columns; column++) {
+    const week = days.slice(column * 7, column * 7 + 7);
+    const first = column === 0 ? week[0] : week.find((d) => d.date.endsWith("-01"));
+    if (first && column + 1 < columns) starts.push({ column, date: first.date });
+  }
+  if (starts.length > 1 && starts[1].column < 2) starts.shift();
+  let out = "";
+  for (const { column, date } of starts) {
+    out = out.padEnd(column * 2) + localDay(date).toLocaleDateString("en-GB", { month: "short" }).slice(0, 3);
+  }
+  return paint.dim(out);
+}
+function localDay(date) {
+  const [y, m, d] = date.split("-").map(Number);
+  return new Date(y, m - 1, d);
+}
+function dayName(date) {
+  return localDay(date).toLocaleDateString("en-GB", { day: "numeric", month: "short" });
+}
+function plural(n, word) {
+  return `${n} ${word}${n === 1 ? "" : "s"}`;
+}
+
 // packages/tui/src/face.ts
 var FACE_ART = [
   "  \u250F\u2501                      \u2501\u2513  ",
@@ -4130,7 +4337,7 @@ var BUILTIN_COMMANDS = [
   { name: "session", what: "where this one is stored" },
   { name: "rename", args: "<name>", what: "name this session, so /sessions and --resume show it" },
   { name: "new", what: "start a fresh session; this one stays saved" },
-  { name: "usage", what: "what's left of this month's allowance" },
+  { name: "usage", what: "what's left of this month's allowance, and your activity" },
   { name: "trust", what: "let this project load its own extensions" },
   { name: "logout", what: "sign this machine out and leave" },
   { name: "reload", what: "reload extensions and the file list" },
@@ -4440,12 +4647,23 @@ async function handleCommand(input, ctx) {
       return { effort: args };
     }
     case "usage": {
-      const credits = await runtime.client.credits();
+      const [credits, activity] = await Promise.all([
+        runtime.client.credits(),
+        runtime.client.activity(utcOffsetMinutes())
+      ]);
       if (!credits) {
         print(`  ${paint.muted("Couldn't check that just now.")}`);
       } else {
         print(`  ${paint.bold(`${credits.percentLeft}%`)} ${paint.muted("of this month left")}`);
       }
+      if (activity && !activity.days.length) {
+        print(`  ${paint.muted("No activity yet. Ask labd something and it shows up here.")}`);
+      } else if (activity) {
+        print("");
+        print(heatmapLines(summariseActivity(activity, heatmapWeeks(ctx.width)), ctx.width).join("\n"));
+      } else if (credits) {
+        print(`  ${paint.muted("Couldn't read your activity just now.")}`);
+      }
       return {};
     }
     case "tree": {
@@ -4474,9 +4692,12 @@ async function handleCommand(input, ctx) {
         print(`  ${paint.yellow("!")} ${paint.muted(`no point here starts with "${args}"`)}`);
         return {};
       }
+      const moved = match.id !== runtime.session.headId;
       runtime.session.moveTo(match.id);
-      print(`  ${paint.muted(`continuing from ${match.id.slice(0, 8)}. The other branch is still in the file.`)}`);
-      return {};
+      print(
+        `  ${paint.muted(moved ? `continuing from ${match.id.slice(0, 8)}. The other branch is still in the file.` : `already at ${match.id.slice(0, 8)}.`)}`
+      );
+      return { moved };
     }
     case "sessions": {
       const bucket = dirname3(runtime.session.file);
@@ -4792,6 +5013,7 @@ async function runInteractive(runtime) {
           mode: state.mode,
           effort: state.effort,
           asked: answered > 0,
+          width: process.stdout.columns ?? 80,
           print: (text) => renderer.print(text)
         });
         if (outcome.farewell) process.stderr.write(`${outcome.farewell}
@@ -4799,6 +5021,7 @@ async function runInteractive(runtime) {
         if (outcome.exit) break;
         if (outcome.mode) state.mode = outcome.mode;
         if (outcome.effort !== void 0) state.effort = outcome.effort;
+        if (outcome.moved) state.context = null;
         continue;
       }
       const tags = taggedPaths(input);
@@ -4913,6 +5136,7 @@ async function runInteractive(runtime) {
       if (state.context && state.context.percentUsed >= COMPACT_AT) {
         startSpinner("summarising, to make room");
         const ok = await compact({ session: runtime.session, client: runtime.client, root: runtime.root });
+        if (ok) state.context = null;
         stopSpinner();
         renderer.print(paint.dim(ok ? "  summarised the conversation so far." : "  (could not summarise; carrying on)"));
       }
@@ -5511,6 +5735,7 @@ async function runScreen(runtime, opts) {
       mode: state.mode,
       effort: state.effort,
       asked: state.asked,
+      width: layout({ rows: screen.rows, columns: screen.columns, editorLines: editor.lineCount, sidebar: state.sidebar }).transcript.width,
       print: (text) => note(text)
     });
     if (outcome.farewell) state.farewell = outcome.farewell;
@@ -5520,6 +5745,7 @@ async function runScreen(runtime, opts) {
       state.heldMode = null;
     }
     if (outcome.effort !== void 0) state.effort = outcome.effort;
+    if (outcome.moved) state.context = null;
     schedule();
   }
   function helpLines() {
@@ -5592,6 +5818,7 @@ async function runScreen(runtime, opts) {
     if (state.asked) await closeConversation(runtime);
     runtime.session = Session.open(file);
     state.asked = false;
+    state.context = null;
     transcript.clear();
     state.toolBlocks.clear();
     state.answer = null;
@@ -5602,6 +5829,7 @@ async function runScreen(runtime, opts) {
     if (state.asked) await closeConversation(runtime);
     runtime.session = Session.create(bucketFor(runtime.stateDir, runtime.root));
     state.asked = false;
+    state.context = null;
     transcript.clear();
     state.toolBlocks.clear();
     state.answer = null;
@@ -5728,8 +5956,10 @@ async function runScreen(runtime, opts) {
       if (!abort.signal.aborted && state.context && state.context.percentUsed >= COMPACT_AT) {
         setBusy("summarising, to make room");
         const ok = await compact({ session: runtime.session, client: runtime.client, root: runtime.root });
-        if (ok) transcript.add({ kind: "compaction" });
-        else note(paint.dim("  (could not summarise; carrying on)"));
+        if (ok) {
+          state.context = null;
+          transcript.add({ kind: "compaction" });
+        } else note(paint.dim("  (could not summarise; carrying on)"));
       }
     } catch (err) {
       transcript.add({ kind: "error", text: err instanceof Error ? err.message : String(err) });
@@ -6153,7 +6383,7 @@ async function runRpc(runtime) {
 }
 
 // packages/cli/src/index.ts
-var VERSION = true ? "0.6.1" : "0.0.0-dev";
+var VERSION = true ? "0.7.0" : "0.0.0-dev";
 async function main(argv) {
   const args = parse(argv);
   if (args.color !== void 0) setColor(args.color);