behavior-wrapped 0.9.1 → 0.10.1

package/server/interaction-feedback.mjs

@@ -0,0 +1,78 @@
+import { interactionToneCandidateText } from "./interaction-tone.mjs";
+
+export const INTERACTION_FEEDBACK_LABELS = new Set(["yelling", "thanking", "neither", "unsure"]);
+
+function contentBlocks(record) {
+  const content = record?.message?.content ?? record?.content;
+  if (Array.isArray(content)) return content;
+  if (typeof content === "string") return [{ type: "text", text: content }];
+  return [];
+}
+
+function visibleText(record) {
+  return contentBlocks(record).filter((block) => block?.type === "text").map((block) => block.text || "").join("\n").trim();
+}
+
+export function interactionFeedbackId(kind, index) {
+  const label = kind === "frustrated" ? "yelling" : kind === "grateful" ? "thanking" : null;
+  return label && Number.isInteger(index) && index >= 0 ? `${label}-${index + 1}` : null;
+}
+
+function feedbackCoordinates(value) {
+  const match = String(value || "").match(/^(yelling|thanking)-([1-9][0-9]{0,2})$/);
+  return match ? { originalLabel: match[1], index: Number(match[2]) - 1 } : null;
+}
+
+function fallbackJudgedText(reference, records) {
+  if (typeof reference?.judgedText === "string" && reference.judgedText) return reference.judgedText;
+  const location = reference?.location || {};
+  let record = Number.isInteger(location.recordIndex) ? records?.[location.recordIndex] : null;
+  if (!record || record.type !== "user") record = records?.find((item) => item?.type === "user" && item?.timestamp === location.timestamp);
+  return interactionToneCandidateText(visibleText(record)) || "";
+}
+
+export function resolveInteractionFeedback(report, feedbackId, recordsById = new Map()) {
+  const coordinates = feedbackCoordinates(feedbackId);
+  if (!coordinates) return null;
+  const kind = coordinates.originalLabel === "yelling" ? "frustrated" : "grateful";
+  const reference = report?.interactionReview?.[kind]?.[coordinates.index];
+  const sessionId = reference?.location?.sessionId;
+  if (!reference || typeof sessionId !== "string" || !(report?.sessionIds || []).includes(sessionId)) return null;
+  const review = report.interactionReview || {};
+  return {
+    id: feedbackId,
+    originalLabel: coordinates.originalLabel,
+    sessionId,
+    candidateId: typeof reference.candidateId === "string" ? reference.candidateId.slice(0, 64) : "unknown",
+    judgedText: fallbackJudgedText(reference, recordsById.get(sessionId)).slice(0, 240),
+    occurrences: Number.isInteger(reference.occurrences) && reference.occurrences > 0 ? Math.min(reference.occurrences, 1_000_000) : 1,
+    confidence: Number.isFinite(reference.confidence) ? Math.max(0, Math.min(1, reference.confidence)) : 1,
+    judge: {
+      model: typeof review.model === "string" ? review.model.slice(0, 120) : "unknown",
+      promptVersion: Number.isInteger(review.promptVersion) && review.promptVersion > 0 ? review.promptVersion : 1,
+    },
+  };
+}
+
+export function publicInteractionFeedback(value) {
+  if (!value) return null;
+  const { sessionId, ...safe } = value;
+  return safe;
+}
+
+export function sanitizeInteractionFeedbackSubmission(value, trusted) {
+  if (!trusted || value?.feedbackId !== trusted.id || !INTERACTION_FEEDBACK_LABELS.has(value?.correctedLabel)) return null;
+  const note = typeof value.note === "string"
+    ? value.note.normalize("NFKC").replace(/[\u0000-\u001f\u007f]/g, " ").replace(/\s+/g, " ").trim().slice(0, 1_000)
+    : "";
+  return {
+    originalLabel: trusted.originalLabel,
+    correctedLabel: value.correctedLabel,
+    candidateId: trusted.candidateId,
+    judgedText: trusted.judgedText,
+    occurrences: trusted.occurrences,
+    confidence: trusted.confidence,
+    judge: trusted.judge,
+    ...(note ? { note } : {}),
+  };
+}

package/server/interaction-tone.mjs

@@ -6,6 +6,7 @@ import { BEHAVIOR_WRAPPED_ORIGIN } from "./origins.mjs";
 export const INTERACTION_TONE_RELAY_URL = `${BEHAVIOR_WRAPPED_ORIGIN}/v1/interaction-tone`;
 export const INTERACTION_TONE_MAX_CANDIDATES = 120;
 export const INTERACTION_TONE_BATCH_SIZE = 30;
+export const INTERACTION_TONE_PROMPT_VERSION = 1;
 const MAX_TEXT_LENGTH = 240;
 const MIN_CONFIDENCE = 0.75;
 const JUDGE_TIMEOUT_MS = 90_000;
@@ -55,6 +56,10 @@ function safeInteractionExcerpt(value) {
   return isShareSafeInteractionText(excerpt) ? excerpt : null;
 }
 
+export function interactionToneCandidateText(value) {
+  return safeInteractionExcerpt(value);
+}
+
 function priority(text, occurrences) {
   const words = text.match(/\p{L}+/gu)?.length || 0;
   return Number(strongFrustrationPattern.test(text)) * 20
@@ -247,10 +252,16 @@ function resultFromSelection(candidates, selection, { model, provider, latencyMs
     occurrences: byId.get(item.candidate_id).occurrences,
     confidence: item.confidence,
   }));
-  const reviewRefs = (items) => items.flatMap((item) => (byId.get(item.candidate_id).locations || []).map((location) => ({
-    candidateId: item.candidate_id,
-    location,
-  })));
+  const reviewRefs = (items) => items.flatMap((item) => {
+    const candidate = byId.get(item.candidate_id);
+    return (candidate.locations || []).map((location) => ({
+      candidateId: item.candidate_id,
+      judgedText: candidate.text,
+      occurrences: candidate.occurrences,
+      confidence: item.confidence,
+      location,
+    }));
+  });
   return {
     frustratedMessages: count(selection.frustrated),
     gratefulMessages: count(selection.grateful),
@@ -261,6 +272,9 @@ function resultFromSelection(candidates, selection, { model, provider, latencyMs
     privateMatches: { frustrated: matches(selection.frustrated), grateful: matches(selection.grateful) },
     review: {
       format: "behavior-wrapped-interaction-review-v1",
+      model,
+      provider,
+      promptVersion: INTERACTION_TONE_PROMPT_VERSION,
       frustrated: reviewRefs(selection.frustrated),
       grateful: reviewRefs(selection.grateful),
     },

package/server/launcher.mjs

@@ -11,6 +11,8 @@ import { MAX_DONATION_BYTES } from "./research-donation-schema.mjs";
 import { APP_VERSION, LOCAL_DONATION_PROTOCOL } from "./runtime-version.mjs";
 import { makeWorkaroundEvidencePreview } from "./workaround-evidence.mjs";
 import { makeInteractionEvidencePreview } from "./interaction-evidence.mjs";
+import { publicInteractionFeedback, resolveInteractionFeedback, sanitizeInteractionFeedbackSubmission } from "./interaction-feedback.mjs";
+import { donationSessionIntegrityError } from "./donation-session-integrity.mjs";
 import { createIdleShutdownController } from "./local-helper-runtime.mjs";
 import { canonicalSessionDirectoryLabels, openExternalUrl, supportedAgentNames } from "./platform.mjs";
 
@@ -162,13 +164,30 @@ const server = http.createServer(async (request, response) => {
       const labels = new Map(publicCatalog(availableCatalog).sessions.map((session) => [session.id, session]));
       return json(response, 200, makeInteractionEvidencePreview(report, records, labels));
     }
+    const interactionFeedbackMatch = url.pathname.match(/^\/api\/reports\/([A-Za-z0-9_-]{8,32})\/interaction-feedback\/(yelling|thanking)-([1-9][0-9]{0,2})$/);
+    if (request.method === "GET" && interactionFeedbackMatch) {
+      const report = loadReport(interactionFeedbackMatch[1]);
+      if (!report) return json(response, 404, { error: "Saved report not found" });
+      const feedbackId = `${interactionFeedbackMatch[2]}-${interactionFeedbackMatch[3]}`;
+      const reference = resolveInteractionFeedback(report, feedbackId);
+      if (!reference) return json(response, 404, { error: "That interaction classification is no longer available." });
+      const availableCatalog = await catalogForRequest();
+      if (!availableCatalog.index.has(reference.sessionId)) return json(response, 404, { error: "The source session is no longer available on this device." });
+      const records = await chosenRecords([reference.sessionId], {}, availableCatalog);
+      const trusted = resolveInteractionFeedback(report, feedbackId, new Map(records.map((session) => [session.sessionId, session.records])));
+      return json(response, 200, { sessionIds: [reference.sessionId], feedback: publicInteractionFeedback(trusted), localPrivateSelection: true });
+    }
     if (request.method === "POST" && url.pathname === "/api/donation-preview") {
       const body = await readBody(request);
       const report = loadReport(body.reportId);
       if (!report) return json(response, 404, { error: "Saved report not found" });
       const availableCatalog = await catalogForRequest();
+      const feedback = body.feedbackId ? resolveInteractionFeedback(report, body.feedbackId) : null;
+      if (body.feedbackId && !feedback) return json(response, 400, { error: "Invalid classifier-feedback selection." });
       const allowed = new Set(report.sessionIds || []);
-      const ids = Array.isArray(body.sessionIds) ? body.sessionIds.filter((id) => allowed.has(id) && availableCatalog.index.has(id)).slice(0, 250) : [];
+      const ids = feedback
+        ? [feedback.sessionId].filter((id) => availableCatalog.index.has(id))
+        : Array.isArray(body.sessionIds) ? body.sessionIds.filter((id) => allowed.has(id) && availableCatalog.index.has(id)).slice(0, 250) : [];
       const records = await chosenRecords(ids, {}, availableCatalog);
       if (!records.length) return json(response, 400, { error: "Choose at least one available session." });
       const labels = new Map(publicCatalog(availableCatalog).sessions.map((session) => [session.id, session]));
@@ -181,8 +200,33 @@ const server = http.createServer(async (request, response) => {
       const body = await readBody(request, MAX_DONATION_BYTES + 1_000_000);
       const report = loadReport(body?.donation?.reportId);
       if (!report) return json(response, 404, { error: "Saved report not found" });
+      let donation = body.donation;
+      const suppliedSessions = Array.isArray(donation?.sessions) ? donation.sessions : [];
+      const suppliedIds = suppliedSessions.map((session) => session?.sessionId);
+      const allowed = new Set(report.sessionIds || []);
+      const uniqueIds = new Set(suppliedIds);
+      if (!suppliedIds.length || uniqueIds.size !== suppliedIds.length || suppliedIds.some((id) => !allowed.has(id))) return json(response, 400, { error: "Donated sessions must come from this report." });
+      const feedbackReference = body.feedback ? resolveInteractionFeedback(report, body.feedback.feedbackId) : null;
+      if (body.feedback && (!feedbackReference || suppliedSessions.length !== 1 || suppliedIds[0] !== feedbackReference.sessionId)) return json(response, 400, { error: "Classifier feedback must contain only its original session." });
+      const availableCatalog = await catalogForRequest();
+      if (suppliedIds.some((id) => !availableCatalog.index.has(id))) return json(response, 404, { error: "A selected source session is no longer available on this device." });
+      const records = await chosenRecords(suppliedIds, {}, availableCatalog);
+      const sourceSessions = makeDonationPreview(records, new Map(), { unredacted: true }).sessions;
+      const integrityError = donationSessionIntegrityError(suppliedSessions, sourceSessions);
+      if (integrityError) return json(response, 400, { error: integrityError });
+      if (body.feedback) {
+        const trusted = resolveInteractionFeedback(report, body.feedback.feedbackId, new Map(records.map((session) => [session.sessionId, session.records])));
+        const classifierFeedback = sanitizeInteractionFeedbackSubmission(body.feedback, trusted);
+        if (!classifierFeedback) return json(response, 400, { error: "Choose a valid corrected classification before donating." });
+        donation = {
+          ...donation,
+          purpose: "classifier_feedback",
+          classifierFeedback,
+          consent: { ...donation.consent, classifierFeedback: true },
+        };
+      } else donation = { ...donation, purpose: "general_research", classifierFeedback: undefined };
       if (demo) return json(response, 201, { accepted: true, donation_id: "demo-not-transmitted", demo: true });
-      const result = await submitResearchDonation(body.donation, {
+      const result = await submitResearchDonation(donation, {
         clientId: getOrCreateClientId(),
         endpoint: process.env.BEHAVIOR_WRAPPED_DONATION_URL || RESEARCH_DONATION_URL,
       });

package/server/research-donation-crypto.mjs

@@ -34,6 +34,7 @@ export function encryptResearchDonation(value, publicKey = RESEARCH_DONATION_PUB
     encryption: { algorithm: DONATION_ENCRYPTION_ALGORITHM, keyId: DONATION_KEY_ID },
     metadata: {
       reportId: donation.reportId,
+      purpose: donation.purpose,
       redactionMode: donation.redactionMode,
       createdAt: donation.createdAt,
       consentedAt: donation.consent.consentedAt,

package/server/research-donation-schema.mjs

@@ -7,10 +7,36 @@ function safeText(value, maximum) {
   return typeof value === "string" ? value.normalize("NFKC").replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f]/g, "").slice(0, maximum) : "";
 }
 
+function normalizeClassifierFeedback(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+  if (!new Set(["yelling", "thanking"]).has(value.originalLabel) || !new Set(["yelling", "thanking", "neither", "unsure"]).has(value.correctedLabel)) return null;
+  const judgedText = safeText(value.judgedText, 240).trim();
+  const candidateId = safeText(value.candidateId, 64).trim();
+  const model = safeText(value.judge?.model, 120).trim();
+  const promptVersion = Number(value.judge?.promptVersion);
+  const occurrences = Number(value.occurrences);
+  const confidence = Number(value.confidence);
+  if (!judgedText || !candidateId || !model || !Number.isInteger(promptVersion) || promptVersion < 1 || promptVersion > 10_000) return null;
+  if (!Number.isInteger(occurrences) || occurrences < 1 || occurrences > 1_000_000 || !Number.isFinite(confidence) || confidence < 0 || confidence > 1) return null;
+  const note = safeText(value.note, 1_000).trim();
+  return {
+    originalLabel: value.originalLabel,
+    correctedLabel: value.correctedLabel,
+    candidateId,
+    judgedText,
+    occurrences,
+    confidence,
+    judge: { model, promptVersion },
+    ...(note ? { note } : {}),
+  };
+}
+
 function normalizeResearchDonation(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return null;
   if (value.consent?.researchDonation !== true) return null;
   if (!/^[A-Za-z0-9_-]{8,32}$/.test(value.reportId || "")) return null;
+  if (value.purpose !== undefined && !new Set(["general_research", "classifier_feedback"]).has(value.purpose)) return null;
+  const purpose = value.purpose === "classifier_feedback" ? "classifier_feedback" : "general_research";
   if (!new Set(["standard", "custom", "unredacted"]).has(value.redactionMode)) return null;
   const unredacted = value.redactionMode === "unredacted";
   if (unredacted && value.consent?.unredactedData !== true) return null;
@@ -29,9 +55,12 @@ function normalizeResearchDonation(value) {
     return messages.length ? [{ label: `Session ${sessionIndex + 1}`, messages }] : [];
   });
   if (!sessions.length || messageCount > MAX_MESSAGES) return null;
+  const classifierFeedback = purpose === "classifier_feedback" ? normalizeClassifierFeedback(value.classifierFeedback) : null;
+  if (purpose === "classifier_feedback" && (!classifierFeedback || value.consent?.classifierFeedback !== true || sessions.length !== 1)) return null;
   const donation = {
     format: "behavior-wrapped-research-donation-v1",
     reportId: value.reportId,
+    purpose,
     redactionMode: value.redactionMode,
     createdAt: /^\d{4}-\d{2}-\d{2}T/.test(value.createdAt || "") ? value.createdAt : new Date().toISOString(),
     redactionSummary: {
@@ -39,11 +68,15 @@ function normalizeResearchDonation(value) {
       sessions: sessions.length,
       messages: messageCount,
     },
+    ...(classifierFeedback ? { classifierFeedback } : {}),
     sessions,
     consent: {
       researchDonation: true,
+      ...(classifierFeedback ? { classifierFeedback: true } : {}),
       ...(unredacted ? { unredactedData: true } : {}),
-      statement: unredacted
+      statement: classifierFeedback
+        ? "I consent for this reviewed session and classification correction to be transmitted to the Susan Calvin Project and used for research and to evaluate and improve Behavior Wrapped under the data policy."
+        : unredacted
         ? "I understand this donation is not automatically redacted and may contain credentials, personal details, private code, URLs, and file paths. I consent to transmit it to the Susan Calvin Project for research under the data policy."
         : "I consent for this reviewed data to be transmitted to the Susan Calvin Project and used for research under the data policy.",
       consentedAt: /^\d{4}-\d{2}-\d{2}T/.test(value.consent.consentedAt || "") ? value.consent.consentedAt : new Date().toISOString(),