@codazen/harmonica-mcp 4.3.0 → 4.4.0

package/dist/index.js

@@ -21514,44 +21514,22 @@ if (typeof global.crypto === "undefined") {
 var outgoingEnded = Symbol("outgoingEnded");
 
 // ../../libs/harmonica-services/src/mcp/auth.ts
-async function resolveOrgSlug(client, slug) {
-  const orgs = await client.listAllOrgs();
-  const match = orgs.find((o) => o.slug === slug);
-  if (!match) {
-    throw new Error(
-      `Organization with slug "${slug}" not found. Check HARMONICA_ORG_SLUG in your .mcp.json env config.`
-    );
-  }
-  return match.orgId;
-}
-async function validateAuth(client, orgIdentifier, isOrgSlug, userId) {
-  const orgId = isOrgSlug ? await resolveOrgSlug(client, orgIdentifier) : orgIdentifier;
-  const user = await client.getUser(userId);
+async function validateAuth(client) {
+  const user = await client.getCurrentUser();
   if (!user) {
     throw new Error(
-      `User not found: "${userId}". HARMONICA_USER_ID should be your email address (e.g. you@company.com).`
+      `Could not resolve an identity for this credential. Check that HARMONICA_API_KEY is a valid Harmonica API key and that the user it authenticates as exists (HARMONICA_USER_ID is your email address).`
     );
   }
-  const membership = await client.getMembership(userId, orgId);
-  if (!membership) {
-    throw new Error(
-      `User "${userId}" is not a member of org "${orgId}". Log into Harmonica first to create your membership, or check HARMONICA_ORG_ID / HARMONICA_ORG_SLUG in your .mcp.json.`
-    );
-  }
-  return { user, orgId, membership };
+  return { user };
 }
 
-// ../../libs/harmonica-services/src/mcp/org-guard.ts
-async function assertSystemInOrg(client, systemId, orgId) {
+// ../../libs/harmonica-services/src/mcp/entity-guard.ts
+async function assertSystemExists(client, systemId) {
   const system = await client.getSystem(systemId);
   if (!system) {
     throw new Error(`System not found: "${systemId}"`);
   }
-  if (system.orgId !== orgId) {
-    throw new Error(
-      `System "${systemId}" does not belong to the configured organization. Access denied.`
-    );
-  }
 }
 async function assertRevisionInSystem(client, revisionId, systemId) {
   const revision = await client.getRevision(revisionId);
@@ -21564,96 +21542,60 @@ async function assertRevisionInSystem(client, revisionId, systemId) {
     );
   }
 }
-async function assertBeatInOrg(client, beatId, orgId) {
+async function assertBeatExists(client, beatId) {
   const beat = await client.getBeat(beatId);
   if (!beat) {
     throw new Error(`Beat not found: "${beatId}"`);
   }
-  if (beat.orgId && beat.orgId !== orgId) {
-    throw new Error(
-      `Beat "${beatId}" does not belong to the configured organization. Access denied.`
-    );
-  }
 }
-async function fetchSystemInOrg(client, systemId, orgId) {
+async function fetchSystem(client, systemId) {
   const system = await client.getSystem(systemId);
   if (!system) {
     throw new Error(`System not found: "${systemId}"`);
   }
-  if (system.orgId !== orgId) {
-    throw new Error(
-      `System "${systemId}" does not belong to the configured organization. Access denied.`
-    );
-  }
   return system;
 }
-async function fetchBeatInOrg(client, beatId, orgId) {
+async function fetchBeat(client, beatId) {
   const beat = await client.getBeat(beatId);
   if (!beat) {
     throw new Error(`Beat not found: "${beatId}"`);
   }
-  if (beat.orgId && beat.orgId !== orgId) {
-    throw new Error(
-      `Beat "${beatId}" does not belong to the configured organization. Access denied.`
-    );
-  }
   return beat;
 }
-async function assertTeamspaceInOrg(client, teamspaceId, orgId) {
+async function assertTeamspaceExists(client, teamspaceId) {
+  await fetchTeamspace(client, teamspaceId);
+}
+async function fetchTeamspace(client, teamspaceId) {
   const teamspace = await client.getTeamspace(teamspaceId);
   if (!teamspace) {
     throw new Error(`Teamspace not found: "${teamspaceId}"`);
   }
-  if (teamspace.orgId !== orgId) {
-    throw new Error(
-      `Teamspace "${teamspaceId}" does not belong to the configured organization. Access denied.`
-    );
-  }
+  return teamspace;
 }
-async function assertAccountInOrg(client, accountId, orgId) {
+async function assertAccountExists(client, accountId) {
   const account = await client.getAccount(accountId);
   if (!account) {
     throw new Error(`Account not found: "${accountId}"`);
   }
-  if (account.orgId !== orgId) {
-    throw new Error(
-      `Account "${accountId}" does not belong to the configured organization. Access denied.`
-    );
-  }
 }
-async function assertMovementInOrg(client, movementId, orgId) {
+async function assertMovementExists(client, movementId) {
   const movement = await client.getMovement(movementId);
   if (!movement) {
     throw new Error(`Movement not found: "${movementId}"`);
   }
-  if (movement.orgId !== orgId) {
-    throw new Error(
-      `Movement "${movementId}" does not belong to the configured organization. Access denied.`
-    );
-  }
 }
-async function assertDeliverableGroupInOrg(client, deliverableGroupId, orgId) {
+async function fetchDeliverableGroup(client, deliverableGroupId) {
   const group = await client.getDeliverableGroup(deliverableGroupId);
   if (!group) {
     throw new Error(`DeliverableGroup not found: "${deliverableGroupId}"`);
   }
-  if (group.orgId !== orgId) {
-    throw new Error(
-      `DeliverableGroup "${deliverableGroupId}" does not belong to the configured organization. Access denied.`
-    );
-  }
   return group;
 }
-async function fetchNotebookInOrg(client, notebookId, orgId) {
+async function fetchNotebook(client, notebookId) {
   const notebook = await client.getNotebook(notebookId);
   if (!notebook) {
     throw new Error(`Notebook not found: "${notebookId}"`);
   }
-  if (notebook.orgId !== orgId) {
-    throw new Error(
-      `Notebook "${notebookId}" does not belong to the configured organization. Access denied.`
-    );
-  }
   return notebook;
 }
 
@@ -21678,9 +21620,6 @@ function registerAccountTools(server, ctx, client) {
       orgId: external_exports.string().describe("The organization ID")
     },
     async ({ orgId }) => {
-      if (orgId !== ctx.orgId) {
-        return { content: [{ type: "text", text: `Org not found: ${orgId}` }] };
-      }
       const accounts = await client.listOrgAccounts(orgId);
       const text = accounts.length === 0 ? "No accounts found." : accounts.map(
         (a) => `[${a.accountId}] ${a.accountCode ?? "\u2014"} ${a.name} (${a.accountType ?? "client"}, ${a.status})`
@@ -21696,7 +21635,7 @@ function registerAccountTools(server, ctx, client) {
     },
     async ({ accountId }) => {
       const a = await client.getAccount(accountId);
-      if (!a || a.orgId !== ctx.orgId) {
+      if (!a) {
         return { content: [{ type: "text", text: `Account not found: ${accountId}` }] };
       }
       const lines = [
@@ -21717,8 +21656,9 @@ function registerAccountTools(server, ctx, client) {
   );
   server.tool(
     "create_account",
-    `Create an Account in the configured Organization. An Account is an org unit that owns Movements \u2014 either a paying client OR the agency itself (accountType). It is NOT a Beat. Pass parentAccountId to nest it under another Account, which may itself be a sub-account \u2014 up to ${MAX_ACCOUNT_DEPTH} levels deep, e.g. Meta \u2192 Reality Labs \u2192 Lifecycle CRM, where the middle level is organisational grouping rather than a separately billed entity. Recognition cues: "new client account", "add a paying client", "create account for Acme Corp", "add a department under this client" \u2192 create_account.`,
+    `Create an Account in an Organization. An Account is an org unit that owns Movements \u2014 either a paying client OR the agency itself (accountType). It is NOT a Beat. Pass parentAccountId to nest it under another Account, which may itself be a sub-account \u2014 up to ${MAX_ACCOUNT_DEPTH} levels deep, e.g. Meta \u2192 Reality Labs \u2192 Lifecycle CRM, where the middle level is organisational grouping rather than a separately billed entity. Recognition cues: "new client account", "add a paying client", "create account for Acme Corp", "add a department under this client" \u2192 create_account.`,
     {
+      orgId: external_exports.string().describe("The organization ID \u2014 see list_organizations"),
       name: external_exports.string().min(1).max(300).describe('Account name (e.g. "Acme Corporation")'),
       accountType: external_exports.enum(["internal", "client"]).describe(
         "'client' for a paying client, 'internal' for one of the agency's own org units. An org may have several internal Accounts, and an internal Account may be a sub-account of another internal Account \u2014 but never of a client Account."
@@ -21731,10 +21671,10 @@ function registerAccountTools(server, ctx, client) {
         `Nests this Account under the given parent, which may itself be a sub-account. Rejected if the result would exceed ${MAX_ACCOUNT_DEPTH} levels.`
       )
     },
-    async ({ name, accountType, description, accountCode, parentAccountId }) => {
+    async ({ orgId, name, accountType, description, accountCode, parentAccountId }) => {
       try {
         const a = await client.createAccount({
-          orgId: ctx.orgId,
+          orgId,
           name,
           accountType,
           ...description !== void 0 && { description },
@@ -21773,7 +21713,7 @@ function registerAccountTools(server, ctx, client) {
     },
     async ({ accountId, name, description, accountType, parentAccountId, cadenceConfig }) => {
       const existing = await client.getAccount(accountId);
-      if (!existing || existing.orgId !== ctx.orgId) {
+      if (!existing) {
         return { content: [{ type: "text", text: `Account not found: ${accountId}` }] };
       }
       try {
@@ -21809,7 +21749,7 @@ function registerAccountTools(server, ctx, client) {
     },
     async ({ accountId }) => {
       const existing = await client.getAccount(accountId);
-      if (!existing || existing.orgId !== ctx.orgId) {
+      if (!existing) {
         return { content: [{ type: "text", text: `Account not found: ${accountId}` }] };
       }
       const children = await client.listChildAccounts(accountId);
@@ -21832,7 +21772,7 @@ function registerAccountTools(server, ctx, client) {
     // published thin client, so gating them costs the tool bundle nothing.
     async ({ accountId }) => {
       const existing = await client.getAccount(accountId);
-      if (!existing || existing.orgId !== ctx.orgId) {
+      if (!existing) {
         return { content: [{ type: "text", text: `Account not found: ${accountId}` }] };
       }
       const systems = await client.listAccountSystems(accountId);
@@ -21850,7 +21790,7 @@ function registerAccountTools(server, ctx, client) {
     // no isEnabled() call here to keep @cdz/feature-flags out of the tool bundle.
     async ({ accountId }) => {
       const existing = await client.getAccount(accountId);
-      if (!existing || existing.orgId !== ctx.orgId) {
+      if (!existing) {
         return { content: [{ type: "text", text: `Account not found: ${accountId}` }] };
       }
       const documents = await client.listAccountDocuments(accountId);
@@ -21866,7 +21806,7 @@ function registerAccountTools(server, ctx, client) {
     },
     async ({ accountId }) => {
       const existing = await client.getAccount(accountId);
-      if (!existing || existing.orgId !== ctx.orgId) {
+      if (!existing) {
         return { content: [{ type: "text", text: `Account not found: ${accountId}` }] };
       }
       const movements = await client.listAccountMovements(accountId);
@@ -21930,7 +21870,7 @@ function registerAccountTools(server, ctx, client) {
     },
     async ({ accountId, status }) => {
       const existing = await client.getAccount(accountId);
-      if (!existing || existing.orgId !== ctx.orgId) {
+      if (!existing) {
         return { content: [{ type: "text", text: `Account not found: ${accountId}` }] };
       }
       const a = await client.setAccountStatus(accountId, status);
@@ -21967,7 +21907,7 @@ function registerActivityTools(server, ctx, client) {
       importance: external_exports.enum(IMPORTANCE_VALUES).optional().describe("Filter by minimum importance level")
     },
     async ({ systemId, limit, importance }) => {
-      await assertSystemInOrg(client, systemId, ctx.orgId);
+      await assertSystemExists(client, systemId);
       const { entries, hasMore } = await client.listSystemActivities(systemId, {
         limit: limit ?? 30,
         minImportance: importance
@@ -21999,7 +21939,7 @@ function registerAnalysisTools(server, ctx, client) {
       minClusterSize: external_exports.coerce.number().int().min(2).optional().default(3).describe("Minimum cluster size. Default 3")
     },
     async ({ systemId, entityType, threshold, minClusterSize }) => {
-      await assertSystemInOrg(client, systemId, ctx.orgId);
+      await assertSystemExists(client, systemId);
       const result = await client.clusterEntities(systemId, entityType, { threshold, minClusterSize });
       if (result.clusters.length === 0) {
         return {
@@ -22031,7 +21971,7 @@ Analyzed: ${result.totalAnalyzed} | Clusters: ${result.clusters.length} | Noise:
       minClusterSize: external_exports.coerce.number().int().min(2).optional().default(2).describe("Minimum cluster size. Default 2")
     },
     async ({ systemId, analysisType, entityType, threshold, minClusterSize }) => {
-      await assertSystemInOrg(client, systemId, ctx.orgId);
+      await assertSystemExists(client, systemId);
       const result = await client.runClusteredAnalysis(systemId, analysisType, {
         entityType,
         threshold,
@@ -22066,7 +22006,7 @@ function registerAuditIntegrityTools(server, ctx, client) {
     },
     async ({ systemId, limit }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         const report = await client.verifyAuditIntegrity(systemId, { limit });
         const lines = [
           `## Audit Integrity Report`,
@@ -22195,7 +22135,7 @@ function registerBaselineTools(server, ctx, client) {
     },
     async ({ systemId, beatIds, runChecks, localPath }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         const task = await client.baselineSystem(systemId, { beatIds, runChecks, localPath });
         return {
           content: [{
@@ -22225,7 +22165,7 @@ function registerBeatComposerTools(server, ctx, client) {
     },
     async ({ survivingBeatId, mergedFromBeatIds, rationale }) => {
       try {
-        await assertBeatInOrg(client, survivingBeatId, ctx.orgId);
+        await assertBeatExists(client, survivingBeatId);
         await client.recordMergeEvent(
           survivingBeatId,
           mergedFromBeatIds,
@@ -22253,7 +22193,7 @@ Rationale: ${rationale}`;
     },
     async ({ originalBeatId, splitIntoBeatIds, rationale }) => {
       try {
-        await assertBeatInOrg(client, originalBeatId, ctx.orgId);
+        await assertBeatExists(client, originalBeatId);
         await client.recordSplitEvent(
           originalBeatId,
           splitIntoBeatIds,
@@ -22284,7 +22224,7 @@ Rationale: ${rationale}`;
     },
     async ({ systemId, items, reason }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         const result = await client.bulkReassignRevisions(items, reason, ctx.user.userId);
         const lines = [
           `# Bulk reassignment complete: ${result.reassigned.length} succeeded, ${result.failed.length} failed`,
@@ -22323,7 +22263,7 @@ Rationale: ${rationale}`;
     },
     async ({ systemId, revisionId, toBeatId, reason }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         const result = await client.reassignRevision(revisionId, toBeatId, reason, ctx.user.userId);
         const text = [
           `Revision reassigned successfully.`,
@@ -22361,7 +22301,7 @@ function registerBeatConvergenceTools(server, ctx, client) {
     "Read-only convergence-vs-churn report for a Beat \u2014 is it converging on its Coda or churning? Returns net Coda coverage, gross delivered, churn ratio, diminishing-delta trend, confirmed-\u0394f coverage, and an overall signal, computed from the Beat\u2019s confirmed Value Velocity inputs. No writes.",
     { beatId: external_exports.string().describe("The beat ID (e.g., TF-B-001)") },
     async ({ beatId }) => {
-      const beat = await fetchBeatInOrg(client, beatId, ctx.orgId);
+      const beat = await fetchBeat(client, beatId);
       const report = await client.getBeatConvergence(beat.systemId, beatId);
       if (!report) {
         return { content: [{ type: "text", text: `No convergence data for beat "${beatId}".` }], isError: true };
@@ -22389,7 +22329,7 @@ function registerBeatLifecycleTools(server, ctx, client) {
           return { content: [{ type: "text", text: `Beat not found: "${beatId}"` }], isError: true };
         }
         const currentStatus = beat.beatStatus ?? "open";
-        await assertBeatInOrg(client, beatId, ctx.orgId);
+        await assertBeatExists(client, beatId);
         const result = await client.updateBeatStatus(beatId, targetStatus, {
           actor: { type: "human", id: ctx.user.userId, name: ctx.user.userId },
           reason
@@ -22437,7 +22377,7 @@ function registerBeatPlanningTools(server, ctx, client) {
         if (!revision) {
           return { content: [{ type: "text", text: `Revision not found: ${revisionId}` }], isError: true };
         }
-        await assertBeatInOrg(client, revision.beatId, ctx.orgId);
+        await assertBeatExists(client, revision.beatId);
         const messages = [
           ...conversationHistory ?? [],
           { role: "user", content: message }
@@ -22498,7 +22438,7 @@ async function pollForCheck(client, taskId) {
     consecutiveErrors = 0;
     if (!task) throw new Error(`Task ${taskId} not found`);
     if (task.status === "completed") {
-      if (!task.result) throw new Error(`Task ${taskId} completed with no result`);
+      if (!task.result) throw new Error(`async:completed:no-result Task ${taskId} succeeded on the async path but the scorecard is not yet readable on the blocking path \u2014 use list_checks or get_job_status to retrieve it.`);
       return task.result;
     }
     if (task.status === "failed") throw new Error(`Quality check failed: ${task.error ?? "unknown error"}`);
@@ -22530,7 +22470,7 @@ function registerBeatQualityTools(server, ctx, client) {
   };
   const handler = async ({ beatId, systemId, wait }) => {
     try {
-      await assertBeatInOrg(client, beatId, ctx.orgId);
+      await assertBeatExists(client, beatId);
       const { taskId } = await client.checkBeatQuality(systemId, beatId);
       if (!wait) {
         return {
@@ -22580,7 +22520,7 @@ function registerBeatReframeTools(server, ctx, client) {
     },
     async ({ beatId, systemId }) => {
       try {
-        await assertBeatInOrg(client, beatId, ctx.orgId);
+        await assertBeatExists(client, beatId);
         const result = await client.reframeBeat(systemId, beatId);
         const text = formatReframeResult(beatId, result);
         return { content: [{ type: "text", text }] };
@@ -22673,7 +22613,6 @@ var DEFAULT_CONTEXT_NOTE_LIMIT = 200;
 var MAX_CONTEXT_NOTE_LIMIT = 1e3;
 var NOTE_TYPE_LABELS = {
   context: "Context",
-  assumption: "Assumptions",
   constraint: "Constraints",
   guidance: "Guidance",
   decision: "Decisions",
@@ -22808,7 +22747,6 @@ ${revision.description}`);
 // ../../libs/harmonica-services/src/mcp/formatters/note-formatter.ts
 var TYPE_LABELS = {
   context: "Context",
-  assumption: "Assumption",
   constraint: "Constraint",
   guidance: "Guidance",
   decision: "Decision",
@@ -23094,7 +23032,7 @@ function registerBeatTools(server, ctx, client) {
       includeArchived: external_exports.boolean().optional().default(false).describe("Include archived and deprecated beats (excluded by default)")
     },
     async ({ systemId, offset = 0, limit = 100, includeArchived }) => {
-      await assertSystemInOrg(client, systemId, ctx.orgId);
+      await assertSystemExists(client, systemId);
       let beats = await client.listSystemBeats(systemId);
       if (!includeArchived) {
         beats = beats.filter((b) => b.beatStatus !== "archived");
@@ -23116,7 +23054,7 @@ function registerBeatTools(server, ctx, client) {
     "Get full beat detail including description",
     { beatId: external_exports.string().describe("The beat ID (e.g., TF-B-001)") },
     async ({ beatId }) => {
-      await assertBeatInOrg(client, beatId, ctx.orgId);
+      await assertBeatExists(client, beatId);
       const beat = await client.getBeat(beatId);
       if (!beat) {
         return { content: [{ type: "text", text: `Beat not found: "${beatId}"` }], isError: true };
@@ -23133,7 +23071,7 @@ function registerBeatTools(server, ctx, client) {
       systemId: external_exports.string().optional().describe("System ID (auto-resolved from beat if omitted)")
     },
     async ({ beatId, systemId }) => {
-      const beat = await fetchBeatInOrg(client, beatId, ctx.orgId);
+      const beat = await fetchBeat(client, beatId);
       const resolvedProjectId = systemId ?? beat.systemId;
       const timeline = await client.getUnifiedBeatTimeline(resolvedProjectId, beatId);
       if (timeline.length === 0) {
@@ -23160,12 +23098,12 @@ function registerBeatTools(server, ctx, client) {
     },
     async ({ systemId, title, description, tags, priority, estimatedEffort, beatId, humanAssignee, agentAssignee, branch }) => {
       try {
-        await fetchSystemInOrg(client, systemId, ctx.orgId);
+        const system = await fetchSystem(client, systemId);
         const resolvedBeatId = beatId ?? await client.getNextBeatId(systemId);
         const beat = await client.createBeat({
           beatId: resolvedBeatId,
           systemId,
-          orgId: ctx.orgId,
+          orgId: system.orgId,
           title,
           description,
           tags,
@@ -23234,7 +23172,7 @@ ${formatBeatDetail(beat)}${similarityWarning}` }] };
     async ({ beatId, changeSummary, ...changes }) => {
       try {
         console.error("[MCP:UpdateBeat] beatId=%s actor=%s", beatId, ctx.user.userId);
-        const beat = await fetchBeatInOrg(client, beatId, ctx.orgId);
+        const beat = await fetchBeat(client, beatId);
         const updates = {};
         for (const [k, v] of Object.entries(changes)) {
           if (v !== void 0) updates[k] = v;
@@ -23277,7 +23215,7 @@ ${formatBeatDetail(beat)}${similarityWarning}` }] };
     },
     async ({ systemId, beatId, status, includeArchived }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         const revisions = beatId ? await client.listBeatRevisions(systemId, beatId, { status, includeArchived }) : await client.listSystemRevisions(systemId, { status, includeArchived });
         return { content: [{ type: "text", text: formatRevisionSummaryTable(revisions) }] };
       } catch (err) {
@@ -23298,7 +23236,7 @@ ${formatBeatDetail(beat)}${similarityWarning}` }] };
         if (!revision) {
           return { content: [{ type: "text", text: `Revision not found: ${revisionId}` }], isError: true };
         }
-        await assertBeatInOrg(client, revision.beatId, ctx.orgId);
+        await assertBeatExists(client, revision.beatId);
         const resolution = await client.resolveDeliveryPolicy(revisionId);
         const policyBlock = `
 
@@ -23383,6 +23321,11 @@ var PlanVersionsIdempotencyError = class extends Error {
     this.existingBeatVersionIds = existingBeatVersionIds;
   }
 };
+function isRenderableGateFailure(value) {
+  if (typeof value !== "object" || value === null) return false;
+  const f = value;
+  return typeof f.reason === "string" && typeof f.message === "string";
+}
 
 // ../../libs/harmonica-services/src/mcp/tools/beat-version-tools.ts
 function registerBeatVersionTools(server, ctx, client) {
@@ -23466,7 +23409,7 @@ function registerBeatVersionTools(server, ctx, client) {
         if (!beat) {
           return { content: [{ type: "text", text: `Beat not found: "${beatId}"` }], isError: true };
         }
-        await assertBeatInOrg(client, beatId, ctx.orgId);
+        await assertBeatExists(client, beatId);
         const beatVersion = await client.createBeatVersion(beat.systemId, beatId, {
           title,
           description,
@@ -23505,6 +23448,22 @@ function registerBeatVersionTools(server, ctx, client) {
         ];
         return { content: [{ type: "text", text: lines.join("\n") }] };
       } catch (err) {
+        if (err instanceof BeatQualityGateError && isRenderableGateFailure(err.failure)) {
+          const f = err.failure;
+          const isStale = f.reason === "stale_check_hash" || f.reason === "stale_check_timestamp";
+          const lines = [
+            `**Gate:** coda_quality`,
+            `**Status:** ${isStale ? "stale" : "failed"} (${f.reason})`,
+            `**Detail:** ${f.message}`
+          ];
+          if (f.currentScore !== void 0) lines.push(`**Current:** ${f.currentScore}`);
+          if (f.requiredScore !== void 0) lines.push(`**Required:** ${f.requiredScore}`);
+          if (f.remedy) lines.push(`**Action:** ${f.remedy}`);
+          return {
+            content: [{ type: "text", text: lines.join("\n") }],
+            isError: true
+          };
+        }
         const message = err instanceof Error ? err.message : String(err);
         return { content: [{ type: "text", text: `Failed to create Beat Version: ${message}` }], isError: true };
       }
@@ -23531,7 +23490,7 @@ function registerBeatVersionTools(server, ctx, client) {
         if (!bv) {
           return { content: [{ type: "text", text: `Beat Version not found: "${beatVersionId}"` }], isError: true };
         }
-        await assertBeatInOrg(client, bv.beatId, ctx.orgId);
+        await assertBeatExists(client, bv.beatId);
         const updates = {};
         for (const [k, v] of Object.entries(changes)) {
           if (v !== void 0) updates[k] = v;
@@ -23572,7 +23531,7 @@ function registerBeatVersionTools(server, ctx, client) {
     },
     async ({ beatId, force }) => {
       try {
-        await assertBeatInOrg(client, beatId, ctx.orgId);
+        await assertBeatExists(client, beatId);
         const actorId = ctx.user.email ?? ctx.user.userId;
         const beatVersions = await client.planBeatVersions(beatId, actorId, { force });
         const lines = [
@@ -23635,7 +23594,7 @@ function registerBeatVersionTools(server, ctx, client) {
         if (bv.status === targetState) {
           return { content: [{ type: "text", text: `Beat Version is already at ${targetState}.` }], isError: true };
         }
-        await assertBeatInOrg(client, bv.beatId, ctx.orgId);
+        await assertBeatExists(client, bv.beatId);
         const result = await client.transitionBeatVersionStatus(beatVersionId, targetState, {
           actor: { type: "human", id: ctx.user.userId, name: ctx.user.name, email: ctx.user.email },
           trigger: "human_action",
@@ -23677,7 +23636,7 @@ function registerBeatVersionTools(server, ctx, client) {
         if (!bv) {
           return { content: [{ type: "text", text: `Beat Version not found: ${beatVersionId}` }], isError: true };
         }
-        await assertBeatInOrg(client, bv.beatId, ctx.orgId);
+        await assertBeatExists(client, bv.beatId);
         if (!confirm) {
           const revisions = bv.computedStatus ? `${bv.computedStatus.totalRevisions} child Revision(s)` : "child Revisions (count unknown until execution)";
           const dropNote = bv.targetDropId ? ` Beat Version is assigned to Drop ${bv.targetDropId} \u2014 Drop membership is preserved.` : "";
@@ -23963,7 +23922,7 @@ function registerCheckTools(server, ctx, client) {
     },
     async ({ checkType, targetId, systemId, branch, localPath }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         const targetError = checkType === "build_quality" ? buildQualityTargetError(targetId) : checkType === "beat_version_quality" || checkType === "plan_quality" ? beatVersionQualityTargetError(targetId) : null;
         if (targetError) {
           return { content: [{ type: "text", text: targetError }], isError: true };
@@ -24061,7 +24020,7 @@ function registerClaimTools(server, ctx, client) {
         if (!revision) {
           return { content: [{ type: "text", text: `Revision not found: "${revisionId}"` }], isError: true };
         }
-        await assertBeatInOrg(client, revision.beatId, ctx.orgId);
+        await assertBeatExists(client, revision.beatId);
         const result = await client.claimRevision(revision.systemId, revisionId);
         if (!result.success) {
           return { content: [{ type: "text", text: `Failed to claim revision (${result.error.code}): ${result.error.message}` }], isError: true };
@@ -24095,7 +24054,7 @@ function registerClaimTools(server, ctx, client) {
         if (!revision) {
           return { content: [{ type: "text", text: `Revision not found: "${revisionId}"` }], isError: true };
         }
-        await assertBeatInOrg(client, revision.beatId, ctx.orgId);
+        await assertBeatExists(client, revision.beatId);
         const result = await client.releaseRevisionClaim(revision.systemId, revisionId, reason);
         if (!result.success) {
           return { content: [{ type: "text", text: `Failed to release claim (${result.error.code}): ${result.error.message}` }], isError: true };
@@ -24141,7 +24100,7 @@ function registerDeliverableGroupTools(server, ctx, client) {
       movementId: external_exports.string().describe("The Movement ID (e.g., mv-abc123)")
     },
     async ({ movementId }) => {
-      await assertMovementInOrg(client, movementId, ctx.orgId);
+      await assertMovementExists(client, movementId);
       const groups = await client.listMovementDeliverableGroups(movementId);
       const text = groups.length === 0 ? "No deliverable groups found for this Movement." : groups.map(
         (g) => `[${g.deliverableGroupId}] ${g.groupCode} \u2014 ${g.title} (${g.status})`
@@ -24162,11 +24121,6 @@ function registerDeliverableGroupTools(server, ctx, client) {
           content: [{ type: "text", text: `DeliverableGroup not found: ${deliverableGroupId}` }]
         };
       }
-      if (g.orgId !== ctx.orgId) {
-        throw new Error(
-          `DeliverableGroup "${deliverableGroupId}" does not belong to the configured organization. Access denied.`
-        );
-      }
       const lines = [
         `ID: ${g.deliverableGroupId}`,
         `Code: ${g.groupCode}`,
@@ -24201,16 +24155,16 @@ ${g.acceptanceCriteria}` : null,
     parentGroupId: external_exports.string().optional().describe("Optional parent Track ID for nested grouping (Phase 0 scaffolding)")
   };
   const createTrackHandler = async ({ teamspaceId, title, description, deliverables, acceptanceCriteria, vuRate, systemId, movementId, parentGroupId }) => {
-    await assertTeamspaceInOrg(client, teamspaceId, ctx.orgId);
+    const teamspace = await fetchTeamspace(client, teamspaceId);
     if (movementId !== void 0) {
-      await assertMovementInOrg(client, movementId, ctx.orgId);
+      await assertMovementExists(client, movementId);
     }
     if (parentGroupId !== void 0) {
-      await assertDeliverableGroupInOrg(client, parentGroupId, ctx.orgId);
+      await fetchDeliverableGroup(client, parentGroupId);
     }
     const g = await client.createDeliverableGroup({
       teamspaceId,
-      orgId: ctx.orgId,
+      orgId: teamspace.orgId,
       title,
       ...description !== void 0 && { description },
       ...deliverables !== void 0 && { deliverables },
@@ -24340,12 +24294,12 @@ ${g.acceptanceCriteria}` : null,
       dropId: external_exports.string().describe("The Drop ID to link to the group")
     },
     async ({ deliverableGroupId, dropId }) => {
-      await assertDeliverableGroupInOrg(client, deliverableGroupId, ctx.orgId);
+      await fetchDeliverableGroup(client, deliverableGroupId);
       const drop = await client.getDrop(dropId);
       if (!drop) {
         return { content: [{ type: "text", text: `Drop not found: ${dropId}` }] };
       }
-      await assertAccountInOrg(client, drop.accountId, ctx.orgId);
+      await assertAccountExists(client, drop.accountId);
       const ok = await client.setDropDeliverableGroup(deliverableGroupId, dropId);
       if (!ok) {
         return { content: [{ type: "text", text: `Drop not found: ${dropId}` }] };
@@ -24362,7 +24316,7 @@ ${g.acceptanceCriteria}` : null,
       deliverableGroupId: external_exports.string().describe("The DeliverableGroup ID")
     },
     async ({ deliverableGroupId }) => {
-      await assertDeliverableGroupInOrg(client, deliverableGroupId, ctx.orgId);
+      await fetchDeliverableGroup(client, deliverableGroupId);
       const workItems = await client.listTrackWorkItems(deliverableGroupId);
       const bvIds = [...new Set(
         workItems.map((wi) => wi.beatVersionId).filter((id) => id !== void 0)
@@ -24438,7 +24392,7 @@ function registerDownbeatTools(server, ctx, client) {
     "Set a Downbeat on a Beat \u2014 a non-destructive recalibration anchor that freezes the current convergence reading and Coda content-hash. Future progress is measured from here without erasing prior increments. Returns the created anchor. A Beat with zero increments can still be anchored.",
     { beatId: external_exports.string().describe("The beat ID (e.g., TF-B-001)") },
     async ({ beatId }) => {
-      const beat = await fetchBeatInOrg(client, beatId, ctx.orgId);
+      const beat = await fetchBeat(client, beatId);
       const downbeat = await client.setDownbeat(beat.systemId, beatId);
       if (!downbeat) {
         return { content: [{ type: "text", text: `Could not set a Downbeat for beat "${beatId}".` }], isError: true };
@@ -24451,7 +24405,7 @@ function registerDownbeatTools(server, ctx, client) {
     "Read-only: the Beat Versions delivered since the latest Downbeat (the non-destructive default view window). When no Downbeat has been set, returns every increment.",
     { beatId: external_exports.string().describe("The beat ID (e.g., TF-B-001)") },
     async ({ beatId }) => {
-      const beat = await fetchBeatInOrg(client, beatId, ctx.orgId);
+      const beat = await fetchBeat(client, beatId);
       const result = await client.listIncrementsSinceDownbeat(beat.systemId, beatId);
       if (!result) {
         return { content: [{ type: "text", text: `No such beat "${beatId}".` }], isError: true };
@@ -24464,7 +24418,7 @@ function registerDownbeatTools(server, ctx, client) {
     "Read-only: whether the Beat\u2019s Coda has changed since the latest Downbeat was set (the goal moved). Reports hasDownbeat=false when the Beat has never been recalibrated.",
     { beatId: external_exports.string().describe("The beat ID (e.g., TF-B-001)") },
     async ({ beatId }) => {
-      const beat = await fetchBeatInOrg(client, beatId, ctx.orgId);
+      const beat = await fetchBeat(client, beatId);
       const report = await client.getCodaDrift(beat.systemId, beatId);
       if (!report) {
         return { content: [{ type: "text", text: `No such beat "${beatId}".` }], isError: true };
@@ -24477,7 +24431,7 @@ function registerDownbeatTools(server, ctx, client) {
     "Read-only: whether sibling Beats created since the latest Downbeat leave this Beat coherent with what got built around it \u2014 a drift signal edited-goal content-hash comparison (get_coda_drift) cannot catch, since this Beat's own text may be unchanged. Reports hasDownbeat=false when the Beat has never been recalibrated.",
     { beatId: external_exports.string().describe("The beat ID (e.g., TF-B-001)") },
     async ({ beatId }) => {
-      const beat = await fetchBeatInOrg(client, beatId, ctx.orgId);
+      const beat = await fetchBeat(client, beatId);
       const report = await client.getRelationalDrift(beat.systemId, beatId);
       if (!report) {
         return { content: [{ type: "text", text: `No such beat "${beatId}".` }], isError: true };
@@ -24552,7 +24506,7 @@ function registerDropQualityTools(server, ctx, client) {
     },
     async ({ dropId, systemId, wait }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         const drop = await client.getDrop(dropId);
         if (!drop) {
           return { content: [{ type: "text", text: `Drop "${dropId}" not found.` }], isError: true };
@@ -24946,7 +24900,7 @@ function registerEmbeddingTools(server, ctx, client) {
       systemId: external_exports.string().describe("The system ID to embed entities for")
     },
     async ({ systemId }) => {
-      await assertSystemInOrg(client, systemId, ctx.orgId);
+      await assertSystemExists(client, systemId);
       const result = await client.embedSystemEntities(systemId);
       const text = `## Embedding Results
 
@@ -24958,33 +24912,33 @@ function registerEmbeddingTools(server, ctx, client) {
   );
   server.tool(
     "search",
-    "Free-text semantic search across project, teamspace, or org scope. Provide exactly one of systemId / teamspaceId / orgLevel. Teamspace and org searches fan out across child projects and merge by score. Cross-project results carry the source project name.",
+    "Free-text semantic search across system, teamspace, or org scope. Provide exactly one of systemId / teamspaceId / orgId. Teamspace and org searches fan out across child projects and merge by score. Cross-project results carry the source project name.",
     {
       systemId: external_exports.string().optional().describe("Search within a single project"),
       teamspaceId: external_exports.string().optional().describe("Search across all projects in a teamspace"),
-      orgLevel: external_exports.boolean().optional().describe("Search across every project in the configured org"),
+      orgId: external_exports.string().optional().describe("Search across every system in this organization \u2014 see list_organizations"),
       query: external_exports.string().describe("Natural language search query"),
       limit: external_exports.coerce.number().int().min(1).max(50).optional().default(10).describe("Max results to return. Default 10"),
       includeArchived: external_exports.boolean().optional().default(false).describe("Include archived/deprecated entities in results (excluded by default)"),
       entityType: external_exports.enum(["note", "beat", "revision"]).optional().describe("Restrict results to a specific entity type"),
-      noteType: external_exports.enum(["context", "assumption", "constraint", "guidance", "decision", "document"]).optional().describe("Restrict results to a specific note type (only applies when entityType is note or unset). Requires embeddings generated after this filter was introduced."),
+      noteType: external_exports.enum(["context", "constraint", "guidance", "decision", "document"]).optional().describe("Restrict results to a specific note type (only applies when entityType is note or unset). Requires embeddings generated after this filter was introduced."),
       noteStatus: external_exports.enum(["active", "unvalidated", "validated", "invalidated", "inProgress", "resolved", "superseded", "dismissed"]).optional().describe("Restrict note results to a specific status (e.g. unvalidated). DynamoDB post-filter \u2014 works without re-embedding."),
       beatId: external_exports.string().optional().describe("Restrict note results to those belonging to a specific beat (DynamoDB post-filter, no re-embedding needed)")
     },
-    async ({ systemId, teamspaceId, orgLevel, query, limit, includeArchived, entityType, noteType, noteStatus, beatId }) => {
-      const provided = [systemId, teamspaceId, orgLevel].filter(Boolean).length;
+    async ({ systemId, teamspaceId, orgId, query, limit, includeArchived, entityType, noteType, noteStatus, beatId }) => {
+      const provided = [systemId, teamspaceId, orgId].filter(Boolean).length;
       if (provided !== 1) {
-        throw new Error("Specify exactly one of systemId, teamspaceId, or orgLevel.");
+        throw new Error("Specify exactly one of systemId, teamspaceId, or orgId.");
       }
       let scope;
       if (systemId) {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         scope = { systemId };
       } else if (teamspaceId) {
-        await assertTeamspaceInOrg(client, teamspaceId, ctx.orgId);
+        await assertTeamspaceExists(client, teamspaceId);
         scope = { teamspaceId };
       } else {
-        scope = { orgId: ctx.orgId };
+        scope = { orgId };
       }
       const results = await client.searchByText(scope, query, { limit, includeArchived, entityType, noteType, noteStatus, beatId });
       const text = formatSimilarityResults(results, query, "Search Results");
@@ -25004,7 +24958,7 @@ function registerEmbeddingTools(server, ctx, client) {
       beatId: external_exports.string().optional().describe("Restrict results to notes belonging to a specific beat (DynamoDB post-filter)")
     },
     async ({ noteId, systemId, threshold, limit, includeArchived = false, noteStatus, beatId }) => {
-      await assertSystemInOrg(client, systemId, ctx.orgId);
+      await assertSystemExists(client, systemId);
       const ids = Array.isArray(noteId) ? noteId : [noteId];
       if (ids.length === 1) {
         const results = await client.findSimilarNotes(ids[0], systemId, { threshold, limit, includeArchived, noteStatus, beatId });
@@ -25029,7 +24983,7 @@ function registerEmbeddingTools(server, ctx, client) {
       includeArchived: external_exports.boolean().optional().default(false).describe("Include archived/deprecated beats in results (excluded by default)")
     },
     async ({ beatId, systemId, threshold, limit, includeArchived = false }) => {
-      await assertBeatInOrg(client, beatId, ctx.orgId);
+      await assertBeatExists(client, beatId);
       const results = await client.findSimilarBeats(beatId, systemId, { threshold, limit, includeArchived });
       const text = formatSimilarityResults(results, beatId, "Similar Beats");
       return { content: [{ type: "text", text }] };
@@ -25045,7 +24999,7 @@ function registerEmbeddingTools(server, ctx, client) {
       limit: external_exports.coerce.number().int().min(1).max(50).optional().default(10).describe("Max results to return. Default 10")
     },
     async ({ noteId, systemId, threshold, limit }) => {
-      await assertSystemInOrg(client, systemId, ctx.orgId);
+      await assertSystemExists(client, systemId);
       const results = await client.findRelatedBeats(noteId, systemId, { threshold, limit });
       const text = formatSimilarityResults(results, noteId, "Related Beats");
       return { content: [{ type: "text", text }] };
@@ -25061,7 +25015,7 @@ function registerEmbeddingTools(server, ctx, client) {
       includeLinked: external_exports.coerce.boolean().optional().default(false).describe("Include notes that already have dependsOnNotes links. Default false (excludes them). Set true for thematic grouping pass.")
     },
     async ({ systemId, threshold, minClusterSize, includeLinked }) => {
-      await assertSystemInOrg(client, systemId, ctx.orgId);
+      await assertSystemExists(client, systemId);
       const result = await client.clusterNotes(systemId, { threshold, minClusterSize, excludeAlreadyLinked: !includeLinked });
       if (result.clusters.length === 0) {
         return { content: [{ type: "text", text: `No clusters found among ${result.totalAnalyzed} analyzed notes. Try lowering the threshold.` }] };
@@ -25092,7 +25046,7 @@ ${members}`;
       includeLinked: external_exports.coerce.boolean().optional().default(false).describe("Include notes that already have dependsOnNotes links. Default false.")
     },
     async ({ systemId, threshold, minClusterSize, includeLinked }) => {
-      await assertSystemInOrg(client, systemId, ctx.orgId);
+      await assertSystemExists(client, systemId);
       const result = await client.consolidateNotes(systemId, { threshold, minClusterSize, includeLinked });
       if (result.proposals.length === 0) {
         return { content: [{ type: "text", text: `No consolidation candidates found among ${result.totalAnalyzed} analyzed notes.` }] };
@@ -25333,7 +25287,7 @@ function registerLayerTools(server, ctx, client) {
     },
     async ({ systemId }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         return { content: [{ type: "text", text: `Access denied: ${message}` }], isError: true };
@@ -25358,7 +25312,7 @@ function registerLayerTools(server, ctx, client) {
     },
     async ({ systemId, layerId }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         return { content: [{ type: "text", text: `Access denied: ${message}` }], isError: true };
@@ -25393,7 +25347,7 @@ function registerLayerTools(server, ctx, client) {
     },
     async ({ systemId, layerKey, name, description, parentLayerId, repoPatterns }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         return { content: [{ type: "text", text: `Access denied: ${message}` }], isError: true };
@@ -25432,7 +25386,7 @@ ${formatLayerDetail(layer)}` }] };
     },
     async ({ systemId, layerId, name, description, repoPatterns }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         return { content: [{ type: "text", text: `Access denied: ${message}` }], isError: true };
@@ -25476,7 +25430,7 @@ ${formatLayerDetail(layer)}` }] };
     },
     async ({ systemId, layerId, status, reason }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         return { content: [{ type: "text", text: `Access denied: ${message}` }], isError: true };
@@ -25508,14 +25462,17 @@ ${formatLayerDetail(layer)}` }] };
 }
 
 // ../../libs/harmonica-services/src/mcp/tools/membership-tools.ts
+var orgIdArg = external_exports.string().describe("The organization ID \u2014 see list_organizations");
 function registerMembershipTools(server, ctx, client) {
   server.tool(
     "list_org_members",
-    "List all members of the configured organization",
-    {},
-    async () => {
+    "List all members of an organization",
+    {
+      orgId: orgIdArg
+    },
+    async ({ orgId }) => {
       try {
-        const members = await client.listOrgMembers(ctx.orgId);
+        const members = await client.listOrgMembers(orgId);
         if (members.length === 0) {
           return { content: [{ type: "text", text: "No members found." }] };
         }
@@ -25533,14 +25490,15 @@ function registerMembershipTools(server, ctx, client) {
   );
   server.tool(
     "add_member",
-    "Grant a user access to the configured organization. Their name and avatar are filled in when they first sign in.",
+    "Grant a user access to an organization. Their name and avatar are filled in when they first sign in.",
     {
+      orgId: orgIdArg,
       email: external_exports.string().email().describe("Email address (used as the user ID)"),
       role: external_exports.enum(["member", "admin", "client"]).optional().describe('Organization role (defaults to "member")')
     },
-    async ({ email: email2, role }) => {
+    async ({ orgId, email: email2, role }) => {
       try {
-        const member = await client.addOrgMember(ctx.orgId, { email: email2, role });
+        const member = await client.addOrgMember(orgId, { email: email2, role });
         const lines = [
           "Member added successfully.",
           "",
@@ -25559,14 +25517,15 @@ function registerMembershipTools(server, ctx, client) {
   );
   server.tool(
     "update_member_role",
-    "Change a member's role within the configured organization.",
+    "Change a member's role within an organization.",
     {
+      orgId: orgIdArg,
       userId: external_exports.string().describe("User ID (email address) of the member to update"),
       role: external_exports.enum(["member", "admin", "client"]).describe("New organization role")
     },
-    async ({ userId, role }) => {
+    async ({ orgId, userId, role }) => {
       try {
-        const member = await client.updateOrgMember(ctx.orgId, userId, { role });
+        const member = await client.updateOrgMember(orgId, userId, { role });
         if (!member) {
           return { content: [{ type: "text", text: `Member not found: "${userId}"` }], isError: true };
         }
@@ -25589,13 +25548,14 @@ function registerMembershipTools(server, ctx, client) {
   );
   server.tool(
     "remove_member",
-    "Remove a user from the configured organization.",
+    "Remove a user from an organization.",
     {
+      orgId: orgIdArg,
       userId: external_exports.string().describe("User ID (email address) of the member to remove")
     },
-    async ({ userId }) => {
+    async ({ orgId, userId }) => {
       try {
-        await client.removeOrgMember(ctx.orgId, userId);
+        await client.removeOrgMember(orgId, userId);
         return { content: [{ type: "text", text: `Member "${userId}" has been removed from the organization.` }] };
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
@@ -25814,7 +25774,7 @@ function registerNextActionsTools(server, ctx, client) {
     },
     async ({ systemId, limit }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         const actions = await client.getNextActions(systemId, { limit });
         return { content: [{ type: "text", text: formatNextActions(actions) }] };
       } catch (err) {
@@ -25831,7 +25791,7 @@ function registerNextActionsTools(server, ctx, client) {
     },
     async ({ systemId }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         const actions = await client.listTriageActions(systemId);
         return { content: [{ type: "text", text: formatTriageActions(actions) }] };
       } catch (err) {
@@ -25849,7 +25809,7 @@ function registerNextActionsTools(server, ctx, client) {
     },
     async ({ systemId, actionKey }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         await client.dismissTriageAction(systemId, actionKey, ctx.user?.userId ?? "mcp");
         return { content: [{ type: "text", text: `Action ${actionKey} dismissed.` }] };
       } catch (err) {
@@ -26302,14 +26262,10 @@ var BeatVersionStatusSchema = external_exports.preprocess(
   (value) => typeof value === "string" && ACTIVE_BEAT_VERSION_STATUSES.has(value) ? "active" : "archived",
   external_exports.enum(BINARY_ENTITY_STATUS_VALUES)
 );
-var NoteTypeSchema = external_exports.enum([
-  "context",
-  "assumption",
-  "constraint",
-  "guidance",
-  "decision",
-  "document"
-]);
+var NoteTypeSchema = external_exports.preprocess(
+  (v) => v === "assumption" ? "context" : v,
+  external_exports.enum(["context", "constraint", "guidance", "decision", "document"])
+);
 var NoteStatusSchema = external_exports.enum([
   "active",
   "unvalidated",
@@ -26322,62 +26278,25 @@ var NoteStatusSchema = external_exports.enum([
 ]);
 var SystemStatusSchema = external_exports.enum(["active", "archived", "draft"]);
 var ChangeImportanceSchema = external_exports.enum(["minor", "moderate", "major"]);
-var normalizeSystemId = (raw) => {
-  if (typeof raw !== "object" || raw === null || Array.isArray(raw)) return raw;
-  const b = raw;
-  const id = b["systemId"] || b["projectId"];
-  if (!id) return raw;
-  return { ...b, systemId: id };
-};
-var normalizeSystemIdAndName = (raw) => {
-  if (typeof raw !== "object" || raw === null || Array.isArray(raw)) return raw;
-  const b = raw;
-  const result = { ...b };
-  const id = b["systemId"] || b["projectId"];
-  if (id) result["systemId"] = id;
-  if ((b["systemName"] == null || b["systemName"] === "") && b["projectName"]) result["systemName"] = b["projectName"];
-  return result;
-};
-var normalizeSystemIdAndTitle = (raw) => {
-  if (typeof raw !== "object" || raw === null || Array.isArray(raw)) return raw;
-  const b = raw;
-  const id = b["systemId"] || b["projectId"];
-  const title = b["systemTitle"] || b["projectTitle"];
-  const result = { ...b };
-  if (id) result["systemId"] = id;
-  if (title) result["systemTitle"] = title;
-  return result;
-};
-var BeatApiSchema = external_exports.preprocess(
-  (raw) => {
-    if (typeof raw !== "object" || raw === null) return raw;
-    const b = raw;
-    const id = b["systemId"] || b["projectId"];
-    const result = { ...b };
-    if (id) result["systemId"] = id;
-    if ((b["systemName"] == null || b["systemName"] === "") && b["projectName"]) result["systemName"] = b["projectName"];
-    return result;
-  },
-  external_exports.object({
-    beatId: external_exports.string(),
-    systemId: external_exports.string(),
-    /** Source system's title; attached by the flat /api/beats endpoint for
-     *  multi-system (teamspace/org) responses. */
-    systemName: external_exports.string().nullish(),
-    title: external_exports.string(),
-    version: external_exports.number().nullish(),
-    description: external_exports.string().nullish(),
-    beatStatus: BeatStatusSchema.nullish(),
-    tags: external_exports.array(external_exports.string()).nullish(),
-    priority: external_exports.number().nullish(),
-    estimatedEffort: external_exports.string().nullish(),
-    humanAssignee: HumanAssigneeSchema.nullish(),
-    agentAssignee: AgentAssigneeSchema.nullish(),
-    revisionCount: external_exports.number().nullish(),
-    createdAt: external_exports.string(),
-    updatedAt: external_exports.string()
-  }).passthrough()
-);
+var BeatApiSchema = external_exports.object({
+  beatId: external_exports.string(),
+  systemId: external_exports.string(),
+  /** Source system's title; attached by the flat /api/beats endpoint for
+   *  multi-system (teamspace/org) responses. */
+  systemName: external_exports.string().nullish(),
+  title: external_exports.string(),
+  version: external_exports.number().nullish(),
+  description: external_exports.string().nullish(),
+  beatStatus: BeatStatusSchema.nullish(),
+  tags: external_exports.array(external_exports.string()).nullish(),
+  priority: external_exports.number().nullish(),
+  estimatedEffort: external_exports.string().nullish(),
+  humanAssignee: HumanAssigneeSchema.nullish(),
+  agentAssignee: AgentAssigneeSchema.nullish(),
+  revisionCount: external_exports.number().nullish(),
+  createdAt: external_exports.string(),
+  updatedAt: external_exports.string()
+}).passthrough();
 var RevisionScmSchema = external_exports.object({
   provider: external_exports.literal("github"),
   number: external_exports.string(),
@@ -26386,33 +26305,30 @@ var RevisionScmSchema = external_exports.object({
   state: external_exports.enum(["draft", "open", "merged", "closed"]),
   mergeSha: external_exports.string().optional()
 });
-var RevisionApiSchema = external_exports.preprocess(
-  normalizeSystemId,
-  external_exports.object({
-    revisionId: external_exports.string(),
-    beatId: external_exports.string(),
-    systemId: external_exports.string(),
-    status: RevisionStatusSchema,
-    title: external_exports.string().default(""),
-    versionNumber: external_exports.number(),
-    changeSummary: external_exports.string().nullish(),
-    changeImportance: ChangeImportanceSchema.nullish(),
-    primaryUser: external_exports.string(),
-    description: external_exports.string().nullish(),
-    tags: external_exports.array(external_exports.string()).nullish(),
-    priority: external_exports.number().nullish(),
-    estimatedEffort: external_exports.string().nullish(),
-    humanAssignee: HumanAssigneeSchema.nullish(),
-    agentAssignee: AgentAssigneeSchema.nullish(),
-    scm: RevisionScmSchema.optional(),
-    // The Layer this Revision was created under (immutable). Absent on Revisions
-    // predating Layers — never backfilled — so consumers group those as "Unassigned".
-    layerId: external_exports.string().nullish(),
-    createdAt: external_exports.string(),
-    updatedAt: external_exports.string()
-  }).passthrough()
-);
-var NoteApiSchema = external_exports.preprocess(normalizeSystemId, external_exports.object({
+var RevisionApiSchema = external_exports.object({
+  revisionId: external_exports.string(),
+  beatId: external_exports.string(),
+  systemId: external_exports.string(),
+  status: RevisionStatusSchema,
+  title: external_exports.string().default(""),
+  versionNumber: external_exports.number(),
+  changeSummary: external_exports.string().nullish(),
+  changeImportance: ChangeImportanceSchema.nullish(),
+  primaryUser: external_exports.string(),
+  description: external_exports.string().nullish(),
+  tags: external_exports.array(external_exports.string()).nullish(),
+  priority: external_exports.number().nullish(),
+  estimatedEffort: external_exports.string().nullish(),
+  humanAssignee: HumanAssigneeSchema.nullish(),
+  agentAssignee: AgentAssigneeSchema.nullish(),
+  scm: RevisionScmSchema.optional(),
+  // The Layer this Revision was created under (immutable). Absent on Revisions
+  // predating Layers — never backfilled — so consumers group those as "Unassigned".
+  layerId: external_exports.string().nullish(),
+  createdAt: external_exports.string(),
+  updatedAt: external_exports.string()
+}).passthrough();
+var NoteApiSchema = external_exports.object({
   noteId: external_exports.string(),
   noteType: NoteTypeSchema,
   status: NoteStatusSchema,
@@ -26428,21 +26344,18 @@ var NoteApiSchema = external_exports.preprocess(normalizeSystemId, external_expo
   agentAssignee: AgentAssigneeSchema.nullish(),
   createdAt: external_exports.string(),
   updatedAt: external_exports.string()
-}).passthrough());
-var SystemApiSchema = external_exports.preprocess(
-  normalizeSystemId,
-  external_exports.object({
-    systemId: external_exports.string(),
-    title: external_exports.string(),
-    status: SystemStatusSchema,
-    description: external_exports.string().optional(),
-    strategy: external_exports.string().optional(),
-    orgId: external_exports.string().optional(),
-    ownerUserId: external_exports.string().optional(),
-    createdAt: external_exports.string(),
-    updatedAt: external_exports.string()
-  }).passthrough()
-);
+}).passthrough();
+var SystemApiSchema = external_exports.object({
+  systemId: external_exports.string(),
+  title: external_exports.string(),
+  status: SystemStatusSchema,
+  description: external_exports.string().optional(),
+  strategy: external_exports.string().optional(),
+  orgId: external_exports.string().optional(),
+  ownerUserId: external_exports.string().optional(),
+  createdAt: external_exports.string(),
+  updatedAt: external_exports.string()
+}).passthrough();
 var BeatsResponseSchema = external_exports.object({
   beats: external_exports.array(BeatApiSchema),
   total: external_exports.number().optional(),
@@ -26628,43 +26541,37 @@ var CHECK_TARGET_TYPES = [
   "organization"
 ];
 var CheckTargetTypeSchema = external_exports.enum(CHECK_TARGET_TYPES);
-var CheckApiSchema = external_exports.preprocess(
-  normalizeSystemId,
-  external_exports.object({
-    checkId: external_exports.string(),
-    checkType: CheckTypeSchema,
-    targetType: CheckTargetTypeSchema,
-    targetId: external_exports.string(),
-    systemId: external_exports.string(),
-    overallScore: external_exports.number(),
-    dimensions: external_exports.array(CheckDimensionScoreSchema),
-    summary: external_exports.string(),
-    topSuggestion: external_exports.string().optional(),
-    gaps: external_exports.array(CheckGapSchema).optional(),
-    taskId: external_exports.string().optional(),
-    triggeredBy: external_exports.string().optional(),
-    createdAt: external_exports.string(),
-    updatedAt: external_exports.string()
-  }).passthrough()
-);
-var SystemCheckApiSchema = external_exports.preprocess(
-  normalizeSystemId,
-  external_exports.object({
-    checkId: external_exports.string(),
-    checkType: CheckTypeSchema,
-    targetType: CheckTargetTypeSchema,
-    targetId: external_exports.string(),
-    systemId: external_exports.string(),
-    overallScore: external_exports.number(),
-    summary: external_exports.string(),
-    triggeredBy: external_exports.string().optional(),
-    createdAt: external_exports.string(),
-    updatedAt: external_exports.string(),
-    /** Populated only when the API was called with ?includeDimensions=true.
-     *  Read-time enrichment from the underlying Check entity. */
-    dimensions: external_exports.array(CheckDimensionScoreSchema).optional()
-  }).passthrough()
-);
+var CheckApiSchema = external_exports.object({
+  checkId: external_exports.string(),
+  checkType: CheckTypeSchema,
+  targetType: CheckTargetTypeSchema,
+  targetId: external_exports.string(),
+  systemId: external_exports.string(),
+  overallScore: external_exports.number(),
+  dimensions: external_exports.array(CheckDimensionScoreSchema),
+  summary: external_exports.string(),
+  topSuggestion: external_exports.string().optional(),
+  gaps: external_exports.array(CheckGapSchema).optional(),
+  taskId: external_exports.string().optional(),
+  triggeredBy: external_exports.string().optional(),
+  createdAt: external_exports.string(),
+  updatedAt: external_exports.string()
+}).passthrough();
+var SystemCheckApiSchema = external_exports.object({
+  checkId: external_exports.string(),
+  checkType: CheckTypeSchema,
+  targetType: CheckTargetTypeSchema,
+  targetId: external_exports.string(),
+  systemId: external_exports.string(),
+  overallScore: external_exports.number(),
+  summary: external_exports.string(),
+  triggeredBy: external_exports.string().optional(),
+  createdAt: external_exports.string(),
+  updatedAt: external_exports.string(),
+  /** Populated only when the API was called with ?includeDimensions=true.
+   *  Read-time enrichment from the underlying Check entity. */
+  dimensions: external_exports.array(CheckDimensionScoreSchema).optional()
+}).passthrough();
 var CheckResponseSchema = external_exports.object({ check: CheckApiSchema }).passthrough();
 var ChecksResponseSchema = external_exports.object({ checks: external_exports.array(SystemCheckApiSchema), nextCursor: external_exports.string().optional() }).passthrough();
 var TaskStatusSchema2 = external_exports.enum(["pending", "running", "completed", "failed"]);
@@ -26709,30 +26616,27 @@ var OrgMemberSchema = external_exports.object({
 var OrganizationsResponseSchema = external_exports.array(OrganizationSummarySchema);
 var OrgMembersResponseSchema = external_exports.array(OrgMemberSchema);
 var WrappedOrgMembersResponseSchema = external_exports.object({ members: OrgMembersResponseSchema });
-var ActivitySchema = external_exports.preprocess(
-  normalizeSystemId,
-  external_exports.object({
-    activityId: external_exports.string(),
-    systemId: external_exports.string(),
-    action: external_exports.string(),
-    importance: external_exports.enum(["minor", "moderate", "major"]),
-    reason: external_exports.string(),
-    // actorType is typed as string (not a strict enum) because the API accepts values
-    // beyond 'user'/'system' (e.g. 'human', 'agent') depending on the call site.
-    actorType: external_exports.string().optional(),
-    actorId: external_exports.string().optional(),
-    affectedBeatIds: external_exports.array(external_exports.string()).optional(),
-    affectedBeatTitles: external_exports.array(external_exports.string()).optional(),
-    metadata: external_exports.record(external_exports.unknown()).optional(),
-    createdAt: external_exports.string()
-  }).passthrough()
-);
+var ActivitySchema = external_exports.object({
+  activityId: external_exports.string(),
+  systemId: external_exports.string(),
+  action: external_exports.string(),
+  importance: external_exports.enum(["minor", "moderate", "major"]),
+  reason: external_exports.string(),
+  // actorType is typed as string (not a strict enum) because the API accepts values
+  // beyond 'user'/'system' (e.g. 'human', 'agent') depending on the call site.
+  actorType: external_exports.string().optional(),
+  actorId: external_exports.string().optional(),
+  affectedBeatIds: external_exports.array(external_exports.string()).optional(),
+  affectedBeatTitles: external_exports.array(external_exports.string()).optional(),
+  metadata: external_exports.record(external_exports.unknown()).optional(),
+  createdAt: external_exports.string()
+}).passthrough();
 var ActivitiesResponseSchema = external_exports.object({
   activities: external_exports.array(ActivitySchema),
   hasMore: external_exports.boolean(),
   nextCursor: external_exports.string().optional()
 }).passthrough();
-var NotificationSchema2 = external_exports.preprocess(normalizeSystemId, external_exports.object({
+var NotificationSchema2 = external_exports.object({
   notificationId: external_exports.string(),
   action: external_exports.string(),
   title: external_exports.string(),
@@ -26747,7 +26651,7 @@ var NotificationSchema2 = external_exports.preprocess(normalizeSystemId, externa
   actorType: external_exports.enum(["user", "system"]),
   actorId: external_exports.string().optional(),
   actorName: external_exports.string().optional()
-}).passthrough());
+}).passthrough();
 var NotificationsResponseSchema = external_exports.object({
   notifications: external_exports.array(NotificationSchema2),
   hasMore: external_exports.boolean().optional(),
@@ -26791,29 +26695,26 @@ var InboxItemsResponseSchema = external_exports.object({
   hasMore: external_exports.boolean(),
   nextCursor: external_exports.string().optional()
 }).passthrough();
-var TriageActionSchema = external_exports.preprocess(
-  normalizeSystemId,
-  external_exports.object({
-    actionKey: external_exports.string(),
-    systemId: external_exports.string(),
-    entityId: external_exports.string().optional(),
-    entityType: external_exports.enum(["beat", "revision", "note"]).optional(),
-    beatId: external_exports.string().optional(),
-    category: external_exports.string(),
-    priority: external_exports.string(),
-    beatStatus: external_exports.string().optional(),
-    title: external_exports.string(),
-    description: external_exports.string(),
-    status: external_exports.enum(["open", "acted", "dismissed", "resolved"]),
-    decision: external_exports.enum(["auto-execute", "escalate", "skip"]).optional(),
-    taskId: external_exports.string().optional(),
-    taskStatus: external_exports.string().optional(),
-    firstSeenAt: external_exports.string(),
-    lastSeenAt: external_exports.string(),
-    dismissedBy: external_exports.string().optional(),
-    dismissedAt: external_exports.string().optional()
-  }).passthrough()
-);
+var TriageActionSchema = external_exports.object({
+  actionKey: external_exports.string(),
+  systemId: external_exports.string(),
+  entityId: external_exports.string().optional(),
+  entityType: external_exports.enum(["beat", "revision", "note"]).optional(),
+  beatId: external_exports.string().optional(),
+  category: external_exports.string(),
+  priority: external_exports.string(),
+  beatStatus: external_exports.string().optional(),
+  title: external_exports.string(),
+  description: external_exports.string(),
+  status: external_exports.enum(["open", "acted", "dismissed", "resolved"]),
+  decision: external_exports.enum(["auto-execute", "escalate", "skip"]).optional(),
+  taskId: external_exports.string().optional(),
+  taskStatus: external_exports.string().optional(),
+  firstSeenAt: external_exports.string(),
+  lastSeenAt: external_exports.string(),
+  dismissedBy: external_exports.string().optional(),
+  dismissedAt: external_exports.string().optional()
+}).passthrough();
 var TriageActionsResponseSchema = external_exports.object({
   actions: external_exports.array(TriageActionSchema)
 }).passthrough();
@@ -26830,7 +26731,7 @@ var NextActionSchema = external_exports.object({
 var NextActionsResponseSchema = external_exports.object({
   actions: external_exports.array(NextActionSchema)
 }).passthrough();
-var SearchResultSchema = external_exports.preprocess(normalizeSystemIdAndName, external_exports.object({
+var SearchResultSchema = external_exports.object({
   entityId: external_exports.string(),
   entityType: external_exports.enum(["beat", "note", "revision", "beatVersion", "drop", "project", "system"]),
   score: external_exports.number(),
@@ -26838,7 +26739,7 @@ var SearchResultSchema = external_exports.preprocess(normalizeSystemIdAndName, e
   systemId: external_exports.string().optional(),
   systemName: external_exports.string().optional(),
   teamspaceId: external_exports.string().optional()
-}).passthrough());
+}).passthrough();
 var SearchScopeSchema = external_exports.object({
   kind: external_exports.enum(["project", "teamspace", "org"]),
   id: external_exports.string()
@@ -26882,7 +26783,7 @@ var LandscapeResponseSchema = external_exports.object({
     (raw) => {
       if (typeof raw !== "object" || raw === null) return raw;
       const o = raw;
-      const id = o["systemId"] ?? o["projectId"];
+      const id = o["systemId"];
       if (!id) return raw;
       return { ...o, systemId: id };
     },
@@ -26900,14 +26801,16 @@ var ClusterDescriptionSchema = external_exports.object({
   title: external_exports.string(),
   description: external_exports.string()
 }).passthrough();
-var BeatVersionItemSchema = external_exports.preprocess(normalizeSystemId, external_exports.object({
+var BeatVersionItemSchema = external_exports.object({
   beatVersionId: external_exports.string(),
   beatId: external_exports.string(),
   systemId: external_exports.string().optional(),
   status: external_exports.string()
-}).passthrough());
+}).passthrough();
 var BeatVersionsResponseSchema = external_exports.object({
-  beatVersions: external_exports.array(BeatVersionItemSchema)
+  beatVersions: external_exports.array(BeatVersionItemSchema),
+  cursor: external_exports.string().optional(),
+  hasMore: external_exports.boolean().optional()
 }).passthrough();
 var ConversationSummaryBaseSchema = external_exports.object({
   conversationId: external_exports.string(),
@@ -26924,7 +26827,7 @@ var ConversationSummaryBaseSchema = external_exports.object({
   createdAt: external_exports.string(),
   updatedAt: external_exports.string()
 });
-var ConversationSummarySchema = external_exports.preprocess(normalizeSystemId, ConversationSummaryBaseSchema.passthrough());
+var ConversationSummarySchema = ConversationSummaryBaseSchema.passthrough();
 var StoredMessageSchema = external_exports.object({
   messageId: external_exports.string(),
   conversationId: external_exports.string(),
@@ -27169,30 +27072,21 @@ var AccountSystemApiSchema = external_exports.object({
 var AccountSystemsResponseSchema = external_exports.object({ systems: external_exports.array(AccountSystemApiSchema) }).passthrough();
 var LAYER_STATUSES = ["active", "archived"];
 var LayerStatusApiSchema = external_exports.enum(LAYER_STATUSES);
-var LayerApiSchema = external_exports.preprocess(
-  (raw) => {
-    if (typeof raw !== "object" || raw === null) return raw;
-    const l = raw;
-    const id = l["systemId"] || l["projectId"];
-    if (!id) return raw;
-    return { ...l, systemId: id };
-  },
-  external_exports.object({
-    layerId: external_exports.string(),
-    systemId: external_exports.string(),
-    layerKey: external_exports.string(),
-    name: external_exports.string(),
-    description: external_exports.string().nullish(),
-    parentLayerId: external_exports.string().nullish(),
-    repoPatterns: external_exports.array(external_exports.string()).nullish(),
-    status: LayerStatusApiSchema,
-    archivedAt: external_exports.string().nullish(),
-    createdBy: external_exports.string().nullish(),
-    version: external_exports.number().nullish(),
-    createdAt: external_exports.string(),
-    updatedAt: external_exports.string()
-  }).passthrough()
-);
+var LayerApiSchema = external_exports.object({
+  layerId: external_exports.string(),
+  systemId: external_exports.string(),
+  layerKey: external_exports.string(),
+  name: external_exports.string(),
+  description: external_exports.string().nullish(),
+  parentLayerId: external_exports.string().nullish(),
+  repoPatterns: external_exports.array(external_exports.string()).nullish(),
+  status: LayerStatusApiSchema,
+  archivedAt: external_exports.string().nullish(),
+  createdBy: external_exports.string().nullish(),
+  version: external_exports.number().nullish(),
+  createdAt: external_exports.string(),
+  updatedAt: external_exports.string()
+}).passthrough();
 var LayersResponseSchema = external_exports.object({ layers: external_exports.array(LayerApiSchema) }).passthrough();
 var LAYER_RUBRIC_SCOPES_LIST = ["account", "teamspace", "movement"];
 var LayerRubricScopeApiSchema = external_exports.enum(LAYER_RUBRIC_SCOPES_LIST);
@@ -27231,7 +27125,7 @@ var DELIVERABLE_GROUP_STATUSES = [
   "cancelled"
 ];
 var DeliverableGroupStatusSchema = external_exports.enum(DELIVERABLE_GROUP_STATUSES);
-var DeliverableGroupApiSchema = external_exports.preprocess(normalizeSystemId, external_exports.object({
+var DeliverableGroupApiSchema = external_exports.object({
   deliverableGroupId: external_exports.string(),
   groupCode: external_exports.string(),
   teamspaceId: external_exports.string(),
@@ -27252,7 +27146,7 @@ var DeliverableGroupApiSchema = external_exports.preprocess(normalizeSystemId, e
   version: external_exports.number().nullish(),
   createdAt: external_exports.string(),
   updatedAt: external_exports.string()
-}).passthrough());
+}).passthrough();
 var DeliverableGroupsResponseSchema = external_exports.object({
   deliverableGroups: external_exports.array(DeliverableGroupApiSchema)
 }).passthrough();
@@ -27269,33 +27163,27 @@ var MovementDropSummaryApiSchema = external_exports.object({
 var MovementDropsResponseSchema = external_exports.object({
   drops: external_exports.array(MovementDropSummaryApiSchema)
 }).passthrough();
-var WorkPlanBeatVersionApiSchema = external_exports.preprocess(
-  normalizeSystemId,
-  external_exports.object({
-    beatVersionId: external_exports.string(),
-    beatId: external_exports.string(),
-    systemId: external_exports.string(),
-    versionNumber: external_exports.number(),
-    title: external_exports.string(),
-    status: BeatVersionStatusSchema,
-    // Derived Value Units (VU = Δf × W), read-only. 0 when the BV has no confirmed
-    // value-velocity inputs. Computed server-side from the parent Beat's weight.
-    // `.default(0)` tolerates a rolling deploy where an older API omits the field —
-    // validatedApiFetch would otherwise throw and drop the whole hook into error.
-    valueUnits: external_exports.number().default(0),
-    createdAt: external_exports.string(),
-    updatedAt: external_exports.string()
-  }).passthrough()
-);
+var WorkPlanBeatVersionApiSchema = external_exports.object({
+  beatVersionId: external_exports.string(),
+  beatId: external_exports.string(),
+  systemId: external_exports.string(),
+  versionNumber: external_exports.number(),
+  title: external_exports.string(),
+  status: BeatVersionStatusSchema,
+  // Derived Value Units (VU = Δf × W), read-only. 0 when the BV has no confirmed
+  // value-velocity inputs. Computed server-side from the parent Beat's weight.
+  // `.default(0)` tolerates a rolling deploy where an older API omits the field —
+  // validatedApiFetch would otherwise throw and drop the whole hook into error.
+  valueUnits: external_exports.number().default(0),
+  createdAt: external_exports.string(),
+  updatedAt: external_exports.string()
+}).passthrough();
 var DeliverableGroupBeatVersionsResponseSchema = external_exports.object({
   beatVersions: external_exports.array(WorkPlanBeatVersionApiSchema)
 }).passthrough();
 var RevisionClaimActorSchema = external_exports.union([
   external_exports.object({ kind: external_exports.literal("user"), userId: external_exports.string() }),
-  external_exports.preprocess(
-    normalizeSystemId,
-    external_exports.object({ kind: external_exports.literal("agent"), agentId: external_exports.string(), systemId: external_exports.string() })
-  )
+  external_exports.object({ kind: external_exports.literal("agent"), agentId: external_exports.string(), systemId: external_exports.string() })
 ]);
 var RevisionClaimSchema = external_exports.object({
   claimId: external_exports.string(),
@@ -27306,39 +27194,33 @@ var RevisionClaimSchema = external_exports.object({
 var RevisionClaimsResponseSchema = external_exports.object({
   claims: external_exports.array(RevisionClaimSchema)
 }).passthrough();
-var ProposedRevisionSchema = external_exports.preprocess(
-  normalizeSystemIdAndTitle,
-  external_exports.object({
-    revisionId: external_exports.string(),
-    title: external_exports.string(),
-    state: external_exports.string(),
-    beatId: external_exports.string(),
-    beatTitle: external_exports.string().optional(),
-    systemId: external_exports.string(),
-    systemTitle: external_exports.string().optional()
-  }).passthrough()
-);
+var ProposedRevisionSchema = external_exports.object({
+  revisionId: external_exports.string(),
+  title: external_exports.string(),
+  state: external_exports.string(),
+  beatId: external_exports.string(),
+  beatTitle: external_exports.string().optional(),
+  systemId: external_exports.string(),
+  systemTitle: external_exports.string().optional()
+}).passthrough();
 var ReleaseIntervalSchema = external_exports.object({
   averageIntervalDays: external_exports.number(),
   sampleSize: external_exports.number(),
   isFallback: external_exports.boolean()
 }).passthrough();
-var EligibleBeatVersionForDropSchema = external_exports.preprocess(
-  normalizeSystemIdAndTitle,
-  external_exports.object({
-    beatVersionId: external_exports.string(),
-    title: external_exports.string(),
-    state: external_exports.string(),
-    beatId: external_exports.string(),
-    beatTitle: external_exports.string().optional(),
-    systemId: external_exports.string(),
-    systemTitle: external_exports.string().optional(),
-    createdAt: external_exports.string(),
-    updatedAt: external_exports.string(),
-    humanAssignee: external_exports.object({ email: external_exports.string(), name: external_exports.string() }).optional(),
-    currentDropAssignment: external_exports.object({ dropId: external_exports.string(), dropCode: external_exports.string().optional(), state: external_exports.string() }).optional()
-  }).passthrough()
-);
+var EligibleBeatVersionForDropSchema = external_exports.object({
+  beatVersionId: external_exports.string(),
+  title: external_exports.string(),
+  state: external_exports.string(),
+  beatId: external_exports.string(),
+  beatTitle: external_exports.string().optional(),
+  systemId: external_exports.string(),
+  systemTitle: external_exports.string().optional(),
+  createdAt: external_exports.string(),
+  updatedAt: external_exports.string(),
+  humanAssignee: external_exports.object({ email: external_exports.string(), name: external_exports.string() }).optional(),
+  currentDropAssignment: external_exports.object({ dropId: external_exports.string(), dropCode: external_exports.string().optional(), state: external_exports.string() }).optional()
+}).passthrough();
 var ScoredDropCandidateSchema = external_exports.object({
   bv: EligibleBeatVersionForDropSchema,
   // Score fields are nullable — the ranking engine returns null when there is
@@ -27558,7 +27440,7 @@ function sortNotesByCreatedAt(notes, orderBy) {
 
 // ../../libs/harmonica-services/src/mcp/tools/note-tools.ts
 var DISMISSED_NOTE_STATUS = "dismissed";
-var NOTE_TYPE_VALUES = ["context", "assumption", "constraint", "guidance", "decision", "document"];
+var NOTE_TYPE_VALUES = ["context", "constraint", "guidance", "decision", "document"];
 var NOTE_STATUS_VALUES = ["active", "unvalidated", "validated", "invalidated", "inProgress", "resolved", "superseded", "dismissed"];
 var DECISION_SIGNIFICANCE_VALUES2 = ["strategic", "structural", "implementation"];
 async function deliveryPolicyBlock(client, note) {
@@ -27605,7 +27487,7 @@ function registerNoteTools(server, ctx, client) {
         return { content: [{ type: "text", text: "orderBy requires beatId \u2014 it is only supported for beat-scoped queries." }], isError: true };
       }
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         return { content: [{ type: "text", text: `Access denied: ${message}` }], isError: true };
@@ -27688,13 +27570,14 @@ function registerNoteTools(server, ctx, client) {
     "list_org_notes",
     "List Notes at the organization level (cross-cutting constraints, org-wide decisions, and context that applies to all systems). Filterable by type and status. Use offset/limit to paginate.",
     {
+      orgId: external_exports.string().describe("The organization ID \u2014 see list_organizations"),
       noteType: external_exports.enum(NOTE_TYPE_VALUES).optional().describe("Filter by note type"),
       status: external_exports.enum(NOTE_STATUS_VALUES).optional().describe("Filter by status"),
       offset: external_exports.coerce.number().int().min(0).default(0).describe("Number of notes to skip (for pagination)"),
       limit: external_exports.coerce.number().int().min(1).max(500).default(100).describe("Max notes to return (default 100, max 500)")
     },
-    async ({ noteType, status, offset = 0, limit = 100 }) => {
-      const notes = await client.listOrgNotes(ctx.orgId, {
+    async ({ orgId, noteType, status, offset = 0, limit = 100 }) => {
+      const notes = await client.listOrgNotes(orgId, {
         noteType,
         status
       });
@@ -27725,9 +27608,6 @@ function registerNoteTools(server, ctx, client) {
       if (!movement) {
         return { content: [{ type: "text", text: `Movement not found: "${movementId}"` }], isError: true };
       }
-      if (movement.orgId !== ctx.orgId) {
-        return { content: [{ type: "text", text: `Movement "${movementId}" is not in the configured organization.` }], isError: true };
-      }
       const notes = await client.listMovementNotes(movementId, {
         noteType,
         status
@@ -27751,7 +27631,7 @@ function registerNoteTools(server, ctx, client) {
       systemId: external_exports.string().describe("The system ID")
     },
     async ({ systemId }) => {
-      await assertSystemInOrg(client, systemId, ctx.orgId);
+      await assertSystemExists(client, systemId);
       const DOCUMENT_FETCH_LIMIT = 5e3;
       const { notes: docs, hasMore: truncated } = await client.listAllSystemNotes(systemId, { noteType: "document" }, DOCUMENT_FETCH_LIMIT);
       const visibleDocs = docs.filter((d) => d.status !== DISMISSED_NOTE_STATUS);
@@ -27777,16 +27657,13 @@ function registerNoteTools(server, ctx, client) {
       }
       try {
         if (orgId) {
-          if (orgId !== ctx.orgId) {
-            return { content: [{ type: "text", text: "Access denied: orgId does not match the configured organization." }], isError: true };
-          }
           const note2 = await client.getOrgNote(orgId, noteId);
           if (!note2 || note2.organizationId !== orgId) {
             return { content: [{ type: "text", text: `Note not found: "${noteId}"` }], isError: true };
           }
           return { content: [{ type: "text", text: formatNoteDetail(note2) }] };
         }
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         const note = await client.getNote(noteId);
         if (!note) {
           return { content: [{ type: "text", text: `Note not found: "${noteId}"` }], isError: true };
@@ -27803,6 +27680,7 @@ function registerNoteTools(server, ctx, client) {
     "create_note",
     "Create a new Note. Provide exactly one of systemId, teamspaceId, movementId, or none (org-level): systemId scopes the note to a system (optionally with beatId), teamspaceId scopes it to a teamspace (no cascade to child systems), movementId scopes it to a Movement (commercial SOW container \u2014 engagement-level knowledge), and omitting all creates an org-level note that applies across all systems.",
     {
+      orgId: external_exports.string().optional().describe("The organization ID \u2014 required for an org-level Note (when systemId, teamspaceId and movementId are all omitted). See list_organizations."),
       systemId: external_exports.string().optional().describe("The system ID (omit for teamspace-, movement-, or org-level note)"),
       teamspaceId: external_exports.string().optional().describe("The teamspace ID (omit for system-, movement-, or org-level note)"),
       movementId: external_exports.string().min(1).optional().describe("The Movement ID (omit for system-, teamspace-, or org-level note)"),
@@ -27812,20 +27690,18 @@ function registerNoteTools(server, ctx, client) {
       revisionId: external_exports.string().optional().describe("Revision ID if this note is revision-scoped (requires systemId)"),
       beatVersionId: external_exports.string().optional().describe("Beat Version ID if this note governs a specific planning increment (requires beatId)"),
       rationale: external_exports.string().optional().describe("Why this note exists"),
-      confidence: external_exports.coerce.number().min(0).max(1).optional().describe("Confidence level for assumptions (0-1)"),
       affectsBeats: external_exports.array(external_exports.string()).optional().describe("Beat IDs this note impacts"),
       dependsOnNotes: external_exports.array(external_exports.string()).optional().describe("Note IDs this note depends on (child \u2192 parent links for consolidation)"),
       significance: external_exports.enum(DECISION_SIGNIFICANCE_VALUES2).optional().describe("Significance tier for decision Notes (strategic | structural | implementation). Defaults to implementation when unset. Only meaningful on noteType=decision.")
     },
-    async ({ systemId, teamspaceId, movementId, noteType, content, beatId, revisionId, beatVersionId, rationale, confidence, affectsBeats, dependsOnNotes, significance }) => {
+    async ({ orgId, systemId, teamspaceId, movementId, noteType, content, beatId, revisionId, beatVersionId, rationale, affectsBeats, dependsOnNotes, significance }) => {
       try {
         if ([systemId, teamspaceId, movementId].filter(Boolean).length > 1) {
           return { content: [{ type: "text", text: "Specify at most one of systemId, teamspaceId, or movementId." }], isError: true };
         }
-        const assumptionMeta = noteType === "assumption" && confidence !== void 0 ? { confidence } : void 0;
         let note;
         if (systemId) {
-          await assertSystemInOrg(client, systemId, ctx.orgId);
+          await assertSystemExists(client, systemId);
           const projectCode = systemId.substring(0, 4).toUpperCase();
           const noteId = await client.getNextNoteId(projectCode, systemId);
           note = await client.createNote({
@@ -27841,7 +27717,6 @@ function registerNoteTools(server, ctx, client) {
             aiGenerated: false,
             affectsBeats,
             dependsOnNotes,
-            assumptionMeta,
             ...noteType === "decision" && significance !== void 0 && { significance }
           });
         } else if (teamspaceId) {
@@ -27849,8 +27724,11 @@ function registerNoteTools(server, ctx, client) {
           if (!teamspace) {
             return { content: [{ type: "text", text: `Teamspace not found: "${teamspaceId}"` }], isError: true };
           }
-          if (teamspace.orgId !== ctx.orgId) {
-            return { content: [{ type: "text", text: `Teamspace "${teamspaceId}" is not in the configured organization.` }], isError: true };
+          if (orgId && teamspace.orgId !== orgId) {
+            return {
+              content: [{ type: "text", text: "Teamspace belongs to a different organization" }],
+              isError: true
+            };
           }
           note = await client.createTeamspaceNote(teamspaceId, teamspace.slug, {
             noteType,
@@ -27858,7 +27736,6 @@ function registerNoteTools(server, ctx, client) {
             rationale,
             createdBy: ctx.user.userId,
             aiGenerated: false,
-            assumptionMeta,
             ...noteType === "decision" && significance !== void 0 && { significance }
           });
         } else if (movementId) {
@@ -27866,26 +27743,24 @@ function registerNoteTools(server, ctx, client) {
           if (!movement) {
             return { content: [{ type: "text", text: `Movement not found: "${movementId}"` }], isError: true };
           }
-          if (movement.orgId !== ctx.orgId) {
-            return { content: [{ type: "text", text: `Movement "${movementId}" is not in the configured organization.` }], isError: true };
-          }
           note = await client.createMovementNote(movementId, movement.movementCode, {
             noteType,
             content,
             rationale,
             createdBy: ctx.user.userId,
             aiGenerated: false,
-            assumptionMeta,
             ...noteType === "decision" && significance !== void 0 && { significance }
           });
         } else {
-          note = await client.createOrgNote(ctx.orgId, {
+          if (!orgId) {
+            return { content: [{ type: "text", text: "Provide orgId for an org-level Note, or scope the Note with systemId, teamspaceId, or movementId." }], isError: true };
+          }
+          note = await client.createOrgNote(orgId, {
             noteType,
             content,
             rationale,
             createdBy: ctx.user.userId,
-            aiGenerated: false,
-            assumptionMeta
+            aiGenerated: false
           });
         }
         const text = formatNoteDetail(note);
@@ -27926,9 +27801,6 @@ ${text}` }] };
           return { content: [{ type: "text", text: "Provide systemId or orgId (for access control)." }], isError: true };
         }
         if (orgId) {
-          if (orgId !== ctx.orgId) {
-            return { content: [{ type: "text", text: "Access denied: orgId does not match the configured organization." }], isError: true };
-          }
           if (beatId !== void 0) {
             return { content: [{ type: "text", text: "beatId is not supported for org-level notes." }], isError: true };
           }
@@ -27953,7 +27825,7 @@ ${text}` }] };
 
 ${formatNoteDetail(updated2)}` }] };
         }
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         const updated = await client.updateNote(noteId, {
           ...noteType !== void 0 && { noteType },
           status,
@@ -27995,7 +27867,7 @@ ${text}` }] };
     },
     async ({ systemId, noteIds, noteType, status, content, response, humanAssignee, agentAssignee }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         const result = await client.bulkUpdateNotes(noteIds, {
           ...noteType !== void 0 && { noteType },
           status,
@@ -28034,7 +27906,7 @@ ${text}` }] };
     },
     async ({ systemId, noteId, targetBeatId, targetRevisionId, reason }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         const updated = await client.reassignNote(noteId, targetBeatId, reason, ctx.user.userId, targetRevisionId);
         if (!updated) {
           return { content: [{ type: "text", text: `Note not found: "${noteId}"` }], isError: true };
@@ -28056,7 +27928,7 @@ ${text}` }] };
     },
     async ({ systemId, noteId, reason }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         const note = await client.getNote(noteId);
         if (!note || (note.systemId ?? note.projectId) !== systemId) {
           return { content: [{ type: "text", text: `Note not found: "${noteId}"` }], isError: true };
@@ -28083,7 +27955,7 @@ ${text}` }] };
     },
     async ({ systemId, noteId, reason }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         const note = await client.getNote(noteId);
         if (!note || (note.systemId ?? note.projectId) !== systemId) {
           return { content: [{ type: "text", text: `Document not found: "${noteId}"` }], isError: true };
@@ -28106,29 +27978,6 @@ ${text}` }] };
       }
     }
   );
-  server.tool(
-    "list_key_assumptions",
-    "Get key assumptions sorted by criticality (highest risk first)",
-    {
-      systemId: external_exports.string().describe("The system ID")
-    },
-    async ({ systemId }) => {
-      await assertSystemInOrg(client, systemId, ctx.orgId);
-      const assumptions = await client.getKeyAssumptions(systemId);
-      if (assumptions.length === 0) {
-        return { content: [{ type: "text", text: "No unvalidated assumptions found." }] };
-      }
-      const lines = assumptions.map((a, i) => {
-        const conf = a.assumptionMeta?.confidence?.toFixed(2) ?? "?";
-        const crit = a.criticality?.toFixed(2) ?? "?";
-        return `${i + 1}. [confidence: ${conf}, criticality: ${crit}] ${a.content}`;
-      });
-      const text = `**${assumptions.length} Key Assumptions** (sorted by criticality)
-
-${lines.join("\n")}`;
-      return { content: [{ type: "text", text }] };
-    }
-  );
 }
 
 // ../../libs/harmonica-services/src/mcp/tools/notebook-tools.ts
@@ -28193,26 +28042,27 @@ function formatTree(node, depth = 0) {
 function registerNotebookTools(server, ctx, client) {
   server.tool(
     "create_notebook",
-    "Create a new Notebook in the configured organization. Optionally bind it to one or more scopes (org, teamspace, or system) at creation.",
+    "Create a new Notebook in an organization. Optionally bind it to one or more scopes (org, teamspace, or system) at creation.",
     {
+      orgId: external_exports.string().describe("The organization ID \u2014 see list_organizations"),
       title: external_exports.string().min(1).max(300).describe("Notebook title (1\u2013300 characters)"),
       description: external_exports.string().max(2e4).optional().describe("Optional description (max 20 000 characters)"),
       scopes: external_exports.array(scopeRefSchema).optional().describe("Optional initial scope bindings"),
       createdBy: external_exports.string().optional().describe("Actor ID \u2014 defaults to the session user")
     },
-    async ({ title, description, scopes, createdBy }) => {
+    async ({ orgId, title, description, scopes, createdBy }) => {
       const actorId = createdBy ?? ctx.user.userId ?? "agent";
       try {
         const notebook = await client.createNotebook({
           notebookId: `nb-${(0, import_crypto4.randomUUID)()}`,
-          orgId: ctx.orgId,
+          orgId,
           title,
           description,
           createdBy: actorId,
           scopes
         });
         if (!notebook) {
-          return { content: [{ type: "text", text: `Organization not found: "${ctx.orgId}"` }], isError: true };
+          return { content: [{ type: "text", text: `Organization not found: "${orgId}"` }], isError: true };
         }
         return { content: [{ type: "text", text: `Notebook created.
 
@@ -28232,7 +28082,7 @@ ${formatNotebook(notebook)}` }] };
     async ({ notebookId }) => {
       let notebook;
       try {
-        notebook = await fetchNotebookInOrg(client, notebookId, ctx.orgId);
+        notebook = await fetchNotebook(client, notebookId);
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         return { content: [{ type: "text", text: message }], isError: true };
@@ -28256,7 +28106,7 @@ ${formatNotebook(notebook)}` }] };
     },
     async ({ notebookId }) => {
       try {
-        await fetchNotebookInOrg(client, notebookId, ctx.orgId);
+        await fetchNotebook(client, notebookId);
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         return { content: [{ type: "text", text: message }], isError: true };
@@ -28291,7 +28141,7 @@ ${formatTree(tree.root)}` }] };
     async ({ notebookId, title, content, parentNoteId, style }) => {
       let notebook;
       try {
-        notebook = await fetchNotebookInOrg(client, notebookId, ctx.orgId);
+        notebook = await fetchNotebook(client, notebookId);
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         return { content: [{ type: "text", text: message }], isError: true };
@@ -28328,7 +28178,7 @@ ${formatTree(tree.root)}` }] };
       const pageContent = buildPageNoteContent(title, content);
       let note;
       try {
-        note = await client.createOrgNote(ctx.orgId, {
+        note = await client.createOrgNote(notebook.orgId, {
           noteType: "context",
           content: pageContent,
           createdBy: actorId,
@@ -28347,7 +28197,7 @@ ${formatTree(tree.root)}` }] };
           variant: style ?? "card",
           position,
           depth: placement.childDepth,
-          orgId: ctx.orgId,
+          orgId: notebook.orgId,
           writeUsedByEdge: true
         });
         if (!addResult.success) {
@@ -28384,7 +28234,7 @@ ${formatTree(tree.root)}` }] };
     async ({ notebookId, heading, parentNoteId, noteType, systemId, limit, order, significance }) => {
       let notebook;
       try {
-        notebook = await fetchNotebookInOrg(client, notebookId, ctx.orgId);
+        notebook = await fetchNotebook(client, notebookId);
       } catch (err) {
         return { content: [{ type: "text", text: err instanceof Error ? err.message : String(err) }], isError: true };
       }
@@ -28442,7 +28292,7 @@ ${formatTree(tree.root)}` }] };
           heading,
           position,
           depth: placement.childDepth,
-          orgId: ctx.orgId
+          orgId: notebook.orgId
         });
         if (!result.success) {
           return { content: [{ type: "text", text: `Failed to add collection: ${result.error?.message ?? "unknown error"}` }], isError: true };
@@ -28472,7 +28322,7 @@ ${formatTree(tree.root)}` }] };
     async ({ notebookId, elementId, parentNoteId, heading, noteType, systemId, limit, order, significance }) => {
       let notebook;
       try {
-        notebook = await fetchNotebookInOrg(client, notebookId, ctx.orgId);
+        notebook = await fetchNotebook(client, notebookId);
       } catch (err) {
         return { content: [{ type: "text", text: err instanceof Error ? err.message : String(err) }], isError: true };
       }
@@ -28543,7 +28393,7 @@ ${formatTree(tree.root)}` }] };
     },
     async ({ notebookId, title, description }) => {
       try {
-        await fetchNotebookInOrg(client, notebookId, ctx.orgId);
+        await fetchNotebook(client, notebookId);
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         return { content: [{ type: "text", text: message }], isError: true };
@@ -28571,7 +28421,7 @@ ${formatNotebook(updated)}` }] };
     },
     async ({ notebookId, scopes }) => {
       try {
-        await fetchNotebookInOrg(client, notebookId, ctx.orgId);
+        await fetchNotebook(client, notebookId);
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         return { content: [{ type: "text", text: message }], isError: true };
@@ -28628,7 +28478,7 @@ ${lines.join("\n")}` }] };
     },
     async ({ notebookId, status, reason }) => {
       try {
-        await fetchNotebookInOrg(client, notebookId, ctx.orgId);
+        await fetchNotebook(client, notebookId);
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         return { content: [{ type: "text", text: message }], isError: true };
@@ -28665,7 +28515,7 @@ ${formatNotebook(updated)}` }] };
     },
     async ({ notebookId, scopeType, scopeId, createdBy }) => {
       try {
-        await fetchNotebookInOrg(client, notebookId, ctx.orgId);
+        await fetchNotebook(client, notebookId);
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         return { content: [{ type: "text", text: message }], isError: true };
@@ -28693,7 +28543,7 @@ ${formatNotebook(updated)}` }] };
     },
     async ({ notebookId, scopeType, scopeId }) => {
       try {
-        await fetchNotebookInOrg(client, notebookId, ctx.orgId);
+        await fetchNotebook(client, notebookId);
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         return { content: [{ type: "text", text: message }], isError: true };
@@ -28738,7 +28588,7 @@ ${lines.join("\n")}` }] };
 // ../../libs/harmonica-services/src/mcp/tools/onboarding-tools.ts
 var import_node_crypto = require("node:crypto");
 var OnboardingNoteInputSchema = external_exports.object({
-  noteType: external_exports.enum(["context", "assumption", "constraint", "guidance", "decision"]),
+  noteType: external_exports.enum(["context", "constraint", "guidance", "decision"]),
   content: external_exports.string().min(1),
   rationale: external_exports.string().optional(),
   confidence: external_exports.number().min(0).max(1).optional()
@@ -28760,12 +28610,13 @@ function registerOnboardingTools(server, ctx, client) {
       "Returns the full analysis and gap classification for pre-flight review \u2014 nothing is persisted yet."
     ].join(" "),
     {
+      orgId: external_exports.string().describe("The organization ID \u2014 see list_organizations"),
       clientName: external_exports.string().min(1).max(200).describe("The client company name \u2014 used to check for duplicate Teamspaces"),
       pmContext: external_exports.string().min(1).describe('What the PM said to initiate the session (e.g. "I just had an intro call with...")'),
       documentContent: external_exports.string().min(1).describe("Full text content of all attached documents, concatenated")
     },
-    async ({ clientName, pmContext, documentContent }) => {
-      const result = await client.initiateOnboarding(ctx.orgId, { clientName, pmContext, documentContent });
+    async ({ orgId, clientName, pmContext, documentContent }) => {
+      const result = await client.initiateOnboarding(orgId, { clientName, pmContext, documentContent });
       if (result.isDuplicate) {
         return {
           content: [{
@@ -28816,7 +28667,7 @@ function registerOnboardingTools(server, ctx, client) {
       analysisJson: external_exports.string().optional().describe("JSON-serialized DiscoveryAnalysis from initiate_teamspace_onboarding. Pass this to produce Beats grounded in the actual discovery data.")
     },
     async ({ systemId, systemTitle, systemDescription, analysisJson }) => {
-      await assertSystemInOrg(client, systemId, ctx.orgId);
+      await assertSystemExists(client, systemId);
       const result = await client.draftOnboardingBeats(systemId, { systemTitle, systemDescription, analysisJson });
       if (!result.suggestions || result.suggestions.length === 0) {
         return {
@@ -28842,6 +28693,10 @@ function registerOnboardingTools(server, ctx, client) {
       return { content: [{ type: "text", text: lines.join("\n") }] };
     }
   );
+  const OnboardingTrackInputSchema = external_exports.object({
+    title: external_exports.string().min(1).max(300),
+    description: external_exports.string().max(2e3).optional()
+  });
   server.tool(
     "create_teamspace_onboarding_batch",
     [
@@ -28852,22 +28707,40 @@ function registerOnboardingTools(server, ctx, client) {
       "If any step fails, the receipt reports what succeeded and where creation stopped."
     ].join(" "),
     {
+      orgId: external_exports.string().describe("The organization ID \u2014 see list_organizations"),
       teamspaceName: external_exports.string().min(1).max(200).describe("Teamspace display name"),
-      projects: external_exports.array(OnboardingSystemInputSchema).min(1).describe("Phase 1 systems to create, each linked to the Teamspace"),
-      teamspaceNotes: external_exports.array(OnboardingNoteInputSchema).describe("Constraints, assumptions, and context notes at the Teamspace/system level")
+      systems: external_exports.array(OnboardingSystemInputSchema).min(1).describe("Phase 1 systems to create, each linked to the Teamspace"),
+      teamspaceNotes: external_exports.array(OnboardingNoteInputSchema).describe("Constraints, assumptions, and context notes at the Teamspace/system level"),
+      account: external_exports.object({ name: external_exports.string().min(1).max(300), description: external_exports.string().max(2e3).optional() }).optional().describe("New client Account to create for this engagement. Omit to skip commercial scaffolding."),
+      movement: external_exports.object({ title: external_exports.string().min(1).max(300), description: external_exports.string().max(2e3).optional() }).optional().describe("SOW/engagement Movement to create under the Account. Only used when account is provided."),
+      tracks: external_exports.array(OnboardingTrackInputSchema).max(10).optional().describe("Tracks (phases/workstreams) to create under the Movement, capped at 10. Defaults to one Track named after the first System when omitted or empty."),
+      drop: external_exports.object({ name: external_exports.string().min(1).max(200), description: external_exports.string().max(2e3).optional() }).optional().describe('Optional initial Drop (e.g. "MVP") to create under the Account. Only created when explicitly provided.')
     },
     async ({
+      orgId,
       teamspaceName,
-      projects,
-      teamspaceNotes
+      systems,
+      teamspaceNotes,
+      account,
+      movement,
+      tracks,
+      drop
     }) => {
+      if ((movement || tracks && tracks.length > 0 || drop) && !account) {
+        return {
+          content: [{
+            type: "text",
+            text: "\u26A0\uFE0F  movement, tracks, and drop are only created when account is provided. Add an account or omit the commercial fields."
+          }]
+        };
+      }
       const lines = [];
       let teamspace;
       try {
         teamspace = await client.createTeamspace({
           teamspaceId: (0, import_node_crypto.randomUUID)(),
           slug: teamspaceName.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, ""),
-          orgId: ctx.orgId,
+          orgId,
           name: teamspaceName,
           createdBy: ctx.user?.userId
         });
@@ -28879,31 +28752,31 @@ Teamspace: [${teamspace.teamspaceId}] ${teamspace.name}`);
 Error: ${msg}`);
         return { content: [{ type: "text", text: lines.join("\n") }] };
       }
-      const createdProjects = [];
-      for (const p of projects) {
+      const createdSystems = [];
+      for (const p of systems) {
         try {
           const project = await client.createSystem({
             systemId: (0, import_node_crypto.randomUUID)(),
-            orgId: ctx.orgId,
+            orgId,
             teamspaceId: teamspace.teamspaceId,
             ownerUserId: ctx.user?.userId ?? "system",
             title: p.title,
             description: p.description
           });
-          createdProjects.push({ systemId: project.systemId, title: project.title });
+          createdSystems.push({ systemId: project.systemId, title: project.title });
         } catch (err) {
           const msg = err instanceof Error ? err.message : String(err);
           lines.push(`
-Systems created: ${createdProjects.length}`);
+Systems created: ${createdSystems.length}`);
           lines.unshift(`\u26A0\uFE0F  Onboarding batch partially created \u2014 stopped at: system "${p.title}"
 Error: ${msg}`);
           return { content: [{ type: "text", text: lines.join("\n") }] };
         }
       }
-      if (createdProjects.length > 0) {
+      if (createdSystems.length > 0) {
         lines.push(`
-Systems (${createdProjects.length}):`);
-        for (const p of createdProjects) lines.push(`  [${p.systemId}] ${p.title}`);
+Systems (${createdSystems.length}):`);
+        for (const p of createdSystems) lines.push(`  [${p.systemId}] ${p.title}`);
       }
       const createdNotes = [];
       const teamspaceSlug = teamspace.slug ?? teamspaceName.toLowerCase().replace(/\s+/g, "-");
@@ -28922,9 +28795,9 @@ Systems (${createdProjects.length}):`);
         } catch {
         }
       }
-      for (let i = 0; i < createdProjects.length; i++) {
-        const project = createdProjects[i];
-        for (const note of projects[i]?.notes ?? []) {
+      for (let i = 0; i < createdSystems.length; i++) {
+        const project = createdSystems[i];
+        for (const note of systems[i]?.notes ?? []) {
           try {
             const n = await client.createNote({
               noteId: `N-TEMP-${(0, import_node_crypto.randomUUID)()}`,
@@ -28944,6 +28817,93 @@ Systems (${createdProjects.length}):`);
       }
       lines.push(`
 Notes filed: ${createdNotes.length}`);
+      if (account) {
+        let createdAccountId;
+        try {
+          const createdAccount = await client.createAccount({
+            orgId,
+            name: account.name,
+            description: account.description,
+            accountType: "client",
+            createdBy: ctx.user?.userId
+          });
+          createdAccountId = createdAccount.accountId;
+          lines.push(`
+Account: [${createdAccount.accountId}] ${createdAccount.name}`);
+        } catch (err) {
+          const msg = err instanceof Error ? err.message : String(err);
+          lines.unshift(`\u26A0\uFE0F  Onboarding batch partially created \u2014 stopped at: account
+Error: ${msg}`);
+          return { content: [{ type: "text", text: lines.join("\n") }] };
+        }
+        if (movement && createdAccountId) {
+          let createdMovementId;
+          try {
+            const createdMovement = await client.createMovement({
+              teamspaceId: teamspace.teamspaceId,
+              title: movement.title,
+              description: movement.description,
+              accountId: createdAccountId,
+              createdBy: ctx.user?.userId
+            });
+            createdMovementId = createdMovement.movementId;
+            lines.push(`
+Movement: [${createdMovement.movementId}] ${createdMovement.title}`);
+          } catch (err) {
+            const msg = err instanceof Error ? err.message : String(err);
+            lines.unshift(`\u26A0\uFE0F  Onboarding batch partially created \u2014 stopped at: movement
+Error: ${msg}`);
+            return { content: [{ type: "text", text: lines.join("\n") }] };
+          }
+          const MAX_TRACKS = 10;
+          const trackInputs = (tracks ?? []).slice(0, MAX_TRACKS);
+          const fallbackTitle = createdSystems[0]?.title ?? "Phase 1";
+          const tracksToCreate = trackInputs.length > 0 ? trackInputs : [{ title: fallbackTitle }];
+          const createdTracks = [];
+          for (const trackInput of tracksToCreate) {
+            try {
+              const track = await client.createDeliverableGroup({
+                orgId,
+                teamspaceId: teamspace.teamspaceId,
+                movementId: createdMovementId,
+                title: trackInput.title,
+                description: trackInput.description,
+                vuRate: 0,
+                createdBy: ctx.user?.userId
+              });
+              createdTracks.push({ id: track.deliverableGroupId, title: track.title });
+            } catch (err) {
+              const msg = err instanceof Error ? err.message : String(err);
+              lines.unshift(`\u26A0\uFE0F  Onboarding batch partially created \u2014 stopped at: track:${trackInput.title}
+Error: ${msg}`);
+              return { content: [{ type: "text", text: lines.join("\n") }] };
+            }
+          }
+          if (createdTracks.length > 0) {
+            lines.push(`
+Tracks (${createdTracks.length}):`);
+            for (const t of createdTracks) lines.push(`  [${t.id}] ${t.title}`);
+          }
+        }
+        if (drop && createdAccountId) {
+          try {
+            const createdDrop = await client.createDrop({
+              accountId: createdAccountId,
+              teamspaceId: teamspace.teamspaceId,
+              name: drop.name,
+              description: drop.description,
+              createdBy: ctx.user?.userId
+            });
+            lines.push(`
+Drop: [${createdDrop.dropId}] ${createdDrop.name}`);
+          } catch (err) {
+            const msg = err instanceof Error ? err.message : String(err);
+            lines.unshift(`\u26A0\uFE0F  Onboarding batch partially created \u2014 stopped at: drop
+Error: ${msg}`);
+            return { content: [{ type: "text", text: lines.join("\n") }] };
+          }
+        }
+      }
       lines.unshift(`\u2705 Onboarding batch created successfully.`);
       return { content: [{ type: "text", text: lines.join("\n") }] };
     }
@@ -29114,10 +29074,7 @@ function registerOrganizationTools(server, ctx, client) {
       if (!system) {
         return { content: [{ type: "text", text: `System not found: ${systemId}` }], isError: true };
       }
-      if (system.orgId !== ctx.orgId) {
-        return { content: [{ type: "text", text: `System "${systemId}" does not belong to the configured organization.` }], isError: true };
-      }
-      const result = await client.transferSystem(ctx.orgId, systemId, targetOrgId);
+      const result = await client.transferSystem(system.orgId, systemId, targetOrgId);
       if (result.error) {
         return { content: [{ type: "text", text: result.error }], isError: true };
       }
@@ -29224,7 +29181,7 @@ async function pollForCheck3(client, taskId) {
     }
     consecutiveErrors = 0;
     if (task.status === "completed") {
-      if (!task.result) throw new Error(`Task ${taskId} completed with no result`);
+      if (!task.result) throw new Error(`async:completed:no-result Task ${taskId} succeeded on the async path but the scorecard is not yet readable on the blocking path \u2014 use list_checks or get_job_status to retrieve it.`);
       return task.result;
     }
     if (task.status === "failed") throw new Error(`Beat version quality check failed: ${task.error ?? "unknown error"}`);
@@ -29268,7 +29225,7 @@ function registerPlanQualityTools(server, ctx, client) {
           isError: true
         };
       }
-      await assertSystemInOrg(client, systemId, ctx.orgId);
+      await assertSystemExists(client, systemId);
       const opts = branch || localPath ? { branch, localPath } : void 0;
       const task = await client.runCheck(systemId, "beat_version_quality", beatVersionId, opts);
       if (!wait) {
@@ -29415,7 +29372,7 @@ function registerPortfolioCoherenceTools(server, ctx, client) {
     },
     async ({ systemId, wait }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         const { taskId } = await client.runCheck(systemId, "portfolio_coherence", systemId);
         if (!wait) {
           return {
@@ -29452,7 +29409,7 @@ function registerPortfolioCoherenceTools(server, ctx, client) {
       const archivedBeatIds = [];
       let totalNotesReassigned = 0;
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         const uniqueBeatIds = [...new Set(beatIds)];
         const resolvedPrimaryId = primaryBeatId ?? uniqueBeatIds[0];
         if (!uniqueBeatIds.includes(resolvedPrimaryId)) {
@@ -29656,7 +29613,7 @@ function registerRevisionLifecycleTools(server, ctx, client) {
     },
     async ({ beatId, title, description, changeSummary, beatVersionId, baseRevisionId, tags, priority, estimatedEffort, humanAssignee, agentAssignee }) => {
       try {
-        await assertBeatInOrg(client, beatId, ctx.orgId);
+        await assertBeatExists(client, beatId);
         const beat = await client.getBeat(beatId);
         if (!beat) {
           return { content: [{ type: "text", text: `Beat not found: "${beatId}"` }], isError: true };
@@ -29711,8 +29668,8 @@ function registerRevisionLifecycleTools(server, ctx, client) {
         }
         if (parentBv && !parentBv.targetDropId) {
           try {
-            const project = await client.getSystem(parentBv.systemId);
-            const accountId = project?.accountId;
+            const system = await client.getSystem(parentBv.systemId);
+            const accountId = system?.accountId;
             if (accountId) {
               const draftDrops = await client.listAccountDrops(accountId, { state: "draft" });
               lines.push("");
@@ -29735,6 +29692,21 @@ function registerRevisionLifecycleTools(server, ctx, client) {
         }
         return { content: [{ type: "text", text: lines.join("\n") }] };
       } catch (err) {
+        if (err instanceof Error && err.name === "BeatVersionPlanQualityError" && "failure" in err && isRenderableGateFailure(err.failure)) {
+          const f = err.failure;
+          const isStale = f.reason === "stale_check_hash" || f.reason === "stale_check_timestamp";
+          const lines = [
+            `**Gate:** beat_version_quality`,
+            `**Status:** ${isStale ? "stale" : "failed"} (${f.reason})`,
+            `**Detail:** ${f.message}`
+          ];
+          if (f.entityId) lines.push(`**Beat Version:** ${f.entityId}`);
+          if (f.remedy) lines.push(`**Action:** ${f.remedy}`);
+          return {
+            content: [{ type: "text", text: lines.join("\n") }],
+            isError: true
+          };
+        }
         const message = err instanceof Error ? err.message : String(err);
         return { content: [{ type: "text", text: `Failed to create revision: ${message}` }], isError: true };
       }
@@ -29761,7 +29733,7 @@ function registerRevisionLifecycleTools(server, ctx, client) {
         if (!revision) {
           return { content: [{ type: "text", text: `Revision not found: "${revisionId}"` }], isError: true };
         }
-        await assertBeatInOrg(client, revision.beatId, ctx.orgId);
+        await assertBeatExists(client, revision.beatId);
         if (typeof beatVersionId === "string") {
           const bv = await client.getBeatVersion(beatVersionId);
           if (!bv) {
@@ -29830,7 +29802,7 @@ function registerRevisionLifecycleTools(server, ctx, client) {
         if (revision.status === targetState) {
           return { content: [{ type: "text", text: `Revision is already at ${targetState}.` }], isError: true };
         }
-        await assertBeatInOrg(client, revision.beatId, ctx.orgId);
+        await assertBeatExists(client, revision.beatId);
         const transitionOptions = {
           actor: { type: "human", id: ctx.user.userId, name: ctx.user.name, email: ctx.user.email },
           trigger: "human_action",
@@ -29880,7 +29852,7 @@ Accepts the full PR metadata (number, url, branch, state, optional mergeSha). Fi
         if (!revision) {
           return { content: [{ type: "text", text: `Revision not found: "${revisionId}"` }], isError: true };
         }
-        await assertBeatInOrg(client, revision.beatId, ctx.orgId);
+        await assertBeatExists(client, revision.beatId);
         if (!revision.scm && (!url || !branch)) {
           return {
             content: [{ type: "text", text: "This Revision has no existing SCM record. Provide url and branch to retro-attach a PR from scratch." }],
@@ -29928,7 +29900,7 @@ Accepts the full PR metadata (number, url, branch, state, optional mergeSha). Fi
         if (!revision) {
           return { content: [{ type: "text", text: `Revision not found: "${revisionId}"` }], isError: true };
         }
-        await assertBeatInOrg(client, revision.beatId, ctx.orgId);
+        await assertBeatExists(client, revision.beatId);
         const latitude = await checkDeliveryStep(client, revisionId, "openPullRequest");
         if ("refusal" in latitude) {
           return { content: [{ type: "text", text: latitude.refusal }], isError: true };
@@ -29944,13 +29916,13 @@ Accepts the full PR metadata (number, url, branch, state, optional mergeSha). Fi
           if (revision.scm) {
             lines2.push("", `\u26A0 This revision already has a linked PR (#${revision.scm.number} \u2014 ${revision.scm.url}). create_pr_for_revision would be rejected.`);
           } else {
-            const project = await client.getSystem(revision.systemId);
-            if (!project?.repoOwner || !project?.repoName || !project?.repoDefaultBranch) {
-              lines2.push("", "\u26A0 The project has no repo configured (repoOwner/repoName/repoDefaultBranch). create_pr_for_revision would be rejected.");
+            const system = await client.getSystem(revision.systemId);
+            if (!system?.repoOwner || !system?.repoName || !system?.repoDefaultBranch) {
+              lines2.push("", "\u26A0 The system has no repo configured (repoOwner/repoName/repoDefaultBranch). create_pr_for_revision would be rejected.");
             } else {
               lines2.push(
                 "",
-                `Would open a draft PR against \`${project.repoOwner}/${project.repoName}:${project.repoDefaultBranch}\` on a new \`agent/${shortId}-\u2026\` branch, with body starting \`Harmonica: ${revisionId}\`.`
+                `Would open a draft PR against \`${system.repoOwner}/${system.repoName}:${system.repoDefaultBranch}\` on a new \`agent/${shortId}-\u2026\` branch, with body starting \`Harmonica: ${revisionId}\`.`
               );
             }
           }
@@ -29995,7 +29967,7 @@ Accepts the full PR metadata (number, url, branch, state, optional mergeSha). Fi
         if (!revision) {
           return { content: [{ type: "text", text: `Revision not found: "${revisionId}"` }], isError: true };
         }
-        await assertBeatInOrg(client, revision.beatId, ctx.orgId);
+        await assertBeatExists(client, revision.beatId);
         const latitude = await checkDeliveryStep(client, revisionId, "requestAgentReview");
         if ("refusal" in latitude) {
           return { content: [{ type: "text", text: latitude.refusal }], isError: true };
@@ -30025,7 +29997,7 @@ ${latitude.notice}` }] };
         if (!revision) {
           return { content: [{ type: "text", text: `Revision not found: "${revisionId}"` }], isError: true };
         }
-        await assertBeatInOrg(client, revision.beatId, ctx.orgId);
+        await assertBeatExists(client, revision.beatId);
         const result = await client.getPrDiff(revisionId);
         if (!result.success) {
           return { content: [{ type: "text", text: `Failed to get diff (${result.error.code}): ${result.error.message}` }], isError: true };
@@ -30059,7 +30031,7 @@ Line-level comments are optional \u2014 include them to anchor feedback to speci
         if (!revision) {
           return { content: [{ type: "text", text: `Revision not found: "${revisionId}"` }], isError: true };
         }
-        await assertBeatInOrg(client, revision.beatId, ctx.orgId);
+        await assertBeatExists(client, revision.beatId);
         const result = await client.postPrReview(revisionId, { prNumber: 0, event, body, comments });
         if (!result.success) {
           return { content: [{ type: "text", text: `Failed to post review (${result.error.code}): ${result.error.message}` }], isError: true };
@@ -30095,7 +30067,7 @@ Error codes: PR_NOT_OPEN (draft or already merged/closed), MERGE_FAILED (GitHub
         if (!revision) {
           return { content: [{ type: "text", text: `Revision not found: "${revisionId}"` }], isError: true };
         }
-        await assertBeatInOrg(client, revision.beatId, ctx.orgId);
+        await assertBeatExists(client, revision.beatId);
         const options = mergeMethod !== void 0 || commitTitle !== void 0 ? { mergeMethod, commitTitle } : void 0;
         const result = await client.mergePr(revisionId, options);
         if (!result.success) {
@@ -30129,7 +30101,7 @@ Error code: PR_NOT_DRAFT (the PR is already ready for review or was never a draf
         if (!revision) {
           return { content: [{ type: "text", text: `Revision not found: "${revisionId}"` }], isError: true };
         }
-        await assertBeatInOrg(client, revision.beatId, ctx.orgId);
+        await assertBeatExists(client, revision.beatId);
         const result = await client.markPrReadyForReview(revisionId);
         if (!result.success) {
           return { content: [{ type: "text", text: `Failed to mark PR ready (${result.error.code}): ${result.error.message}` }], isError: true };
@@ -30220,7 +30192,7 @@ function registerRevisionQualityTools(server, ctx, client) {
             isError: true
           };
         }
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         await assertRevisionInSystem(client, revisionId, systemId);
         const task = await client.runCheck(systemId, "revision_quality", revisionId);
         if (!wait) {
@@ -30526,7 +30498,7 @@ function registerSnapshotTools(server, ctx, client) {
     "Export a complete system snapshot for environment sync. On a remote server (production/staging) returns an S3 presigned URL; on a local server writes to a temp file and returns the path.",
     { systemId: external_exports.string().describe("The system ID to export") },
     async ({ systemId }) => {
-      await assertSystemInOrg(client, systemId, ctx.orgId);
+      await assertSystemExists(client, systemId);
       const result = await client.exportSystemSnapshot(systemId);
       if (typeof result === "string") {
         if (!result.startsWith("https://")) {
@@ -30586,8 +30558,8 @@ function registerSnapshotTools(server, ctx, client) {
       targetTeamspaceId: external_exports.string().min(1).optional().describe(
         "Remap all teamspace references (Drops, Deliverables, Project record) to this teamspace ID in the target environment. Required when the source and target environments use different teamspace UUIDs. When omitted and the snapshot contains Drops or Deliverables, a warning is included in the import summary."
       ),
-      targetOrgId: external_exports.string().min(1).optional().describe(
-        "Import all records under this org ID instead of the caller's org. Required when syncing from production to a local environment where the org UUID differs. When omitted, the caller's org ID is used."
+      targetOrgId: external_exports.string().min(1).describe(
+        "Import all records under this org ID. Named explicitly rather than defaulted: a snapshot carries the org UUID of wherever it was taken, which differs between environments, and there is no session org to fall back to. See list_organizations."
       )
     },
     async ({ snapshot: snapshotInput, targetTeamspaceId, targetOrgId }) => {
@@ -30603,7 +30575,7 @@ function registerSnapshotTools(server, ctx, client) {
         };
       }
       const trimmed = snapshotInput.trim();
-      const importOptions = { targetOrgId: targetOrgId ?? ctx.orgId, targetUserId: ctx.user.userId, targetTeamspaceId };
+      const importOptions = { targetOrgId, targetUserId: ctx.user.userId, targetTeamspaceId };
       if (trimmed.startsWith("https://")) {
         if (isPrivateHost(trimmed)) {
           throw new Error("Snapshot URL must point to a public host \u2014 private, link-local, and loopback addresses are not permitted.");
@@ -30778,7 +30750,7 @@ function registerSubscriptionTools(server, ctx, client) {
     },
     async ({ entityType, entityId, systemId }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         await client.subscribe(ctx.user.userId, entityType, entityId, systemId, "manual");
         return {
           content: [{
@@ -30869,9 +30841,6 @@ function registerSystemLifecycleTools(server, ctx, client) {
         if (!system) {
           return { content: [{ type: "text", text: `System not found: "${systemId}"` }], isError: true };
         }
-        if (system.orgId !== ctx.orgId) {
-          return { content: [{ type: "text", text: `System "${systemId}" is not in this organization` }], isError: true };
-        }
         const result = await client.transitionSystemLifecycleState(systemId, targetState, {
           actor: { type: "human", id: ctx.user.userId, name: ctx.user.name },
           reason,
@@ -30916,9 +30885,9 @@ function accountLine(_request, resolved) {
 }
 var PROJECT_EMBEDDING_FIELDS = ["title", "description", "strategy"];
 function registerSystemTools(server, ctx, client) {
-  const listSystemsHandler = async ({ teamspaceId }) => {
+  const listSystemsHandler = async ({ orgId, teamspaceId }) => {
     try {
-      const projects = await client.listOrgSystems(ctx.orgId);
+      const projects = await client.listOrgSystems(orgId);
       const trimmed = teamspaceId?.trim();
       const filtered = trimmed ? projects.filter((p) => p.teamspaceId === trimmed) : projects;
       const text = formatSystemSummaryTable(filtered);
@@ -30930,8 +30899,9 @@ function registerSystemTools(server, ctx, client) {
   };
   server.tool(
     "list_systems",
-    "List all systems in the configured organization",
+    "List all systems in an organization",
     {
+      orgId: external_exports.string().describe("The organization ID \u2014 see list_organizations"),
       teamspaceId: external_exports.string().optional().describe("Filter to systems belonging to a specific teamspace. Empty or whitespace-only treated as no filter.")
     },
     listSystemsHandler
@@ -30947,10 +30917,10 @@ function registerSystemTools(server, ctx, client) {
     noteLimit
   }) => {
     try {
-      const [project, org] = await Promise.all([
-        fetchSystemInOrg(client, systemId, ctx.orgId),
-        client.getOrg(ctx.orgId)
+      const [project] = await Promise.all([
+        fetchSystem(client, systemId)
       ]);
+      const org = await client.getOrg(project.orgId);
       const notes = await client.listSystemNotes(systemId, {
         limit: noteLimit ?? DEFAULT_CONTEXT_NOTE_LIMIT
       });
@@ -30992,7 +30962,7 @@ function registerSystemTools(server, ctx, client) {
       if (Object.keys(nonEmpty).length === 0) {
         return { content: [{ type: "text", text: "No updates provided." }], isError: true };
       }
-      const currentSystem = await fetchSystemInOrg(client, systemId, ctx.orgId);
+      const currentSystem = await fetchSystem(client, systemId);
       if (nonEmpty["accountId"] === "") delete nonEmpty["accountId"];
       if (nonEmpty["agentDeliveryPolicy"] && typeof nonEmpty["agentDeliveryPolicy"] === "object") {
         nonEmpty["agentDeliveryPolicy"] = mergeAgentDeliveryPolicy(
@@ -31005,8 +30975,11 @@ function registerSystemTools(server, ctx, client) {
         if (!teamspace) {
           return { content: [{ type: "text", text: "Teamspace not found" }], isError: true };
         }
-        if (teamspace.orgId !== ctx.orgId) {
-          return { content: [{ type: "text", text: "Teamspace does not belong to this organization" }], isError: true };
+        if (teamspace.orgId !== currentSystem.orgId) {
+          return {
+            content: [{ type: "text", text: "Teamspace belongs to a different organization than the System" }],
+            isError: true
+          };
         }
       }
       const updated = await client.updateSystem(systemId, nonEmpty);
@@ -31044,9 +31017,6 @@ function registerSystemTools(server, ctx, client) {
       if (!system) {
         return { content: [{ type: "text", text: `System not found: "${systemId}"` }], isError: true };
       }
-      if (system.orgId !== ctx.orgId) {
-        return { content: [{ type: "text", text: `System "${systemId}" is not in this organization` }], isError: true };
-      }
       try {
         const updated = await client.archiveSystem(systemId);
         if (!updated) {
@@ -31071,6 +31041,7 @@ function registerSystemTools(server, ctx, client) {
     }
   );
   const createSystemSchema = {
+    orgId: external_exports.string().describe("The organization ID \u2014 see list_organizations"),
     title: external_exports.string().describe("System title"),
     description: external_exports.string().optional().describe("System description"),
     strategy: external_exports.string().optional().describe('System strategy markdown \u2014 Org Strategy + System Strategy ("System Coda")'),
@@ -31080,21 +31051,24 @@ function registerSystemTools(server, ctx, client) {
     repoName: external_exports.string().optional().describe("GitHub repository name"),
     repoDefaultBranch: external_exports.string().optional().describe('Default branch for code check (defaults to "main")')
   };
-  const createSystemHandler = async ({ title, description, strategy, teamspaceId, accountId, repoOwner, repoName, repoDefaultBranch }) => {
+  const createSystemHandler = async ({ orgId, title, description, strategy, teamspaceId, accountId, repoOwner, repoName, repoDefaultBranch }) => {
     if (teamspaceId) {
       const teamspace = await client.getTeamspace(teamspaceId);
       if (!teamspace) {
         return { content: [{ type: "text", text: "Teamspace not found" }], isError: true };
       }
-      if (teamspace.orgId !== ctx.orgId) {
-        return { content: [{ type: "text", text: "Teamspace does not belong to this organization" }], isError: true };
+      if (teamspace.orgId !== orgId) {
+        return {
+          content: [{ type: "text", text: "Teamspace belongs to a different organization" }],
+          isError: true
+        };
       }
     }
     const account = normalizeCreateAccountId(accountId);
     try {
       const project = await client.createSystem({
         systemId: (0, import_crypto5.randomUUID)(),
-        orgId: ctx.orgId,
+        orgId,
         ownerUserId: ctx.user.userId,
         title,
         description,
@@ -31123,7 +31097,7 @@ function registerSystemTools(server, ctx, client) {
       return { content: [{ type: "text", text: `Failed to create system: ${message}` }], isError: true };
     }
   };
-  server.tool("create_system", "Create a new system in the configured organization. accountId is required \u2014 it is the Account that owns the System, and the only parent access follows.", createSystemSchema, createSystemHandler);
+  server.tool("create_system", "Create a new system in an organization. accountId is required \u2014 it is the Account that owns the System, and the only parent access follows.", createSystemSchema, createSystemHandler);
 }
 
 // ../../libs/harmonica-services/src/mcp/tools/teamspace-tools.ts
@@ -31144,10 +31118,12 @@ function formatEnsembleMember(member) {
 function registerTeamspaceTools(server, ctx, client) {
   server.tool(
     "list_teamspaces",
-    "List all Teamspaces in the current organization.",
-    {},
-    async () => {
-      const teamspaces = await client.listOrgTeamspaces(ctx.orgId);
+    "List all Teamspaces in an organization.",
+    {
+      orgId: external_exports.string().describe("The organization ID \u2014 see list_organizations")
+    },
+    async ({ orgId }) => {
+      const teamspaces = await client.listOrgTeamspaces(orgId);
       const text = teamspaces.length === 0 ? "No teamspaces found." : teamspaces.map(
         (ts) => `[${ts.teamspaceId}] ${ts.name} \u2014 ${ts.status}`
       ).join("\n");
@@ -31158,15 +31134,16 @@ function registerTeamspaceTools(server, ctx, client) {
     "get_teamspace",
     "Get a Teamspace by ID.",
     {
-      teamspaceId: external_exports.string().describe("The teamspace ID")
+      teamspaceId: external_exports.string().describe("The teamspace ID"),
+      orgId: external_exports.string().describe("The organization ID \u2014 see list_organizations")
     },
-    async ({ teamspaceId }) => {
+    async ({ teamspaceId, orgId }) => {
       try {
         const ts = await client.getTeamspace(teamspaceId);
-        if (!ts || ts.orgId !== ctx.orgId) {
+        if (!ts) {
           return { content: [{ type: "text", text: `Teamspace not found: ${teamspaceId}` }], isError: true };
         }
-        const allProjects = await client.listOrgSystems(ctx.orgId);
+        const allProjects = await client.listOrgSystems(orgId);
         const tsProjects = allProjects.filter((p) => p.teamspaceId === teamspaceId);
         const lines = [
           `ID: ${ts.teamspaceId}`,
@@ -31198,16 +31175,17 @@ function registerTeamspaceTools(server, ctx, client) {
   );
   server.tool(
     "create_teamspace",
-    "Create a new Teamspace in the current organization.",
+    "Create a new Teamspace in an organization.",
     {
+      orgId: external_exports.string().describe("The organization ID \u2014 see list_organizations"),
       name: external_exports.string().min(1).max(200).describe("Teamspace name")
     },
-    async ({ name }) => {
+    async ({ orgId, name }) => {
       const teamspaceId = `ts-${(0, import_node_crypto2.randomUUID)()}`;
       const slug = generateTeamspaceSlug(name);
       const ts = await client.createTeamspace({
         teamspaceId,
-        orgId: ctx.orgId,
+        orgId,
         name,
         slug,
         createdBy: ctx.user.userId
@@ -31274,7 +31252,7 @@ function registerValueVelocityTools(server, ctx, client) {
         if (!bv) {
           return { content: [{ type: "text", text: `Beat Version not found: "${beatVersionId}"` }], isError: true };
         }
-        await assertBeatInOrg(client, bv.beatId, ctx.orgId);
+        await assertBeatExists(client, bv.beatId);
         const actorId = ctx.user.email ?? ctx.user.userId;
         const updated = await client.confirmValueVelocityInputs(beatVersionId, {
           nextDeltaV,
@@ -31339,7 +31317,7 @@ function registerValueVelocityTools(server, ctx, client) {
     },
     async ({ systemId, lens, withLeverage }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         const [rankedResult, staleWResult] = await Promise.allSettled([
           withLeverage ? client.rankSystemBeatVersionsWithLeverage(systemId, lens) : client.rankSystemBeatVersions(systemId, lens),
           client.getStaleWBeatIds(systemId)
@@ -31381,7 +31359,7 @@ function registerValueVelocityTools(server, ctx, client) {
     },
     async ({ beatId }) => {
       try {
-        await assertBeatInOrg(client, beatId, ctx.orgId);
+        await assertBeatExists(client, beatId);
         const actorId = resolveActorId(ctx);
         if (!actorId) {
           return { content: [{ type: "text", text: "Actor identity unavailable: user has no email or userId." }], isError: true };
@@ -31417,7 +31395,7 @@ function registerValueVelocityTools(server, ctx, client) {
     },
     async ({ beatId, w }) => {
       try {
-        await assertBeatInOrg(client, beatId, ctx.orgId);
+        await assertBeatExists(client, beatId);
         const actorId = resolveActorId(ctx);
         if (!actorId) {
           return { content: [{ type: "text", text: "Actor identity unavailable: user has no email or userId." }], isError: true };
@@ -31446,12 +31424,12 @@ function registerValueVelocityTools(server, ctx, client) {
     },
     async ({ systemId, beatId }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         const actorId = resolveActorId(ctx);
         if (!actorId) {
           return { content: [{ type: "text", text: "Actor identity unavailable: user has no email or userId." }], isError: true };
         }
-        if (beatId !== void 0) await assertBeatInOrg(client, beatId, ctx.orgId);
+        if (beatId !== void 0) await assertBeatExists(client, beatId);
         const proposed = await client.proposeEnablementEdges(systemId, actorId, beatId);
         if (proposed.length === 0) {
           return { content: [{ type: "text", text: "No enablement edges proposed (fewer than 2 Beats or no relationships found)." }] };
@@ -31482,8 +31460,8 @@ function registerValueVelocityTools(server, ctx, client) {
     },
     async ({ beatId, targetBeatId }) => {
       try {
-        await assertBeatInOrg(client, beatId, ctx.orgId);
-        await assertBeatInOrg(client, targetBeatId, ctx.orgId);
+        await assertBeatExists(client, beatId);
+        await assertBeatExists(client, targetBeatId);
         const actorId = resolveActorId(ctx);
         if (!actorId) {
           return { content: [{ type: "text", text: "Actor identity unavailable: user has no email or userId." }], isError: true };
@@ -31516,8 +31494,8 @@ function registerValueVelocityTools(server, ctx, client) {
     },
     async ({ beatId, targetBeatId, rationale }) => {
       try {
-        await assertBeatInOrg(client, beatId, ctx.orgId);
-        await assertBeatInOrg(client, targetBeatId, ctx.orgId);
+        await assertBeatExists(client, beatId);
+        await assertBeatExists(client, targetBeatId);
         const actorId = resolveActorId(ctx);
         if (!actorId) {
           return { content: [{ type: "text", text: "Actor identity unavailable: user has no email or userId." }], isError: true };
@@ -31553,8 +31531,8 @@ function registerValueVelocityTools(server, ctx, client) {
     },
     async ({ beatId, targetBeatId }) => {
       try {
-        await assertBeatInOrg(client, beatId, ctx.orgId);
-        await assertBeatInOrg(client, targetBeatId, ctx.orgId);
+        await assertBeatExists(client, beatId);
+        await assertBeatExists(client, targetBeatId);
         const actorId = resolveActorId(ctx);
         if (!actorId) {
           return { content: [{ type: "text", text: "Actor identity unavailable: user has no email or userId." }], isError: true };
@@ -32172,7 +32150,7 @@ ${JSON.stringify(task.result, null, 2)}
       limit: external_exports.coerce.number().optional().default(20).describe("Max number of jobs to return")
     },
     async ({ systemId, status, limit }) => {
-      await assertSystemInOrg(client, systemId, ctx.orgId);
+      await assertSystemExists(client, systemId);
       const tasks = await client.listSystemTasks(systemId, {
         status,
         limit
@@ -32230,7 +32208,7 @@ ${JSON.stringify(task.result, null, 2)}
       limit: external_exports.coerce.number().optional().default(20).describe("Max number of jobs to return")
     },
     async ({ systemId, status, limit }) => {
-      await assertSystemInOrg(client, systemId, ctx.orgId);
+      await assertSystemExists(client, systemId);
       const tasks = await client.listSystemTasks(systemId, {
         status,
         limit
@@ -32254,7 +32232,7 @@ ${JSON.stringify(task.result, null, 2)}
     },
     async ({ systemId, beatId }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         const task = await client.draftCoda(systemId, beatId);
         return {
           content: [{
@@ -32287,7 +32265,7 @@ ${JSON.stringify(task.result, null, 2)}
     },
     async ({ systemId, noteIds }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         const task = await client.validateAssumptions(systemId, noteIds);
         return {
           content: [{
@@ -32323,7 +32301,7 @@ ${JSON.stringify(task.result, null, 2)}
     },
     async ({ systemId, message, revisionId, parentSessionId }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         const task = await client.startSession(
           systemId,
           message,
@@ -32363,7 +32341,7 @@ ${JSON.stringify(task.result, null, 2)}
     },
     async ({ systemId, revisionIds }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         const task = await client.planRevisionBatch(systemId, revisionIds);
         return {
           content: [{
@@ -32395,7 +32373,7 @@ ${JSON.stringify(task.result, null, 2)}
     },
     async ({ systemId }) => {
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
+        await assertSystemExists(client, systemId);
         const task = await client.runTriage(systemId);
         return {
           content: [{
@@ -32440,8 +32418,30 @@ ${JSON.stringify(task.result, null, 2)}
       encoding: external_exports.enum(["base64"]).optional().describe('Set to "base64" when submitting binary files (DOCX, XLSX, PPTX, PDF). Omit for plain text.')
     },
     async ({ systemId, content, filename, encoding }) => {
+      const DOCUMENT_MAX_BYTES = 10 * 1024 * 1024;
+      const contentBytes = encoding === "base64" ? Buffer.byteLength(content, "base64") : Buffer.byteLength(content, "utf8");
+      if (contentBytes > DOCUMENT_MAX_BYTES) {
+        const actualMb = (contentBytes / (1024 * 1024)).toFixed(2);
+        return {
+          content: [{
+            type: "text",
+            text: [
+              `**Field:** content`,
+              `**Limit:** 10MB`,
+              `**Actual:** ${actualMb}MB`,
+              `**Action:** Split the document into smaller chunks (each under 10MB) and submit them separately.`
+            ].join("\n")
+          }],
+          isError: true
+        };
+      }
+      try {
+        await assertSystemExists(client, systemId);
+      } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        return { content: [{ type: "text", text: `Failed to analyze document: ${message}` }], isError: true };
+      }
       try {
-        await assertSystemInOrg(client, systemId, ctx.orgId);
         const result = encoding === "base64" ? await client.analyzeBinaryDocument(systemId, content, filename) : await client.analyzeDocument(systemId, content, filename);
         return {
           content: [{
@@ -32460,6 +32460,24 @@ ${JSON.stringify(task.result, null, 2)}
         };
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
+        const status = err?.status;
+        const lower = message.toLowerCase();
+        const isSizeError = status === 413 || lower.includes("size limit") || lower.includes("too large");
+        if (isSizeError) {
+          return {
+            content: [{
+              type: "text",
+              text: [
+                `**Field:** content`,
+                `**Limit:** 10MB`,
+                `**Actual:** ${(contentBytes / (1024 * 1024)).toFixed(2)}MB`,
+                `**Detail:** ${message}`,
+                `**Action:** Split the document into smaller chunks (each under 10MB) and submit them separately.`
+              ].join("\n")
+            }],
+            isError: true
+          };
+        }
         return { content: [{ type: "text", text: `Failed to analyze document: ${message}` }], isError: true };
       }
     }
@@ -32613,7 +32631,7 @@ function registerBeatResources(server, ctx, client) {
     new ResourceTemplate("harmonica://system/{systemId}/beats", { list: void 0 }),
     async (uri, { systemId }) => {
       const sid = String(systemId);
-      await fetchSystemInOrg(client, sid, ctx.orgId);
+      await fetchSystem(client, sid);
       const beats = await client.listSystemBeats(sid);
       const text = formatBeatSummaryTable(beats);
       return { contents: [{ uri: uri.href, text }] };
@@ -32624,7 +32642,7 @@ function registerBeatResources(server, ctx, client) {
     new ResourceTemplate("harmonica://beat/{beatId}", { list: void 0 }),
     async (uri, { beatId }) => {
       const bid = String(beatId);
-      await assertBeatInOrg(client, bid, ctx.orgId);
+      await assertBeatExists(client, bid);
       const beat = await client.getBeat(bid);
       if (!beat) {
         return { contents: [{ uri: uri.href, text: `Beat not found: "${bid}"` }] };
@@ -32655,7 +32673,7 @@ function registerSystemResources(server, ctx, client) {
     new ResourceTemplate("harmonica://system/{systemId}/context", { list: void 0 }),
     async (uri, { systemId }) => {
       const sid = String(systemId);
-      const project = await fetchSystemInOrg(client, sid, ctx.orgId);
+      const project = await fetchSystem(client, sid);
       const notes = await client.listSystemNotes(sid, { limit: DEFAULT_CONTEXT_NOTE_LIMIT });
       const text = formatSystemContext(project, notes);
       return { contents: [{ uri: uri.href, text }] };
@@ -32843,8 +32861,17 @@ function createHttpClient(config2) {
       if (!raw) return void 0;
       return { ...raw, orgId: raw.id };
     },
-    getUser: async (_userId) => {
-      return request("GET", "/api/users/me");
+    getCurrentUser: async () => {
+      return request(
+        "GET",
+        "/api/users/me"
+      );
+    },
+    getUser: async (userId) => {
+      return request(
+        "GET",
+        `/api/users/lookup?email=${encodeURIComponent(userId)}`
+      );
     },
     getMembership: async (userId, orgId) => {
       return { userId, orgId, role: "member" };
@@ -32914,7 +32941,7 @@ function createHttpClient(config2) {
         );
         const system = result?.system ? {
           ...result.system,
-          systemId: result.system.id ?? result.system.systemId ?? result.system.projectId,
+          systemId: result.system.id ?? result.system.systemId,
           title: result.system.name ?? result.system.title,
           orgId: result.system.organizationId ?? result.system.orgId
         } : void 0;
@@ -32927,14 +32954,14 @@ function createHttpClient(config2) {
     // Systems (canonical)
     listOrgSystems: async (orgId) => {
       const raw = await request("GET", `/api/organizations/${encodeURIComponent(orgId)}/systems/summaries`);
-      return (raw ?? []).map((p) => ({ ...p, systemId: p.id, projectId: p.id, title: p.name, orgId: p.organizationId }));
+      return (raw ?? []).map((p) => ({ ...p, systemId: p.id, title: p.name, orgId: p.organizationId }));
     },
     getSystem: async (systemId) => {
       const raw = await request("GET", `/api/systems/${encodeURIComponent(systemId)}`);
       if (!raw) return void 0;
       return {
         ...raw,
-        systemId: raw.id ?? raw.systemId ?? raw.projectId,
+        systemId: raw.id ?? raw.systemId,
         title: raw.name ?? raw.title,
         orgId: raw.organizationId ?? raw.orgId
       };
@@ -32950,26 +32977,25 @@ function createHttpClient(config2) {
         // is created unlinked — invisible in the Account's Systems list.
         ...input.accountId !== void 0 && { accountId: input.accountId }
       });
-      return { ...raw, systemId: raw?.id ?? raw?.systemId ?? raw?.projectId, title: raw?.name ?? raw?.title, orgId: raw?.organizationId ?? raw?.orgId };
+      return { ...raw, systemId: raw?.id ?? raw?.systemId, title: raw?.name ?? raw?.title, orgId: raw?.organizationId ?? raw?.orgId };
     },
     updateSystem: async (systemId, updates) => {
       const raw = await request("PATCH", `/api/systems/${encodeURIComponent(systemId)}`, updates);
       if (!raw) return void 0;
-      return { ...raw, systemId: raw.id ?? raw.systemId ?? raw.projectId, title: raw.name ?? raw.title, orgId: raw.organizationId ?? raw.orgId };
+      return { ...raw, systemId: raw.id ?? raw.systemId, title: raw.name ?? raw.title, orgId: raw.organizationId ?? raw.orgId };
     },
     archiveSystem: async (systemId) => {
       const raw = await request("PATCH", `/api/systems/${encodeURIComponent(systemId)}/archive`);
       if (!raw) return void 0;
-      return { ...raw, systemId: raw.id ?? raw.systemId ?? raw.projectId, title: raw.name ?? raw.title, orgId: raw.organizationId ?? raw.orgId };
+      return { ...raw, systemId: raw.id ?? raw.systemId, title: raw.name ?? raw.title, orgId: raw.organizationId ?? raw.orgId };
     },
     getSystemFact: async (systemId) => {
       const result = await request("GET", `/api/systems/${encodeURIComponent(systemId)}/facts`);
       return result?.data;
     },
     saveSystemFact: (input) => {
-      const effectiveId = input.systemId ?? input.projectId;
-      if (!effectiveId) throw new Error("saveSystemFact: systemId (or legacy projectId) is required");
-      return request("PUT", `/api/systems/${encodeURIComponent(String(effectiveId))}/facts`, input);
+      if (!input.systemId) throw new Error("saveSystemFact: systemId is required");
+      return request("PUT", `/api/systems/${encodeURIComponent(String(input.systemId))}/facts`, input);
     },
     transitionSystemLifecycleState: async (systemId, targetState, options) => {
       return request("POST", `/api/systems/${encodeURIComponent(systemId)}/lifecycle/transitions`, {
@@ -32995,7 +33021,7 @@ function createHttpClient(config2) {
     getBeat: async (beatId) => {
       const raw = await request("GET", `/api/beats/${encodeURIComponent(beatId)}`);
       if (!raw) return void 0;
-      return { ...raw, beatId: raw.beatId ?? raw.id, projectId: raw.projectId ?? raw.systemId, status: raw.status ?? "open", beatStatus: coerceBeatStatusLocal(raw.beatStatus) };
+      return { ...raw, beatId: raw.beatId ?? raw.id, status: raw.status ?? "open", beatStatus: coerceBeatStatusLocal(raw.beatStatus) };
     },
     getBeatConvergence: async (systemId, beatId) => {
       const raw = await request(
@@ -33042,7 +33068,7 @@ function createHttpClient(config2) {
       }
       const beat = await request("GET", `/api/beats/${encodeURIComponent(beatId)}`);
       if (!beat) return void 0;
-      const systemId = beat.systemId ?? beat.projectId;
+      const systemId = beat.systemId;
       if (!systemId) return void 0;
       const result = await request("PUT", `/api/systems/${encodeURIComponent(systemId)}/beats/${encodeURIComponent(beatId)}`, updates);
       const raw = result?.beat ?? result;
@@ -33178,7 +33204,7 @@ function createHttpClient(config2) {
     listBeatNotes: async (beatId, filters) => {
       const beat = await request("GET", `/api/beats/${encodeURIComponent(beatId)}`);
       if (!beat) return [];
-      const systemId = beat.systemId ?? beat.projectId;
+      const systemId = beat.systemId;
       if (!systemId) return [];
       const params = new URLSearchParams();
       if (filters?.noteType) {
@@ -33242,10 +33268,6 @@ function createHttpClient(config2) {
       );
       return result;
     },
-    getKeyAssumptions: async (systemId) => {
-      const result = await request("GET", `/api/systems/${encodeURIComponent(systemId)}/notes/key-assumptions`);
-      return result?.assumptions ?? [];
-    },
     getNextNoteId: async (projectCode) => {
       return `N-${projectCode}-${Date.now()}`;
     },
@@ -34221,8 +34243,7 @@ function createHttpClient(config2) {
         ...parentGroupId !== void 0 && { parentGroupId },
         ...createdBy !== void 0 && { createdBy }
       };
-      const inputRec = input;
-      const effectiveSystemId = inputRec.systemId ?? input.projectId;
+      const effectiveSystemId = input.systemId;
       const url2 = effectiveSystemId ? `/api/systems/${encodeURIComponent(effectiveSystemId)}/deliverable-groups` : `/api/teamspaces/${encodeURIComponent(input.teamspaceId)}/deliverable-groups`;
       const result = await request("POST", url2, body);
       if (result === void 0) throw new Error(`Resource not found when creating DeliverableGroup`);
@@ -35043,7 +35064,7 @@ function loadConfig() {
   };
 }
 async function main() {
-  console.error(`[harmonica-mcp] v${"4.3.0"} starting\u2026`);
+  console.error(`[harmonica-mcp] v${"4.4.0"} starting\u2026`);
   const config2 = loadConfig();
   const client = createHttpClient({
     apiBaseUrl: config2.apiBaseUrl,