@jossuealcala/madre 0.4.0 → 0.4.1

package/src/sentinel-errors.mjs

@@ -10,6 +10,12 @@
 import { createHash } from 'node:crypto';
 import { homedir, platform, arch, release } from 'node:os';
 import { diagnose } from '../public/troubleshooting.js';
+import { language } from './i18n.mjs';
+
+// The product's own house. The collector lives under it too, so the line a human reads in the
+// outbound log names the product instead of a personal endpoint on someone's cloud account.
+export const HOME_SITE = 'https://madre.run';
+export const REPORT_FORM = { es: `${HOME_SITE}/reportar`, en: `${HOME_SITE}/report` };
 
 export const REPORT_WINDOW_MS = 24 * 3600 * 1000;
 const MAX_ERROR_CHARS = 4000;
@@ -71,7 +77,7 @@ export class ErrorSentinel {
     this.#save = save;
   }
 
-  settings() { return { ...this.#settings, canSend: Boolean(this.#settings.reportUrl), repo: repoFromPackage(this.#pkg) }; }
+  settings() { return { ...this.#settings, canSend: Boolean(this.#settings.reportUrl), repo: repoFromPackage(this.#pkg), home: HOME_SITE }; }
   async setSettings(patch = {}) {
     if (typeof patch.autoReport === 'boolean') this.#settings.autoReport = patch.autoReport;
     if (typeof patch.reportUrl === 'string') this.#settings.reportUrl = patch.reportUrl.trim();
@@ -174,6 +180,18 @@ export class ErrorSentinel {
     return `https://github.com/${repo}/issues/new?${new URLSearchParams({ title, body, labels: 'sentinel' })}`;
   }
 
+  // Where a human goes to say something. GitHub is the better home for a report — it is
+  // searchable, it deduplicates, and the answer helps whoever hits it next — but it asks for an
+  // account first, and somebody who arrived from a post in Spanish will not make one to say "it
+  // does not detect Codex". They get the form; the other road stays one click away, both ways.
+  formUrl({ about = '' } = {}) {
+    const base = REPORT_FORM[language()] ?? REPORT_FORM.en;
+    const env = this.environment();
+    const query = new URLSearchParams({ v: env.madre, node: env.node, os: env.platform });
+    if (about) query.set('about', about.slice(0, 120));
+    return `${base}?${query}`;
+  }
+
   feedbackUrl({ about = '' } = {}) {
     const repo = repoFromPackage(this.#pkg);
     if (!repo) return null;

package/src/server.mjs

@@ -18,7 +18,7 @@ import { moduleById, describeModules, findModuleRoute, toolsForTurn as modulesTo
 import { madreAgent, madreInvoker, MADRE_AGENT_ID, MADRE_ADAPTER } from './adapters/madre.mjs';
 import { exportDataset, readiness as datasetReadiness } from './dataset.mjs';
 import { OutboundLog, outboundView, DEFAULT_REPORT_URL } from './outbound.mjs';
-import { setLanguage as setRoomLanguage, t } from './i18n.mjs';
+import { language as roomLanguage, setLanguage as setRoomLanguage, t } from './i18n.mjs';
 
 const PACKAGE = JSON.parse(await readFile(new URL('../package.json', import.meta.url), 'utf8').catch(() => '{}'));
 let crashHandlersInstalled = false;
@@ -860,8 +860,11 @@ export async function createPulseServer({
         return sendJson(response, 200, {
           projectRoot,
           platform: process.platform,
-          // What language this machine set MADRE to, for a browser that has never chosen.
-          language: (await readConfig(root)).language === 'en' ? 'en' : 'es',
+          // What language this machine set MADRE to, for a browser that has never chosen. It is
+          // the language the room is SPEAKING, not the one written in the file: PULSE_LANGUAGE
+          // wins over the config here as it does everywhere else, and reading the file again
+          // would hand the page a different answer from the one the server itself is using.
+          language: roomLanguage(),
           // Which conversation this page is looking at, and the others it could open.
           chats: await listChats(roomDir),
           agents: agents.map((agent) => ({ ...agent, login: loginPlanFor(agent), install: installPlanFor(agent), key: keyPlanFor(agent.id), ...(accountNoteFor(agent.id) ?? {}) })),
@@ -980,7 +983,7 @@ export async function createPulseServer({
       const designationOk = (given) => typeof given === 'string' && given.trim().toLowerCase() === basename(canonicalProjectRoot).toLowerCase();
       // Sentinel: reports, settings, the manual road (a prefilled issue) and the automatic one.
       if (request.method === 'GET' && url.pathname === '/api/sentinel') {
-        return sendJson(response, 200, { reports: sentinel.reports(), settings: sentinel.settings(), environment: sentinel.environment(), feedbackUrl: sentinel.feedbackUrl() });
+        return sendJson(response, 200, { reports: sentinel.reports(), settings: sentinel.settings(), environment: sentinel.environment(), feedbackUrl: sentinel.feedbackUrl(), formUrl: sentinel.formUrl() });
       }
       if (request.method === 'POST' && url.pathname === '/api/sentinel/settings') {
         const patch = await body(request).catch(() => ({}));
@@ -991,8 +994,13 @@ export async function createPulseServer({
       const sentinelMatch = url.pathname.match(/^\/api\/sentinel\/([a-f0-9]{10})\/(issue|send)$/);
       if (sentinelMatch && request.method === (sentinelMatch[2] === 'issue' ? 'GET' : 'POST')) {
         if (sentinelMatch[2] === 'issue') {
-          const issue = sentinel.issueUrl(sentinelMatch[1]);
-          return issue ? sendJson(response, 200, { url: issue }) : sendJson(response, 404, { error: t('No such report, or no repository to file it in.') });
+          // Both roads, always: the issue for whoever has an account, the form for whoever does
+          // not. Nobody should hit a login wall while holding a bug report. A report that does
+          // not exist still gets neither: the form does not need the report to be built, so it
+          // would otherwise hand out a link for nothing.
+          const known = sentinel.reports().some((one) => one.id === sentinelMatch[1]);
+          const issue = known ? sentinel.issueUrl(sentinelMatch[1]) : null;
+          return known ? sendJson(response, 200, { url: issue, form: sentinel.formUrl({ about: sentinelMatch[1] }) }) : sendJson(response, 404, { error: t('No such report, or no repository to file it in.') });
         }
         const outcome = await sentinel.send(sentinelMatch[1]);
         return sendJson(response, outcome.ok ? 200 : (outcome.status === 404 || outcome.status === 412 ? outcome.status : 502), outcome);