jaitus 0.3.16 → 0.3.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jaitus",
-  "version": "0.3.16",
+  "version": "0.3.17",
   "description": "Jaitus — a coding agent in your terminal.",
   "type": "module",
   "bin": {

package/src/errors.js

@@ -13,7 +13,7 @@ const CATALOG = {
   account_suspended: { title: 'Account suspended', hint: 'Contact support if you think this is a mistake.' },
   email_unverified: { title: 'Email not verified', hint: 'Open the verification link in your inbox, then retry.' },
   free_limit_reached: { title: 'Free prompts used up', hint: 'Subscribe on the website, then retry this turn.' },
-  free_machine_limit: { title: 'No free prompts on this account', hint: 'This computer already has its free accounts. Subscribe on the website to use this one.' },
+  free_machine_limit: { title: 'No free prompts on this account', hint: 'Subscribe on the website to keep using Jaitus on this account.' },
   free_needs_cli: { title: 'Update Jaitus for free prompts', hint: 'Run npm i -g jaitus, then try again.' },
   free_request_too_large: { title: 'Too large for the free plan', hint: 'Run /compact or start a new session, or subscribe.' },
   plan_limit_reached: { title: 'Monthly allowance used', hint: 'It resets at the start of your next period, or upgrade on the website. /usage shows where you are.' },

package/src/machine.js

@@ -11,6 +11,8 @@
 //      folder), each restoring the other
 //   n  the address of each physical network adapter (virtual and randomised ones are
 //      skipped: they change by themselves)
+//   g  the git identity this computer commits as (global user.email) — the same on
+//      every computer one person sets up, so it recognises the person, not the machine
 //
 // A VPN, a new network or a new email changes none of these. They are reported by this
 // program, so they identify a computer for an honest client — the same ceiling every
@@ -126,6 +128,32 @@ function adapterIds() {
   return [...out].sort().slice(0, 3);
 }
 
+/** Hostname, OS user, CPU model, memory and OS — together, never one alone. */
+function softFingerprint() {
+  try {
+    let user = '';
+    try { user = os.userInfo().username; } catch { /* no user database */ }
+    const cpu = (os.cpus()?.[0]?.model || '').replace(/\s+/g, ' ').trim();
+    const gb = Math.round(os.totalmem() / 2 ** 30);
+    const host = os.hostname();
+    if (!host && !user) return null;
+    return [process.platform, os.arch(), host, user, cpu, `${gb}GB`].join('|');
+  } catch { return null; }
+}
+
+// Addresses git ships as examples or that many people leave unset-looking: not a person.
+const PLACEHOLDER_EMAIL = /(^|@)(example\.(com|org|net)|localhost)$|^(you|your[._-]?email|email|user|root|test|admin)@/i;
+
+/** The global git identity (user.email), or null when unset or a placeholder. */
+function gitIdentity() {
+  try {
+    const r = spawnSync('git', ['config', '--global', 'user.email'], { encoding: 'utf8', timeout: 2000, windowsHide: true });
+    const v = String(r.stdout || '').trim().toLowerCase();
+    if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(v) || PLACEHOLDER_EMAIL.test(v)) return null;
+    return v;
+  } catch { return null; }
+}
+
 /**
  * Where the install id's second copy lives: outside ~/.jaitus, in the OS's app-data
  * folder. Always under os.homedir() (not LOCALAPPDATA / XDG_DATA_HOME), so a test run
@@ -180,6 +208,13 @@ export function machineHeader() {
     if (h) parts.push(`h=${h}`);
     parts.push(`i=${hash('i', installId())}`);
     for (const mac of adapterIds()) parts.push(`n=${hash('n', mac)}`);
+    // s: the computer as it describes itself — what an id-reset tool leaves alone. The
+    // server links it only together with a network both accounts were used from, so two
+    // people with the same laptop model are never taken for one.
+    const soft = softFingerprint();
+    if (soft) parts.push(`s=${hash('s', soft)}`);
+    const git = gitIdentity();
+    if (git) parts.push(`g=${hash('g', git)}`);
     if (m && cache.m !== m) writeCache({ ...cache, m, ...(h ? { h } : {}) });
   } catch { /* whatever was gathered */ }
   header = parts.join(',');

package/src/tui/entries.js

@@ -10,7 +10,7 @@
 
 import { palette, mix, ramp } from './theme.js';
 import { renderMarkdown, inlineSpans } from './markdown.js';
-import { ansiToRows, wrapRows, wrapRow, truncateRow, stringWidth, plain } from './ansi.js';
+import { ansiToRows, wrapRows, wrapRow, truncateRow, stringWidth, plain, padRow } from './ansi.js';
 import { highlightLine, languageForPath } from './highlight.js';
 import { wordRows, wordSize } from './wordmark.js';
 import { MASCOT_ROWS } from '../brand.js';
@@ -150,7 +150,13 @@ const BUILDERS = {
     if (data.attachments?.length) {
       rows.push([indent, { t: data.attachments.map((a) => `⧉ ${a}`).join('  '), color: p.purple }]);
     }
-    return rows;
+    // The whole message sits on a faint band the full width of the window, with a row of
+    // it above and below, so what the person said never reads as part of the answer. The
+    // band is drawn, never copied (the padding is decoration).
+    const band = p.raised;
+    const shade = (row) => padRow(row.map((span) => ({ ...span, backgroundColor: span.backgroundColor || band })), width, { backgroundColor: band, copy: '' });
+    const edge = [{ t: ' '.repeat(Math.max(1, width)), backgroundColor: band, copy: '' }];
+    return [edge, ...rows.map(shade), edge];
   },
 
   // ── What the model said ──────────────────────────────────────────────────────