@yegor256/jinka 0.0.4 → 0.0.6

package/src/status.js

@@ -5,22 +5,23 @@ import { styleText } from 'node:util';
 import { Duration } from './duration.js';
 
 export class Status {
-  constructor(version, start, agent, model, tokens, quota) {
-    this.version = version;
+  constructor(start, jobs, agent, model, tokens, quota) {
     this.start = start;
+    this.jobs = jobs;
     this.agent = agent;
     this.model = model;
     this.tokens = tokens;
     this.quota = quota;
   }
   text() {
+    const now = Date.now();
     return [
-      `jinka ${styleText('bgGray', this.version, { validateStream: false })}`,
-      `up ${styleText('bgGray', new Duration(Date.now() - this.start).hours(), { validateStream: false })}`,
-      `agent ${styleText('bgGray', this.agent, { validateStream: false })}`,
-      `model ${styleText('bgGray', this.model === '' ? 'default' : this.model, { validateStream: false })}`,
-      `tokens ${styleText('bgGray', this.tokens.text(), { validateStream: false })}`,
-      `5h-quota [${styleText('bgGray', this.quota.text(), { validateStream: false })}]`
-    ].join(', ');
+      `up:${styleText('bgGray', new Duration(now - this.start).hours(), { validateStream: false })}`,
+      `done:${styleText('bgGray', this.jobs.text(), { validateStream: false })}`,
+      `agent:${styleText('bgGray', this.agent, { validateStream: false })}`,
+      `model:${styleText('bgGray', this.model === '' ? 'default' : this.model, { validateStream: false })}`,
+      `tokens:${styleText('bgGray', this.tokens.text(), { validateStream: false })}`,
+      `quota:${styleText('bgGray', this.quota.text(now), { validateStream: false })}`
+    ].join(' ');
   }
 }

package/src/summarized.js

@@ -0,0 +1,30 @@
+// SPDX-FileCopyrightText: Copyright (c) 2026 Yegor Bugayenko
+// SPDX-License-Identifier: MIT
+
+export class Summarized {
+  constructor(screen, summary, stream) {
+    this.screen = screen;
+    this.summary = summary;
+    this.stream = stream;
+    this.done = [];
+  }
+  row(index) {
+    return this.screen.row(index);
+  }
+  notice() {
+    return this.screen.notice();
+  }
+  up() {
+    this.screen.up();
+  }
+  down() {
+    this.screen.down();
+  }
+  close() {
+    this.screen.close();
+    if (this.done.length === 0) {
+      this.done.push(true);
+      this.stream.write(this.summary.text());
+    }
+  }
+}

package/src/summary.js

@@ -0,0 +1,26 @@
+// SPDX-FileCopyrightText: Copyright (c) 2026 Yegor Bugayenko
+// SPDX-License-Identifier: MIT
+
+import { existsSync, readdirSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { sep } from 'node:path';
+import { Duration } from './duration.js';
+
+export class Summary {
+  constructor(start, version, jobs, setup) {
+    this.start = start;
+    this.version = version;
+    this.jobs = jobs;
+    this.setup = setup;
+  }
+  text() {
+    return [
+      '---',
+      `jinka ${this.version} finished in ${new Duration(Date.now() - this.start).hours()}`,
+      `agent: ${this.setup.agent}, model: ${this.setup.model === '' ? 'default' : this.setup.model}, effort: ${this.setup.effort === '' ? 'default' : this.setup.effort}`,
+      `sessions finished: ${this.jobs.text()}`,
+      `wishes remained in ${this.setup.wishes.startsWith(`${homedir()}${sep}`) ? `~${this.setup.wishes.slice(homedir().length)}` : this.setup.wishes}: ${existsSync(this.setup.wishes) ? readdirSync(this.setup.wishes, { recursive: true, withFileTypes: true }).filter((f) => f.isFile() && f.name.endsWith('.md')).length : 0}`,
+      ''
+    ].join('\n');
+  }
+}

package/src/throttled.js

@@ -0,0 +1,34 @@
+// SPDX-FileCopyrightText: Copyright (c) 2026 Yegor Bugayenko
+// SPDX-License-Identifier: MIT
+
+import { setTimeout } from 'node:timers/promises';
+import { Duration } from './duration.js';
+
+export class Throttled {
+  constructor(origin, quota, throttle, interval, notice) {
+    this.origin = origin;
+    this.quota = quota;
+    this.throttle = throttle;
+    this.interval = interval;
+    this.notice = notice;
+  }
+  async next(signal) {
+    await this.#wait(signal, true);
+    return this.origin.next(signal);
+  }
+  async #wait(signal, first) {
+    signal.throwIfAborted();
+    const left = this.quota.left(Date.now());
+    if (left >= this.throttle && first) {
+      return;
+    }
+    const share = `${Math.round(left)}% of the ${this.quota.name(Date.now())} quota is left`;
+    if (left >= this.throttle) {
+      this.notice.warn(`now ${share}, not below ${this.throttle}%, new jobs resume`);
+      return;
+    }
+    this.notice.warn(`${first ? '' : 'still '}only ${share}, below ${this.throttle}%, new jobs wait, next check in ${new Duration(this.interval).phrase()}`);
+    await setTimeout(this.interval, undefined, { signal });
+    await this.#wait(signal, false);
+  }
+}

package/src/tokens.js

@@ -15,6 +15,9 @@ export class Tokens {
             .reduce((sum, key) => sum + (json.message.usage[key] ?? 0), 0)
         );
       }
+      if (json.type === 'turn.completed' && json.usage !== undefined) {
+        this.messages.set(Symbol('turn'), (json.usage.input_tokens ?? 0) + (json.usage.output_tokens ?? 0));
+      }
     } catch {
       return;
     }

package/src/tty.js

@@ -1,10 +1,12 @@
 // SPDX-FileCopyrightText: Copyright (c) 2026 Yegor Bugayenko
 // SPDX-License-Identifier: MIT
 
-import { stripVTControlCharacters } from 'node:util';
+import { stripVTControlCharacters, styleText } from 'node:util';
 import sliceAnsi from 'slice-ansi';
 import { Row } from './row.js';
+import { Protocol } from './protocol.js';
 import { Duration } from './duration.js';
+import { Logo } from './logo.js';
 
 export class Tty {
   constructor(stream, crew, status, legend) {
@@ -15,17 +17,26 @@ export class Tty {
     this.lines = new Map();
     this.notes = [];
     this.clock = [];
+    this.view = { depth: 0 };
   }
   row(index) {
     return new Row({ push: ([i, text]) => this.#update(i, text) }, index);
   }
   notice() {
-    return new Row({ push: ([, text]) => this.#note(text) }, 0);
+    return new Protocol({ push: ([level, text]) => this.#note(level === 'warn' ? `\x1b[38;2;255;135;0m${text}\x1b[39m` : text) });
+  }
+  up() {
+    this.view.depth += 1;
+    this.#redraw();
+  }
+  down() {
+    this.view.depth = Math.max(0, this.view.depth - 1);
+    this.#redraw();
   }
   close() {
     this.clock.splice(0).forEach((c) => {
       clearInterval(c);
-      this.stream.write('\x1b[?25h\x1b[?1049l');
+      this.stream.write('\x1b[?1007l\x1b[?25h\x1b[?1049l');
       this.stream.write(this.notes.map((n) => `${n}\n`).join(''));
     });
   }
@@ -37,43 +48,54 @@ export class Tty {
   }
   #note(text) {
     this.notes.push(
-      `${new Date().toTimeString().slice(0, 8)} ${text.replace(/https:\/\/github\.com\/([^/\s]+\/[^/\s]+)\/(?:issues|pull)\/(\d+)/g, (url, repo, number) => `\x1b]8;;${url}\x07\x1b[34m${repo}#${number}\x1b[39m\x1b]8;;\x07`)}`
+      `${new Date().toTimeString().slice(0, 8)} ${text.replace(/https:\/\/github\.com\/([^/\s]+\/[^/\s]+)\/(?:issues|pull)\/(\d+)/g, (url, repo, number) => `\x1b]8;;${url}\x07\x1b[38;2;106;113;247m${repo}#${number}\x1b[39m\x1b]8;;\x07`)}`
     );
+    if (this.view.depth > 0) {
+      this.view.depth += this.#wrap(this.notes.at(-1), this.stream.columns || 80).length;
+    }
     this.#paint();
   }
   #paint() {
     if (this.clock.length === 0) {
-      this.stream.write('\x1b[?1049h\x1b[?25l');
+      this.stream.write('\x1b[?1049h\x1b[?25l\x1b[?1007h');
       this.clock.push(setInterval(() => this.#draw(), 1000).unref());
-      this.stream.on('resize', () => {
-        if (this.clock.length > 0) {
-          this.#draw();
-        }
-      });
+      this.stream.on('resize', () => this.#redraw());
     }
     this.#draw();
   }
+  #redraw() {
+    if (this.clock.length > 0) {
+      this.#draw();
+    }
+  }
   #draw() {
     const rows = this.stream.rows || 24;
     const lines = this.crew.indexes().map((i) => [i, this.lines.get(i) ?? { head: '', tail: '', start: Date.now() }]);
     const width = Math.max(...lines.map(([, l]) => stripVTControlCharacters(l.head).length));
     const columns = this.stream.columns || 80;
     const notes = this.notes.flatMap((n) => this.#wrap(n, columns));
+    const height = Math.max(0, rows - lines.length - 5);
+    this.view.depth = Math.min(this.view.depth, Math.max(0, notes.length - height));
+    const [upper, lower] = new Logo().lines();
     const top = [
-      this.status.text(),
-      '',
-      ...lines.map(([, l]) => `${l.head}${' '.repeat(width - stripVTControlCharacters(l.head).length)}  ${new Duration(Date.now() - l.start).minutes()}  ${l.tail}`),
+      `${upper} ${this.status.text()}`,
+      lower,
+      ...lines.map(([, l]) => `${l.head}${' '.repeat(width - stripVTControlCharacters(l.head).length)}  ${styleText(['', 'idle'].includes(stripVTControlCharacters(l.head)) ? 'gray' : 'green', new Duration(Date.now() - l.start).clock(), { validateStream: false })}  ${l.tail}`),
       '-'.repeat(10),
-      ...notes.slice(Math.max(0, notes.length - Math.max(0, rows - lines.length - 5)))
+      ...notes.slice(Math.max(0, notes.length - height - this.view.depth), notes.length - this.view.depth)
     ];
     this.stream.write(
       `\x1b[H${
-        [...top, ...Array(Math.max(1, rows - top.length - 1)).fill(''), this.legend.text()]
+        [...top, ...Array(Math.max(1, rows - top.length - 1)).fill(''), this.#edge(this.legend.text(), columns)]
           .map((l) => `\x1b[2K${sliceAnsi(l, 0, columns)}\x1b[0m`)
           .join('\n')
       }\x1b[J`
     );
   }
+  #edge(text, width) {
+    const [left, right] = text.split('\t');
+    return `${left}${' '.repeat(Math.max(1, width - 1 - stripVTControlCharacters(left).length - stripVTControlCharacters(right).length))}${right}`;
+  }
   #wrap(text, width) {
     return stripVTControlCharacters(text).length <= width || width < 3 ? [text] : [sliceAnsi(text, 0, width), ...this.#wrap(`  ${sliceAnsi(text, width)}`, width)];
   }

package/src/wand.js

@@ -31,10 +31,10 @@ export class Wand {
     const suffix = [`(${[wish.name(), new Duration(Date.now() - start).minutes(), tokens, model].filter((p) => p !== '').join(' ')})`, link].filter((p) => p !== '').join(' ');
     if (code === 0) {
       await wish.close();
-      this.protocol.show(`${summary === '' ? 'done' : summary} ${suffix}`);
+      this.protocol.info(`${summary === '' ? 'done' : summary} ${suffix}`);
     } else {
       wish.free();
-      this.protocol.show(`failed with exit code ${code}${summary === '' ? '' : `: ${summary}`} ${suffix}`);
+      this.protocol.info(`failed with exit code ${code}${summary === '' ? '' : `: ${summary}`} ${suffix}`);
     }
   }
 }

package/src/wheel.js

@@ -0,0 +1,20 @@
+// SPDX-FileCopyrightText: Copyright (c) 2026 Yegor Bugayenko
+// SPDX-License-Identifier: MIT
+
+export class Wheel {
+  constructor(stream, screen) {
+    this.stream = stream;
+    this.screen = screen;
+  }
+  listen() {
+    this.stream.on('data', (chunk) =>
+      chunk
+        .toString()
+        .split('\x1b')
+        .slice(1)
+        .map((s) => s.slice(0, 2))
+        .filter((s) => /^[[O][AB]$/.test(s))
+        .forEach((s) => (s.endsWith('A') ? this.screen.up() : this.screen.down()))
+    );
+  }
+}

package/src/wishes.js

@@ -9,11 +9,12 @@ import { Archived } from './archived.js';
 import { Permanent } from './permanent.js';
 
 export class Wishes {
-  constructor(dir, interval, archive = '', pause = 0) {
+  constructor(dir, interval, archive = '', pause = 0, notice = { warn: () => {} }) {
     this.dir = dir;
     this.interval = interval;
     this.archive = archive;
     this.pause = pause;
+    this.notice = notice;
     this.claims = new Map();
     this.startup = [];
   }
@@ -26,6 +27,10 @@ export class Wishes {
     signal.throwIfAborted();
     if (this.startup.length === 0) {
       this.startup.push(new Set(files));
+      const count = files.filter((f) => !/^[A-Z]/.test(basename(f))).length;
+      if (count > 0) {
+        this.notice.warn(`found ${count} pre-existing ${count === 1 ? 'wish' : 'wishes'} in ${this.dir} that ${count === 1 ? 'is' : 'are'} not permanent`);
+      }
     }
     const path = files.find((f) => !this.claims.has(f))
       ?? [...this.claims.keys()].find((c) => !this.claims.get(c) && files.includes(c));