@rubytech/create-maxy-code 0.1.265 → 0.1.267

package/payload/premium-plugins/writer-craft/mcp/src/tools/voice-distil-profile.ts

@@ -29,8 +29,11 @@ import { notTrashed } from "../lib/voice-corpus.js";
 import {
   VOICE_CORPUS_WHERE,
   voiceCorpusWhereWithFormat,
+  voiceCorpusWhereWithFormatAndAuthor,
+  profileUserIdForScope,
   FORMAT_VALUES,
   type VoiceFormat,
+  type VoiceScope,
 } from "../lib/voice-corpus.js";
 
 /**
@@ -60,6 +63,12 @@ const RE_RUN_AGE_DAYS = 30;
 export interface VoiceDistilProfileParams {
   accountId: string;
   userId: string;
+  /**
+   * Profile scope (Task 676). `'personal'` (default) distils the operator's
+   * own author-filtered corpus onto `:AdminUser`; `'org'` distils the whole
+   * account onto `:LocalBusiness` under the reserved sentinel userId.
+   */
+  scope?: VoiceScope;
   force?: boolean;
   /**
    * Writing format to distil. When omitted on `sample`, enumerates distinct
@@ -152,42 +161,54 @@ export interface VoiceDistilProfileResult {
  */
 async function distilForFormat(
   params: Required<Pick<VoiceDistilProfileParams, "accountId" | "userId">> &
-    Pick<VoiceDistilProfileParams, "force" | "mode" | "styleCardYaml"> & {
+    Pick<VoiceDistilProfileParams, "force" | "mode" | "styleCardYaml" | "scope"> & {
       format: VoiceFormat;
     },
 ): Promise<VoiceDistilProfileResult> {
   const { accountId, userId, format, force = false } = params;
+  const scope: VoiceScope = params.scope ?? "personal";
+  const profileUserId = profileUserIdForScope(scope, userId);
+  const anchorLabel = scope === "org" ? "LocalBusiness" : "AdminUser";
+  // Org walks the whole account; personal narrows to one author's content.
+  const corpusWhere =
+    scope === "org"
+      ? voiceCorpusWhereWithFormat(format)
+      : voiceCorpusWhereWithFormatAndAuthor(format);
+  const corpusParams =
+    scope === "org"
+      ? { accountId, format }
+      : { accountId, format, voiceAuthor: userId };
   const session = getSession();
   const now = new Date();
   const nowIso = now.toISOString();
 
   try {
-    // 1. Read existing per-format profile (if any) for cadence-guard comparison.
+    // 1. Read existing scoped profile (if any) for cadence-guard comparison.
+    //    Key-only match — the (accountId, profileUserId, format) triple is the
+    //    unique constraint key, so no anchor traversal is needed on the read.
     const existing = await session.run(
-      `MATCH (a:AdminUser {accountId: $accountId, userId: $userId})
-       OPTIONAL MATCH (a)-[:HAS_VOICE_PROFILE]->(p:VoiceProfile {accountId: $accountId, userId: $userId, format: $format})
+      `OPTIONAL MATCH (p:VoiceProfile {accountId: $accountId, userId: $profileUserId, format: $format})
        RETURN elementId(p) AS profileId, p.corpusSize AS corpusSize,
               p.generatedAt AS generatedAt`,
-      { accountId, userId, format },
+      { accountId, profileUserId, format },
     );
     const existingRow = existing.records[0];
     const prevProfileId = (existingRow?.get("profileId") as string | null) ?? null;
     const prevCorpusSize = toJsNumber(existingRow?.get("corpusSize"));
     const prevGeneratedAt = (existingRow?.get("generatedAt") as string | null) ?? null;
 
-    // 2. Count corpus for this specific format.
-    const corpusWhere = voiceCorpusWhereWithFormat(format);
+    // 2. Count corpus for this scope + format.
     const countResult = await session.run(
       `MATCH (n)
        WHERE ${corpusWhere}
        RETURN count(n) AS c`,
-      { accountId, format },
+      corpusParams,
     );
     const corpusSize = toJsNumber(countResult.records[0]?.get("c")) ?? 0;
 
     if (corpusSize === 0) {
       process.stderr.write(
-        `[voice-distil] adminUser=${userId} format=${format} skip reason=empty-corpus\n`,
+        `[voice-distil] scope=${scope} userId=${profileUserId} format=${format} skip reason=empty-corpus\n`,
       );
       return {
         profileId: prevProfileId,
@@ -212,7 +233,7 @@ async function distilForFormat(
       if (!ageTrigger && !growthTrigger) {
         const reason = ageDays < 1 ? "recent" : "below-threshold";
         process.stderr.write(
-          `[voice-distil] adminUser=${userId} format=${format} skip reason=${reason} corpusSize=${corpusSize} prevCorpus=${prevCorpusSize} ageDays=${ageDays.toFixed(1)}\n`,
+          `[voice-distil] scope=${scope} userId=${profileUserId} format=${format} skip reason=${reason} corpusSize=${corpusSize} prevCorpus=${prevCorpusSize} ageDays=${ageDays.toFixed(1)}\n`,
         );
         return {
           profileId: prevProfileId,
@@ -265,7 +286,7 @@ async function distilForFormat(
               ts
        ORDER BY ts IS NULL, ts DESC
        LIMIT 500`,
-      { accountId, format },
+      corpusParams,
     );
     const samples: { id: string; label: string; body: string }[] = [];
     let sectionWalkCount = 0;
@@ -290,11 +311,14 @@ async function distilForFormat(
       if (charBudget <= 0) break;
     }
 
-    // 5. Pull feedback intents from existing :VoiceEdit nodes for this format.
+    // 5. Pull feedback intents from existing :VoiceEdit nodes for this scope +
+    //    format. Keyed by profileUserId: org edits live under the sentinel, so
+    //    org distil reads org feedback and personal distil reads only this
+    //    operator's edits — no extra scope predicate needed.
     const feedback = await session.run(
-      `MATCH (e:VoiceEdit {userId: $userId, accountId: $accountId, format: $format})
+      `MATCH (e:VoiceEdit {userId: $profileUserId, accountId: $accountId, format: $format})
        RETURN e.intent AS intent ORDER BY e.occurredAt DESC LIMIT 50`,
-      { accountId, userId, format },
+      { accountId, profileUserId, format },
     );
     const feedbackIntents = feedback.records
       .map((r) => r.get("intent") as string | null)
@@ -304,7 +328,7 @@ async function distilForFormat(
     const mode = params.mode ?? "sample";
     if (mode === "sample") {
       process.stderr.write(
-        `[voice-distil] adminUser=${userId} format=${format} mode=sample corpusSize=${corpusSize} ` +
+        `[voice-distil] scope=${scope} userId=${profileUserId} format=${format} mode=sample corpusSize=${corpusSize} ` +
           `exemplars=${samples.length} feedbackEntries=${feedbackIntents.length} ` +
           `sample-body-source=section-walk:${sectionWalkCount} n.body:${nBodyCount}\n`,
       );
@@ -327,13 +351,27 @@ async function distilForFormat(
       );
     }
 
-    // 7. Write the :VoiceProfile node — keyed on (accountId, userId, format) —
-    //    plus LEARNED_FROM edges to every sampled node.
+    // 7. Write the :VoiceProfile node — keyed on (accountId, profileUserId,
+    //    format) — anchored on :AdminUser (personal) or :LocalBusiness (org),
+    //    plus LEARNED_FROM edges to every sampled node. `scope` is SET after the
+    //    MERGE (never inside the pattern) so a legacy scope-less personal
+    //    profile is matched and backfilled rather than duplicated.
+    const anchorMatch =
+      scope === "org"
+        ? `MATCH (anchor:LocalBusiness {accountId: $accountId})`
+        : `MATCH (anchor:AdminUser {accountId: $accountId, userId: $profileUserId})`;
+    // Two-step MERGE: the profile node is MERGEd by its unique key alone, then
+    // the anchor edge is MERGEd separately. MERGEing the node through the anchor
+    // pattern would create a duplicate (constraint error) if the node existed
+    // but its anchor edge did not. Keying the node first mirrors the key-only
+    // reads and keeps the legacy scope-less backfill matching by key.
     const writeResult = await session.run(
-      `MATCH (a:AdminUser {accountId: $accountId, userId: $userId})
-       MERGE (a)-[:HAS_VOICE_PROFILE]->(p:VoiceProfile {accountId: $accountId, userId: $userId, format: $format})
+      `${anchorMatch}
+       MERGE (p:VoiceProfile {accountId: $accountId, userId: $profileUserId, format: $format})
          ON CREATE SET p.createdAt = $now
-       SET p.styleCard = $styleCard,
+       MERGE (anchor)-[:HAS_VOICE_PROFILE]->(p)
+       SET p.scope = $scope,
+           p.styleCard = $styleCard,
            p.generatedAt = $now,
            p.corpusSize = $corpusSize,
            p.feedbackEntries = $feedbackEntries,
@@ -345,8 +383,9 @@ async function distilForFormat(
        RETURN elementId(p) AS profileId`,
       {
         accountId,
-        userId,
+        profileUserId,
         format,
+        scope,
         styleCard: styleCardYaml,
         now: nowIso,
         corpusSize,
@@ -356,13 +395,15 @@ async function distilForFormat(
     );
     if (writeResult.records.length === 0) {
       throw new Error(
-        `voice-mirror: :AdminUser {accountId='${accountId}', userId='${userId}'} not found. Onboarding must promote the operator to :AdminUser before distillation.`,
+        scope === "org"
+          ? `voice-mirror: :LocalBusiness {accountId='${accountId}'} not found. The account org node must exist before an org distil (created at onboarding alongside :AdminUser).`
+          : `voice-mirror: :AdminUser {accountId='${accountId}', userId='${userId}'} not found. Onboarding must promote the operator to :AdminUser before distillation.`,
       );
     }
     const profileId = writeResult.records[0].get("profileId") as string;
 
     process.stderr.write(
-      `[voice-distil] adminUser=${userId} format=${format} mode=write corpusSize=${corpusSize} generatedAt=${nowIso} feedbackEntries=${feedbackIntents.length}\n`,
+      `[voice-distil] scope=${scope} userId=${profileUserId} anchor=${anchorLabel} format=${format} corpusSize=${corpusSize} generatedAt=${nowIso} feedbackEntries=${feedbackIntents.length}${scope === "org" ? " sentinel=__org__" : ""}\n`,
     );
 
     return {
@@ -393,20 +434,23 @@ async function amendForFormat(params: {
   userId: string;
   format: VoiceFormat;
   nodeIds: string[];
+  scope?: VoiceScope;
 }): Promise<VoiceDistilProfileResult> {
   const { accountId, userId, format, nodeIds } = params;
+  const scope: VoiceScope = params.scope ?? "personal";
+  const profileUserId = profileUserIdForScope(scope, userId);
   const session = getSession();
 
   try {
-    // 1. Existing profile (may be absent — first-time amend with no prior card).
+    // 1. Existing scoped profile (may be absent — first-time amend, no prior
+    //    card). Key-only match on the unique (accountId, profileUserId, format).
     const profileRow = await session.run(
-      `MATCH (a:AdminUser {accountId: $accountId, userId: $userId})
-       OPTIONAL MATCH (a)-[:HAS_VOICE_PROFILE]->(p:VoiceProfile {accountId: $accountId, userId: $userId, format: $format})
+      `OPTIONAL MATCH (p:VoiceProfile {accountId: $accountId, userId: $profileUserId, format: $format})
        RETURN elementId(p) AS profileId,
               p.styleCard AS styleCard,
               p.corpusSize AS corpusSize,
               p.generatedAt AS generatedAt`,
-      { accountId, userId, format },
+      { accountId, profileUserId, format },
     );
     const prow = profileRow.records[0];
     const prevProfileId = (prow?.get("profileId") as string | null) ?? null;
@@ -453,11 +497,12 @@ async function amendForFormat(params: {
     }
 
     // 3. Feedback intents (same as sample) — agent benefits even on a no-op
-    //    amend ("you've already corrected this voice tic ten times").
+    //    amend ("you've already corrected this voice tic ten times"). Keyed by
+    //    profileUserId so org amends read org feedback.
     const feedback = await session.run(
-      `MATCH (e:VoiceEdit {userId: $userId, accountId: $accountId, format: $format})
+      `MATCH (e:VoiceEdit {userId: $profileUserId, accountId: $accountId, format: $format})
        RETURN e.intent AS intent ORDER BY e.occurredAt DESC LIMIT 50`,
-      { accountId, userId, format },
+      { accountId, profileUserId, format },
     );
     const feedbackIntents = feedback.records
       .map((r) => r.get("intent") as string | null)
@@ -465,7 +510,7 @@ async function amendForFormat(params: {
 
     if (eligibleIds.length === 0) {
       process.stderr.write(
-        `[voice-distil] mode=amend userId=${userId} format=${format} nodeIds=${nodeIds.length} ` +
+        `[voice-distil] scope=${scope} mode=amend userId=${profileUserId} format=${format} nodeIds=${nodeIds.length} ` +
           `existingProfile=${prevProfileId ?? "none"} eligible=0 ineligible=${ineligible.length}\n`,
       );
       return {
@@ -537,7 +582,7 @@ async function amendForFormat(params: {
     }
 
     process.stderr.write(
-      `[voice-distil] mode=amend userId=${userId} format=${format} nodeIds=${nodeIds.length} ` +
+      `[voice-distil] scope=${scope} mode=amend userId=${profileUserId} format=${format} nodeIds=${nodeIds.length} ` +
         `existingProfile=${prevProfileId ?? "none"} eligible=${eligibleIds.length} ineligible=${ineligible.length} ` +
         `exemplars=${exemplars.length} sample-body-source=section-walk:${sectionWalkCount} n.body:${nBodyCount}\n`,
     );
@@ -578,8 +623,12 @@ async function amendWriteForFormat(params: {
   format: VoiceFormat;
   styleCardYaml: string;
   amendedFromNodeIds: string[];
+  scope?: VoiceScope;
 }): Promise<VoiceDistilProfileResult> {
   const { accountId, userId, format, styleCardYaml, amendedFromNodeIds } = params;
+  const scope: VoiceScope = params.scope ?? "personal";
+  const profileUserId = profileUserIdForScope(scope, userId);
+  const anchorLabel = scope === "org" ? "LocalBusiness" : "AdminUser";
   const session = getSession();
   const nowIso = new Date().toISOString();
   try {
@@ -607,17 +656,24 @@ async function amendWriteForFormat(params: {
     }
 
     const feedback = await session.run(
-      `MATCH (e:VoiceEdit {userId: $userId, accountId: $accountId, format: $format})
+      `MATCH (e:VoiceEdit {userId: $profileUserId, accountId: $accountId, format: $format})
        RETURN count(e) AS c`,
-      { accountId, userId, format },
+      { accountId, profileUserId, format },
     );
     const feedbackEntries = toJsNumber(feedback.records[0]?.get("c")) ?? 0;
 
+    const anchorMatch =
+      scope === "org"
+        ? `MATCH (anchor:LocalBusiness {accountId: $accountId})`
+        : `MATCH (anchor:AdminUser {accountId: $accountId, userId: $profileUserId})`;
+    // Two-step MERGE (see distilForFormat): node by unique key, then anchor edge.
     const result = await session.run(
-      `MATCH (a:AdminUser {accountId: $accountId, userId: $userId})
-       MERGE (a)-[:HAS_VOICE_PROFILE]->(p:VoiceProfile {accountId: $accountId, userId: $userId, format: $format})
+      `${anchorMatch}
+       MERGE (p:VoiceProfile {accountId: $accountId, userId: $profileUserId, format: $format})
          ON CREATE SET p.createdAt = $now, p.corpusSize = 0
-       SET p.styleCard = $styleCard,
+       MERGE (anchor)-[:HAS_VOICE_PROFILE]->(p)
+       SET p.scope = $scope,
+           p.styleCard = $styleCard,
            p.generatedAt = $now,
            p.feedbackEntries = $feedbackEntries,
            p.updatedAt = $now
@@ -629,8 +685,9 @@ async function amendWriteForFormat(params: {
        RETURN elementId(p) AS profileId, p.corpusSize AS corpusSize`,
       {
         accountId,
-        userId,
+        profileUserId,
         format,
+        scope,
         styleCard: styleCardYaml,
         now: nowIso,
         feedbackEntries,
@@ -639,15 +696,17 @@ async function amendWriteForFormat(params: {
     );
     if (result.records.length === 0) {
       throw new Error(
-        `voice-mirror: :AdminUser {accountId='${accountId}', userId='${userId}'} not found. ` +
-          `Onboarding must promote the operator to :AdminUser before distillation.`,
+        scope === "org"
+          ? `voice-mirror: :LocalBusiness {accountId='${accountId}'} not found. The account org node must exist before an org amend-write.`
+          : `voice-mirror: :AdminUser {accountId='${accountId}', userId='${userId}'} not found. ` +
+            `Onboarding must promote the operator to :AdminUser before distillation.`,
       );
     }
     const profileId = result.records[0].get("profileId") as string;
     const corpusSize = toJsNumber(result.records[0].get("corpusSize")) ?? 0;
 
     process.stderr.write(
-      `[voice-distil] mode=write userId=${userId} format=${format} amended=true ` +
+      `[voice-distil] scope=${scope} mode=write userId=${profileUserId} anchor=${anchorLabel} format=${format} amended=true ` +
         `amendedFromNodeIds=${amendedFromNodeIds.length} corpusSize=${corpusSize} ` +
         `generatedAt=${nowIso} feedbackEntries=${feedbackEntries}\n`,
     );
@@ -668,6 +727,7 @@ export async function voiceDistilProfile(
   params: VoiceDistilProfileParams,
 ): Promise<VoiceDistilProfileResult | VoiceDistilProfileResult[]> {
   const { accountId, userId, force = false } = params;
+  const scope: VoiceScope = params.scope ?? "personal";
   if (!accountId || !userId) {
     throw new Error("voice-distil-profile: accountId and userId required");
   }
@@ -688,6 +748,7 @@ export async function voiceDistilProfile(
       userId,
       format: params.format,
       nodeIds,
+      scope,
     });
   }
 
@@ -716,6 +777,7 @@ export async function voiceDistilProfile(
       format: params.format,
       styleCardYaml,
       amendedFromNodeIds: params.amendedFromNodeIds,
+      scope,
     });
   }
 
@@ -725,14 +787,16 @@ export async function voiceDistilProfile(
   }
 
   // Multi-format path: enumerate distinct format values present in the corpus.
+  // Scope-aware: personal enumerates only the operator's authored content, org
+  // enumerates the whole account.
   const session = getSession();
   let formats: VoiceFormat[] = [];
   try {
     const enumResult = await session.run(
       `MATCH (n)
-       WHERE ${VOICE_CORPUS_WHERE} AND n.format IS NOT NULL
+       WHERE ${VOICE_CORPUS_WHERE} AND n.format IS NOT NULL${scope === "personal" ? " AND n.voiceAuthor = $voiceAuthor" : ""}
        RETURN DISTINCT n.format AS fmt`,
-      { accountId },
+      scope === "personal" ? { accountId, voiceAuthor: userId } : { accountId },
     );
     formats = enumResult.records
       .map((r) => r.get("fmt") as string)
@@ -745,7 +809,7 @@ export async function voiceDistilProfile(
 
   if (formats.length === 0) {
     process.stderr.write(
-      `[voice-distil] adminUser=${userId} skip reason=no-format-tagged-content\n`,
+      `[voice-distil] scope=${scope} userId=${profileUserIdForScope(scope, userId)} skip reason=no-format-tagged-content\n`,
     );
     return {
       profileId: null,

package/payload/premium-plugins/writer-craft/mcp/src/tools/voice-ingest-session-text.ts

@@ -94,6 +94,7 @@ export async function voiceIngestSessionText(
          MERGE (n:Message {contentHash: $contentHash, accountId: $accountId})
          ON CREATE SET
            n.userId = $userId,
+           n.voiceAuthor = $userId,
            n.body = $body,
            n.occurredAt = $now,
            n.sessionId = $sessionId,

package/payload/premium-plugins/writer-craft/mcp/src/tools/voice-record-feedback.ts

@@ -17,7 +17,11 @@
  */
 import { randomUUID } from "node:crypto";
 import { getSession } from "../lib/neo4j.js";
-import type { VoiceFormat } from "../lib/voice-corpus.js";
+import {
+  profileUserIdForScope,
+  type VoiceFormat,
+  type VoiceScope,
+} from "../lib/voice-corpus.js";
 
 export interface VoiceRecordFeedbackParams {
   accountId: string;
@@ -29,6 +33,12 @@ export interface VoiceRecordFeedbackParams {
    * matching per-format :VoiceProfile.
    */
   format: VoiceFormat;
+  /**
+   * Scope of the edited draft (Task 676). `'org'` routes the edit to the
+   * account/house profile (`userId='__org__'`); `'personal'` (default) routes
+   * to the operator's own profile.
+   */
+  scope?: VoiceScope;
   /**
    * One sentence describing what changed and what voice preference it reveals.
    * The calling agent summarises this from `originalText` vs `editedText` in
@@ -54,6 +64,8 @@ export async function voiceRecordFeedback(
   params: VoiceRecordFeedbackParams,
 ): Promise<VoiceRecordFeedbackResult> {
   const { accountId, userId, originalText, editedText, format, intent: rawIntent, context } = params;
+  const scope: VoiceScope = params.scope ?? "personal";
+  const profileUserId = profileUserIdForScope(scope, userId);
   if (!accountId || !userId) {
     throw new Error("voice-record-feedback: accountId and userId required");
   }
@@ -76,12 +88,18 @@ export async function voiceRecordFeedback(
 
   const session = getSession();
   try {
+    // The :VoiceEdit carries the profile-key userId ($profileUserId — the
+    // sentinel for org) plus `scope`, so distillation's feedback query (keyed by
+    // profileUserId) reads org edits for the org profile and personal edits for
+    // the operator. The real editor is preserved via the AUTHORED edge from
+    // their :AdminUser. FEEDBACK_FOR targets the scoped profile (Task 676).
     const result = await session.run(
       `MATCH (a:AdminUser {accountId: $accountId, userId: $userId})
        CREATE (e:VoiceEdit {
          editId: $editId,
          accountId: $accountId,
-         userId: $userId,
+         userId: $profileUserId,
+         scope: $scope,
          format: $format,
          originalText: $originalText,
          editedText: $editedText,
@@ -92,7 +110,7 @@ export async function voiceRecordFeedback(
        })
        CREATE (a)-[:AUTHORED]->(e)
        WITH e
-       OPTIONAL MATCH (:AdminUser {accountId: $accountId, userId: $userId})-[:HAS_VOICE_PROFILE]->(p:VoiceProfile {accountId: $accountId, userId: $userId, format: $format})
+       OPTIONAL MATCH (p:VoiceProfile {accountId: $accountId, userId: $profileUserId, format: $format})
        FOREACH (_ IN CASE WHEN p IS NULL THEN [] ELSE [1] END |
          MERGE (e)-[:FEEDBACK_FOR]->(p)
        )
@@ -100,6 +118,8 @@ export async function voiceRecordFeedback(
       {
         accountId,
         userId,
+        profileUserId,
+        scope,
         format,
         editId,
         originalText,
@@ -118,7 +138,7 @@ export async function voiceRecordFeedback(
     const hadProfile = result.records[0].get("hadProfile") === true;
 
     process.stderr.write(
-      `[voice-record-feedback] adminUser=${userId} format=${format} intent="${cappedIntent.replace(/"/g, "'")}" diffBytes=${editedText.length - originalText.length}\n`,
+      `[voice-record-feedback] scope=${scope} userId=${profileUserId} format=${format} intent="${cappedIntent.replace(/"/g, "'")}" diffBytes=${editedText.length - originalText.length}\n`,
     );
 
     return { editId, intent: cappedIntent, occurredAt, hadProfile };