@codazen/harmonica-mcp 3.6.1 → 3.7.0

package/dist/index.js

@@ -21542,25 +21542,25 @@ async function validateAuth(client, orgIdentifier, isOrgSlug, userId) {
 }
 
 // ../../libs/harmonica-services/src/mcp/org-guard.ts
-async function assertProjectInOrg(client, projectId, orgId) {
-  const project = await client.getSystem(projectId);
+async function assertProjectInOrg(client, systemId, orgId) {
+  const project = await client.getSystem(systemId);
   if (!project) {
-    throw new Error(`Project not found: "${projectId}"`);
+    throw new Error(`Project not found: "${systemId}"`);
   }
   if (project.orgId !== orgId) {
     throw new Error(
-      `Project "${projectId}" does not belong to the configured organization. Access denied.`
+      `Project "${systemId}" does not belong to the configured organization. Access denied.`
     );
   }
 }
-async function assertRevisionInProject(client, revisionId, projectId) {
+async function assertRevisionInProject(client, revisionId, systemId) {
   const revision = await client.getRevision(revisionId);
   if (!revision) {
     throw new Error(`Revision not found: "${revisionId}"`);
   }
-  if (revision.projectId !== projectId) {
+  if (revision.systemId !== systemId) {
     throw new Error(
-      `Revision "${revisionId}" does not belong to project "${projectId}". Access denied.`
+      `Revision "${revisionId}" does not belong to project "${systemId}". Access denied.`
     );
   }
 }
@@ -21575,14 +21575,14 @@ async function assertBeatInOrg(client, beatId, orgId) {
     );
   }
 }
-async function fetchProjectInOrg(client, projectId, orgId) {
-  const project = await client.getSystem(projectId);
+async function fetchProjectInOrg(client, systemId, orgId) {
+  const project = await client.getSystem(systemId);
   if (!project) {
-    throw new Error(`Project not found: "${projectId}"`);
+    throw new Error(`Project not found: "${systemId}"`);
   }
   if (project.orgId !== orgId) {
     throw new Error(
-      `Project "${projectId}" does not belong to the configured organization. Access denied.`
+      `Project "${systemId}" does not belong to the configured organization. Access denied.`
     );
   }
   return project;
@@ -21974,13 +21974,13 @@ function registerActivityTools(server, ctx, client) {
     "list_activities",
     "List project activity audit trail \u2014 shows beat changes, revision transitions, note operations, merges, splits, and reassignments. Sorted newest-first.",
     {
-      projectId: external_exports.string().describe("The project ID"),
+      systemId: external_exports.string().describe("The project ID"),
       limit: external_exports.coerce.number().min(1).max(100).optional().describe("Max activities to return (default 30)"),
       importance: external_exports.enum(IMPORTANCE_VALUES).optional().describe("Filter by minimum importance level")
     },
-    async ({ projectId, limit, importance }) => {
-      await assertProjectInOrg(client, projectId, ctx.orgId);
-      const { entries, hasMore } = await client.listSystemActivities(projectId, {
+    async ({ systemId, limit, importance }) => {
+      await assertProjectInOrg(client, systemId, ctx.orgId);
+      const { entries, hasMore } = await client.listSystemActivities(systemId, {
         limit: limit ?? 30,
         minImportance: importance
       });
@@ -22005,14 +22005,14 @@ function registerAnalysisTools(server, ctx, client) {
     "cluster_entities",
     "Cluster any embeddable entity type (notes, beats, revisions) by vector similarity using DBSCAN. Returns groups of related entities \u2014 useful for understanding subsystem boundaries, finding duplicates, and planning batched work.",
     {
-      projectId: external_exports.string().describe("The project ID"),
+      systemId: external_exports.string().describe("The project ID"),
       entityType: ENTITY_TYPE_SCHEMA.describe("Entity type to cluster. Default: revision"),
       threshold: external_exports.coerce.number().min(0).max(1).optional().default(0.75).describe("DBSCAN similarity threshold (0-1). Higher = tighter clusters. Default 0.75"),
       minClusterSize: external_exports.coerce.number().int().min(2).optional().default(3).describe("Minimum cluster size. Default 3")
     },
-    async ({ projectId, entityType, threshold, minClusterSize }) => {
-      await assertProjectInOrg(client, projectId, ctx.orgId);
-      const result = await client.clusterEntities(projectId, entityType, { threshold, minClusterSize });
+    async ({ systemId, entityType, threshold, minClusterSize }) => {
+      await assertProjectInOrg(client, systemId, ctx.orgId);
+      const result = await client.clusterEntities(systemId, entityType, { threshold, minClusterSize });
       if (result.clusters.length === 0) {
         return {
           content: [{ type: "text", text: `No clusters found (${result.totalAnalyzed} ${entityType}s analyzed, ${result.noise.length} unclustered).` }]
@@ -22036,15 +22036,15 @@ Analyzed: ${result.totalAnalyzed} | Clusters: ${result.clusters.length} | Noise:
     "run_clustered_analysis",
     "Run batched analysis on clustered project entities. Groups entities by vector similarity, then runs a specified analysis type (docs, completeness, tech_debt, security) per cluster. Returns aggregated results.",
     {
-      projectId: external_exports.string().describe("The project ID"),
+      systemId: external_exports.string().describe("The project ID"),
       analysisType: ANALYSIS_TYPE_SCHEMA.describe("Type of analysis to run"),
       entityType: ENTITY_TYPE_SCHEMA.describe("Entity type to cluster. Default: revision"),
       threshold: external_exports.coerce.number().min(0).max(1).optional().default(0.7).describe("DBSCAN similarity threshold (0-1). Default 0.7"),
       minClusterSize: external_exports.coerce.number().int().min(2).optional().default(2).describe("Minimum cluster size. Default 2")
     },
-    async ({ projectId, analysisType, entityType, threshold, minClusterSize }) => {
-      await assertProjectInOrg(client, projectId, ctx.orgId);
-      const result = await client.runClusteredAnalysis(projectId, analysisType, {
+    async ({ systemId, analysisType, entityType, threshold, minClusterSize }) => {
+      await assertProjectInOrg(client, systemId, ctx.orgId);
+      const result = await client.runClusteredAnalysis(systemId, analysisType, {
         entityType,
         threshold,
         minClusterSize
@@ -22073,13 +22073,13 @@ function registerAuditIntegrityTools(server, ctx, client) {
     "verify_audit_integrity",
     "Verify the cryptographic integrity of audit trail records for a project. Checks SHA-256 hashes on Activity and PromptLog records to detect any post-creation tampering.",
     {
-      projectId: external_exports.string().describe("The project ID to verify"),
+      systemId: external_exports.string().describe("The project ID to verify"),
       limit: external_exports.number().optional().describe("Max records to verify (default 100)")
     },
-    async ({ projectId, limit }) => {
+    async ({ systemId, limit }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
-        const report = await client.verifyAuditIntegrity(projectId, { limit });
+        await assertProjectInOrg(client, systemId, ctx.orgId);
+        const report = await client.verifyAuditIntegrity(systemId, { limit });
         const lines = [
           `## Audit Integrity Report`,
           ``,
@@ -22287,16 +22287,16 @@ Rationale: ${rationale}`;
     "bulk_reassign_revisions",
     "Reassign multiple revisions to new home Beats in a single call. Each item names a revision and its target Beat (different items can target different Beats \u2014 e.g., redistributing one Beat's revisions across several after decomposition). Each reassignment archives the original revision and creates a copy on the target Beat, identical to reassign_revision. Returns per-item success/failure so partial failures don't abort the batch. Use when migrating many revisions at once after a Beat split.",
     {
-      projectId: external_exports.string().describe("The project ID (for access control \u2014 all revisions and target beats must belong to this project)"),
+      systemId: external_exports.string().describe("The project ID (for access control \u2014 all revisions and target beats must belong to this project)"),
       items: external_exports.array(external_exports.object({
         revisionId: external_exports.string().describe("The revision ID to reassign"),
         toBeatId: external_exports.string().describe("The target beat ID for this specific revision")
       })).min(1).max(100).describe("Reassignment items (max 100 per call)"),
       reason: external_exports.string().describe("Why these revisions are being reassigned (applied to all items)")
     },
-    async ({ projectId, items, reason }) => {
+    async ({ systemId, items, reason }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
         const result = await client.bulkReassignRevisions(items, reason, ctx.user.userId);
         const lines = [
           `# Bulk reassignment complete: ${result.reassigned.length} succeeded, ${result.failed.length} failed`,
@@ -22328,14 +22328,14 @@ Rationale: ${rationale}`;
     "reassign_revision",
     "Reassign a misattributed revision from one Beat to another. Creates a copy on the target Beat and archives the original. Logs a revision_reassigned activity for audit trail.",
     {
-      projectId: external_exports.string().describe("The project ID (for access control)"),
+      systemId: external_exports.string().describe("The project ID (for access control)"),
       revisionId: external_exports.string().describe("The revision ID to reassign"),
       toBeatId: external_exports.string().describe("The target beat ID"),
       reason: external_exports.string().describe("Why this revision is being reassigned")
     },
-    async ({ projectId, revisionId, toBeatId, reason }) => {
+    async ({ systemId, revisionId, toBeatId, reason }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
         const result = await client.reassignRevision(revisionId, toBeatId, reason, ctx.user.userId);
         const text = [
           `Revision reassigned successfully.`,
@@ -22374,7 +22374,7 @@ function registerBeatConvergenceTools(server, ctx, client) {
     { beatId: external_exports.string().describe("The beat ID (e.g., TF-B-001)") },
     async ({ beatId }) => {
       const beat = await fetchBeatInOrg(client, beatId, ctx.orgId);
-      const report = await client.getBeatConvergence(beat.systemId ?? beat.projectId, beatId);
+      const report = await client.getBeatConvergence(beat.systemId, beatId);
       if (!report) {
         return { content: [{ type: "text", text: `No convergence data for beat "${beatId}".` }], isError: true };
       }
@@ -22434,7 +22434,7 @@ function registerBeatPlanningTools(server, ctx, client) {
     "Plan the implementation of a Beat Revision via a conversational turn. Uses the revision description and Beat notes as context. Use this during the planning or building stage to refine scope, explore implementation details, or assess readiness.",
     {
       revisionId: external_exports.string().describe("The revision ID to plan"),
-      projectId: external_exports.string().describe("The project ID"),
+      systemId: external_exports.string().describe("The project ID"),
       message: external_exports.string().describe(
         'Your planning message \u2014 e.g. "Review the revision scope", "What should we consider for the auth flow?", or "Does this cover the acceptance criteria?"'
       ),
@@ -22443,7 +22443,7 @@ function registerBeatPlanningTools(server, ctx, client) {
         content: external_exports.string()
       })).optional().describe("Previous conversation messages for context continuity")
     },
-    async ({ revisionId, projectId, message, conversationHistory }) => {
+    async ({ revisionId, systemId, message, conversationHistory }) => {
       try {
         const revision = await client.getRevision(revisionId);
         if (!revision) {
@@ -22454,7 +22454,7 @@ function registerBeatPlanningTools(server, ctx, client) {
           ...conversationHistory ?? [],
           { role: "user", content: message }
         ];
-        const result = await client.planRevision(revisionId, projectId, messages);
+        const result = await client.planRevision(revisionId, systemId, messages);
         return {
           content: [{
             type: "text",
@@ -22536,13 +22536,13 @@ ${d.rationale}${d.suggestions?.length ? `
 function registerBeatQualityTools(server, ctx, client) {
   const schema = {
     beatId: external_exports.string().describe("The beat ID (e.g., TF-B-001)"),
-    projectId: external_exports.string().describe("The project ID"),
+    systemId: external_exports.string().describe("The project ID"),
     wait: external_exports.boolean().optional().describe("If true, block until the check completes and return the scorecard inline. Default: false (returns taskId immediately).")
   };
-  const handler = async ({ beatId, projectId, wait }) => {
+  const handler = async ({ beatId, systemId, wait }) => {
     try {
       await assertBeatInOrg(client, beatId, ctx.orgId);
-      const { taskId } = await client.checkBeatQuality(projectId, beatId);
+      const { taskId } = await client.checkBeatQuality(systemId, beatId);
       if (!wait) {
         return {
           content: [{
@@ -22585,12 +22585,12 @@ function registerBeatReframeTools(server, ctx, client) {
     "Reframe a Beat's title and description to meet business-outcome quality rules \u2014 outcome-first, plain English, non-technical audience. Returns a proposed rewrite for review.",
     {
       beatId: external_exports.string().describe("The beat ID (e.g., TF-B-001)"),
-      projectId: external_exports.string().describe("The project ID")
+      systemId: external_exports.string().describe("The project ID")
     },
-    async ({ beatId, projectId }) => {
+    async ({ beatId, systemId }) => {
       try {
         await assertBeatInOrg(client, beatId, ctx.orgId);
-        const result = await client.reframeBeat(projectId, beatId);
+        const result = await client.reframeBeat(systemId, beatId);
         const text = formatReframeResult(beatId, result);
         return { content: [{ type: "text", text }] };
       } catch (err) {
@@ -22673,7 +22673,7 @@ function formatProjectSummaryTable(projects) {
   const header = "| Project ID | Title | Status |\n|------------|-------|--------|";
   const rows = projects.map((p) => {
     const status = p.status.replace("_", " ");
-    return `| ${p.projectId} | ${p.title} | ${status} |`;
+    return `| ${p.systemId} | ${p.title} | ${status} |`;
   });
   return [header, ...rows].join("\n");
 }
@@ -22702,7 +22702,7 @@ function formatDeliveryPolicy(policy, unresolvedReason) {
 function formatProjectContext(project, notes, orgCoda) {
   const sections = [];
   sections.push(`# System: ${project.title}`);
-  sections.push(`**ID:** ${project.projectId}`);
+  sections.push(`**ID:** ${project.systemId}`);
   sections.push(`**Status:** ${project.status.replace("_", " ")}`);
   if (project.repoOwner && project.repoName) {
     const branch = project.repoDefaultBranch ?? "main";
@@ -22989,7 +22989,7 @@ function formatSessionDetail(session) {
     "",
     `**Type:** ${type}`,
     `**Status:** ${status}`,
-    `**Project:** ${session.systemId ?? session.projectId}`,
+    `**Project:** ${session.systemId}`,
     `**Actor:** ${session.actor.agentPersona}${session.actor.agentRole ? ` (${session.actor.agentRole})` : ""}`
   ];
   if (session.actor.initiator) {
@@ -23097,14 +23097,14 @@ function registerBeatTools(server, ctx, client) {
     "list_beats",
     "List beats in a project. Use offset/limit to paginate large result sets.",
     {
-      projectId: external_exports.string().describe("The project ID"),
+      systemId: external_exports.string().describe("The project ID"),
       offset: external_exports.coerce.number().int().min(0).default(0).describe("Number of beats to skip (for pagination)"),
       limit: external_exports.coerce.number().int().min(1).max(500).default(100).describe("Max beats to return (default 100, max 500)"),
       includeArchived: external_exports.boolean().optional().default(false).describe("Include archived and deprecated beats (excluded by default)")
     },
-    async ({ projectId, offset = 0, limit = 100, includeArchived }) => {
-      await assertProjectInOrg(client, projectId, ctx.orgId);
-      let beats = await client.listSystemBeats(projectId);
+    async ({ systemId, offset = 0, limit = 100, includeArchived }) => {
+      await assertProjectInOrg(client, systemId, ctx.orgId);
+      let beats = await client.listSystemBeats(systemId);
       if (!includeArchived) {
         beats = beats.filter((b) => b.beatStatus !== "archived");
       }
@@ -23139,11 +23139,11 @@ function registerBeatTools(server, ctx, client) {
     "Get the full decision lineage timeline for a beat (revisions, status changes, edits, proposals)",
     {
       beatId: external_exports.string().describe("The beat ID"),
-      projectId: external_exports.string().optional().describe("Project ID (auto-resolved from beat if omitted)")
+      systemId: external_exports.string().optional().describe("Project ID (auto-resolved from beat if omitted)")
     },
-    async ({ beatId, projectId }) => {
+    async ({ beatId, systemId }) => {
       const beat = await fetchBeatInOrg(client, beatId, ctx.orgId);
-      const resolvedProjectId = projectId ?? beat.systemId ?? beat.projectId;
+      const resolvedProjectId = systemId ?? beat.systemId;
       const timeline = await client.getUnifiedBeatTimeline(resolvedProjectId, beatId);
       if (timeline.length === 0) {
         return { content: [{ type: "text", text: `No history for beat "${beatId}".` }] };
@@ -23156,7 +23156,7 @@ function registerBeatTools(server, ctx, client) {
     "create_beat",
     "Create a new beat in a project. Title must be outcome-first (what changes for the user, not what we build). Description is the Beat Coda \u2014 second-person resolved expression of the capability (1-3 sentences). Avoid jargon and user-story format. Read harmonica://guidelines/beat-quality for full rules. Auto-generates beat ID if not provided.",
     {
-      projectId: external_exports.string().describe("The project ID"),
+      systemId: external_exports.string().describe("The project ID"),
       title: external_exports.string().describe('Beat title \u2014 outcome-first, e.g. "At-risk shipments screen used daily by Ops"'),
       description: external_exports.string().optional().describe("Beat Coda \u2014 second-person resolved expression of what the capability looks like when complete (1-3 sentences)"),
       tags: external_exports.array(external_exports.string()).optional().describe("Tags for categorization"),
@@ -23167,13 +23167,13 @@ function registerBeatTools(server, ctx, client) {
       agentAssignee: agentAssigneeSchema.optional().describe('Agent assignee (e.g. { agentId: "maya", name: "Maya" })'),
       branch: external_exports.string().optional().describe('Git branch for code assessment (falls back to Project.repoDefaultBranch \u2192 "main")')
     },
-    async ({ projectId, title, description, tags, priority, estimatedEffort, beatId, humanAssignee, agentAssignee, branch }) => {
+    async ({ systemId, title, description, tags, priority, estimatedEffort, beatId, humanAssignee, agentAssignee, branch }) => {
       try {
-        await fetchProjectInOrg(client, projectId, ctx.orgId);
-        const resolvedBeatId = beatId ?? await client.getNextBeatId(projectId);
+        await fetchProjectInOrg(client, systemId, ctx.orgId);
+        const resolvedBeatId = beatId ?? await client.getNextBeatId(systemId);
         const beat = await client.createBeat({
           beatId: resolvedBeatId,
-          projectId,
+          systemId,
           orgId: ctx.orgId,
           title,
           description,
@@ -23190,7 +23190,7 @@ function registerBeatTools(server, ctx, client) {
         });
         if (!beat) return { content: [{ type: "text", text: "Failed to create beat: store returned undefined" }], isError: true };
         await logBeatActivity(client, {
-          projectId,
+          systemId,
           action: "beat_created",
           beatIds: [resolvedBeatId],
           beatTitles: [title],
@@ -23199,7 +23199,7 @@ function registerBeatTools(server, ctx, client) {
         });
         let similarityWarning = "";
         try {
-          const similar = await client.findSimilarBeats(beat.beatId, projectId, { threshold: 0.7, limit: 5 });
+          const similar = await client.findSimilarBeats(beat.beatId, systemId, { threshold: 0.7, limit: 5 });
           if (similar.length > 0) {
             const rows = similar.map((r) => `- **${r.entityId}** (score: ${r.score.toFixed(2)}): ${r.snippet.replace(/[\n\r]/g, " ")}`).join("\n");
             similarityWarning = `
@@ -23257,7 +23257,7 @@ ${formatBeatDetail(beat)}${similarityWarning}` }] };
           return { content: [{ type: "text", text: `Beat not found: "${beatId}"` }], isError: true };
         }
         await logBeatActivity(client, {
-          projectId: beat.systemId ?? beat.projectId,
+          systemId: beat.systemId,
           action: "beat_updated",
           beatIds: [beatId],
           beatTitles: [updated.title],
@@ -23279,15 +23279,15 @@ ${formatBeatDetail(beat)}${similarityWarning}` }] };
     "list_revisions",
     "List revisions for a project, optionally filtered by binary status (`active` or `archived`). Archived revisions are excluded by default. Use beatId to scope results to a single beat.",
     {
-      projectId: external_exports.string().describe("The project ID"),
+      systemId: external_exports.string().describe("The project ID"),
       beatId: external_exports.string().optional().describe("Scope to a specific beat (omit for all project revisions)"),
       status: external_exports.enum(["active", "archived"]).optional().describe("Filter by binary Revision status (default: all non-archived)"),
       includeArchived: external_exports.boolean().optional().default(false).describe("Include archived revisions (excluded by default)")
     },
-    async ({ projectId, beatId, status, includeArchived }) => {
+    async ({ systemId, beatId, status, includeArchived }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
-        const revisions = beatId ? await client.listBeatRevisions(projectId, beatId, { status, includeArchived }) : await client.listSystemRevisions(projectId, { status, includeArchived });
+        await assertProjectInOrg(client, systemId, ctx.orgId);
+        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) {
         const message = err instanceof Error ? err.message : String(err);
@@ -23327,7 +23327,7 @@ async function logBeatActivity(client, params) {
   try {
     await client.createActivity({
       activityId: (0, import_crypto2.randomUUID)(),
-      projectId: params.projectId,
+      systemId: params.systemId,
       action: params.action,
       importance: params.importance ?? "minor",
       affectedBeatIds: params.beatIds,
@@ -23399,13 +23399,13 @@ function registerBeatVersionTools(server, ctx, client) {
     "list_beat_versions",
     "List Beat Versions for a Beat or Project. Beat Versions are the shippable planning increments that advance a Beat toward its goal. Use beatId to scope to a specific Beat, or omit for all Beat Versions in the project. Status is binary (active | archived); by default excludes archived.",
     {
-      projectId: external_exports.string().describe("The project ID"),
+      systemId: external_exports.string().describe("The project ID"),
       beatId: external_exports.string().optional().describe("Filter to a specific Beat (omit for all Beat Versions in project)"),
       status: external_exports.enum(BEAT_VERSION_STATUSES).optional().describe("Filter to a specific status (active | archived)"),
       includeTerminal: external_exports.boolean().optional().describe("Include archived Beat Versions. Default: false.")
     },
-    async ({ projectId, beatId, status, includeTerminal }) => {
-      const beatVersions = await client.listBeatVersions(projectId, {
+    async ({ systemId, beatId, status, includeTerminal }) => {
+      const beatVersions = await client.listBeatVersions(systemId, {
         beatId,
         status,
         includeTerminal
@@ -23476,7 +23476,7 @@ function registerBeatVersionTools(server, ctx, client) {
           return { content: [{ type: "text", text: `Beat not found: "${beatId}"` }], isError: true };
         }
         await assertBeatInOrg(client, beatId, ctx.orgId);
-        const beatVersion = await client.createBeatVersion(beat.systemId ?? beat.projectId, beatId, {
+        const beatVersion = await client.createBeatVersion(beat.systemId, beatId, {
           title,
           description,
           scope,
@@ -23831,13 +23831,13 @@ function registerCheckTools(server, ctx, client) {
     "list_checks",
     "List persisted checks for a project, beat, beat version, or revision. Shows score trends over time. Filter by check type.",
     {
-      projectId: external_exports.string().describe("The project ID"),
+      systemId: external_exports.string().describe("The project ID"),
       beatId: external_exports.string().optional().describe("List checks for this specific beat"),
       beatVersionId: external_exports.string().optional().describe("List checks for this specific beat version"),
       revisionId: external_exports.string().optional().describe("List checks for this specific revision"),
       checkType: external_exports.enum(["beat_coda_quality", "beat_quality", "beat_version_quality", "plan_quality", "build_quality", "pii_scan", "portfolio_coherence"]).optional().describe("Filter by check type. beat_quality is the DEPRECATED alias of beat_coda_quality. plan_quality is the DEPRECATED alias of beat_version_quality. pii_scan is RETIRED from the taxonomy (PII detection moved to the Scan family, N-4E09-6809) \u2014 it is still accepted here so historical records stay readable, but no new pii_scan checks are written.")
     },
-    async ({ projectId, beatId, beatVersionId, revisionId, checkType }) => {
+    async ({ systemId, beatId, beatVersionId, revisionId, checkType }) => {
       try {
         const filters = [
           revisionId ? "revisionId" : null,
@@ -23916,18 +23916,18 @@ function registerCheckTools(server, ctx, client) {
         let checks;
         let scope;
         if (revisionId) {
-          checks = await client.listRevisionChecks(revisionId, projectId, checkType);
+          checks = await client.listRevisionChecks(revisionId, systemId, checkType);
           scope = `revision ${revisionId}`;
         } else if (beatVersionId) {
-          checks = await client.listBeatVersionChecks(beatVersionId, projectId, checkType);
+          checks = await client.listBeatVersionChecks(beatVersionId, systemId, checkType);
           scope = `beat_version ${beatVersionId}`;
         } else if (beatId) {
-          checks = await client.listBeatChecks(beatId, projectId, checkType);
+          checks = await client.listBeatChecks(beatId, systemId, checkType);
           scope = `beat ${beatId}`;
         } else {
-          const result = await client.listSystemChecks(projectId, checkType, { limit: 200 });
+          const result = await client.listSystemChecks(systemId, checkType, { limit: 200 });
           checks = result.checks;
-          scope = `project ${projectId}`;
+          scope = `project ${systemId}`;
         }
         if (checks.length === 0) {
           return { content: [{ type: "text", text: `No checks found for ${scope}.` }] };
@@ -23944,15 +23944,15 @@ function registerCheckTools(server, ctx, client) {
     "list_latest_checks",
     "List the latest check per target (Beat, Beat Version, Revision) across a whole project in one call \u2014 the most recent score of each type for each entity. Use this for an at-a-glance quality snapshot of every capability; use list_checks when you need the full history of one target.",
     {
-      projectId: external_exports.string().describe("The project ID")
+      systemId: external_exports.string().describe("The project ID")
     },
-    async ({ projectId }) => {
+    async ({ systemId }) => {
       try {
-        const checks = await client.listLatestSystemChecks(projectId);
+        const checks = await client.listLatestSystemChecks(systemId);
         if (checks.length === 0) {
-          return { content: [{ type: "text", text: `No checks found for project ${projectId}.` }] };
+          return { content: [{ type: "text", text: `No checks found for project ${systemId}.` }] };
         }
-        const text = formatCheckList(checks, `latest per target \xB7 project ${projectId}`);
+        const text = formatCheckList(checks, `latest per target \xB7 project ${systemId}`);
         return { content: [{ type: "text", text }] };
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
@@ -23966,19 +23966,19 @@ function registerCheckTools(server, ctx, client) {
     {
       checkType: external_exports.enum(["beat_coda_quality", "beat_quality", "beat_version_quality", "plan_quality", "build_quality"]).describe("Type of check to run. beat_quality is the deprecated alias of beat_coda_quality. plan_quality is the deprecated alias of beat_version_quality."),
       targetId: external_exports.string().describe("The target entity ID \u2014 a beatId for beat_coda_quality, or a Beat Version ID (bv-*) for beat_version_quality and build_quality"),
-      projectId: external_exports.string().describe("The project ID"),
+      systemId: external_exports.string().describe("The project ID"),
       branch: external_exports.string().optional().describe("Override the git branch for code checks (default: project default branch)"),
       localPath: external_exports.string().optional().describe("Absolute path to an already-cloned local copy of the repo \u2014 skips git clone entirely (useful for large repos or offline use)")
     },
-    async ({ checkType, targetId, projectId, branch, localPath }) => {
+    async ({ checkType, targetId, systemId, branch, localPath }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
         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 };
         }
         const opts = branch || localPath ? { branch, localPath } : void 0;
-        const task = await client.runCheck(projectId, checkType, targetId, opts);
+        const task = await client.runCheck(systemId, checkType, targetId, opts);
         const text = [
           `Check enqueued.`,
           `**Task ID:** ${task.taskId}`,
@@ -24070,7 +24070,7 @@ function registerClaimTools(server, ctx, client) {
           return { content: [{ type: "text", text: `Revision not found: "${revisionId}"` }], isError: true };
         }
         await assertBeatInOrg(client, revision.beatId, ctx.orgId);
-        const result = await client.claimRevision(revision.projectId, revisionId);
+        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 };
         }
@@ -24104,7 +24104,7 @@ function registerClaimTools(server, ctx, client) {
           return { content: [{ type: "text", text: `Revision not found: "${revisionId}"` }], isError: true };
         }
         await assertBeatInOrg(client, revision.beatId, ctx.orgId);
-        const result = await client.releaseRevisionClaim(revision.projectId, revisionId, reason);
+        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 };
         }
@@ -24204,11 +24204,11 @@ ${g.acceptanceCriteria}` : null,
     deliverables: external_exports.string().max(2e4).optional().describe("The Track's deliverables as Markdown bullet points (parallel to acceptanceCriteria)"),
     acceptanceCriteria: external_exports.string().max(2e4).optional().describe("The Track's acceptance criteria (Markdown), parallel to its deliverables"),
     vuRate: external_exports.number().nonnegative().describe("Value-Unit rate (billing rate for this engagement)"),
-    projectId: external_exports.string().optional().describe("Optional project to scope this Track to"),
+    systemId: external_exports.string().optional().describe("Optional project to scope this Track to"),
     movementId: external_exports.string().optional().describe("Optional Movement (client SOW) to scope this Track to"),
     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, projectId, movementId, parentGroupId }) => {
+  const createTrackHandler = async ({ teamspaceId, title, description, deliverables, acceptanceCriteria, vuRate, systemId, movementId, parentGroupId }) => {
     await assertTeamspaceInOrg(client, teamspaceId, ctx.orgId);
     if (movementId !== void 0) {
       await assertMovementInOrg(client, movementId, ctx.orgId);
@@ -24224,7 +24224,7 @@ ${g.acceptanceCriteria}` : null,
       ...deliverables !== void 0 && { deliverables },
       ...acceptanceCriteria !== void 0 && { acceptanceCriteria },
       vuRate,
-      ...projectId !== void 0 && { projectId },
+      ...systemId !== void 0 && { systemId },
       ...movementId !== void 0 && { movementId },
       ...parentGroupId !== void 0 && { parentGroupId },
       createdBy: ctx.user.userId
@@ -24447,7 +24447,7 @@ function registerDownbeatTools(server, ctx, client) {
     { beatId: external_exports.string().describe("The beat ID (e.g., TF-B-001)") },
     async ({ beatId }) => {
       const beat = await fetchBeatInOrg(client, beatId, ctx.orgId);
-      const downbeat = await client.setDownbeat(beat.systemId ?? beat.projectId, 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 };
       }
@@ -24460,7 +24460,7 @@ function registerDownbeatTools(server, ctx, client) {
     { beatId: external_exports.string().describe("The beat ID (e.g., TF-B-001)") },
     async ({ beatId }) => {
       const beat = await fetchBeatInOrg(client, beatId, ctx.orgId);
-      const result = await client.listIncrementsSinceDownbeat(beat.systemId ?? beat.projectId, beatId);
+      const result = await client.listIncrementsSinceDownbeat(beat.systemId, beatId);
       if (!result) {
         return { content: [{ type: "text", text: `No such beat "${beatId}".` }], isError: true };
       }
@@ -24473,7 +24473,7 @@ function registerDownbeatTools(server, ctx, client) {
     { beatId: external_exports.string().describe("The beat ID (e.g., TF-B-001)") },
     async ({ beatId }) => {
       const beat = await fetchBeatInOrg(client, beatId, ctx.orgId);
-      const report = await client.getCodaDrift(beat.systemId ?? beat.projectId, beatId);
+      const report = await client.getCodaDrift(beat.systemId, beatId);
       if (!report) {
         return { content: [{ type: "text", text: `No such beat "${beatId}".` }], isError: true };
       }
@@ -24486,7 +24486,7 @@ function registerDownbeatTools(server, ctx, client) {
     { beatId: external_exports.string().describe("The beat ID (e.g., TF-B-001)") },
     async ({ beatId }) => {
       const beat = await fetchBeatInOrg(client, beatId, ctx.orgId);
-      const report = await client.getRelationalDrift(beat.systemId ?? beat.projectId, beatId);
+      const report = await client.getRelationalDrift(beat.systemId, beatId);
       if (!report) {
         return { content: [{ type: "text", text: `No such beat "${beatId}".` }], isError: true };
       }
@@ -24555,17 +24555,17 @@ function registerDropQualityTools(server, ctx, client) {
     "Run a five-dimension coherence check on a Drop (Substantial, Harmonious, Clear, Focused, Strategically Aligned), graded LLM-only on the Drop's Beat Versions and their parent Beats/Projects/Codas. By default returns a taskId immediately \u2014 set wait=true to block and receive the full scorecard inline.",
     {
       dropId: external_exports.string().min(1).describe("The Drop ID (e.g. drop-abc123) to grade"),
-      projectId: external_exports.string().min(1).describe("A project within this Drop \u2014 the check record is attributed to it (Drops span projects, so the result is recorded under one member project)"),
+      systemId: external_exports.string().min(1).describe("A project within this Drop \u2014 the check record is attributed to it (Drops span projects, so the result is recorded under one member project)"),
       wait: external_exports.boolean().optional().describe("Block until the check completes and return the scorecard inline. Default: false.")
     },
-    async ({ dropId, projectId, wait }) => {
+    async ({ dropId, systemId, wait }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
         const drop = await client.getDrop(dropId);
         if (!drop) {
           return { content: [{ type: "text", text: `Drop "${dropId}" not found.` }], isError: true };
         }
-        const { taskId } = await client.runCheck(projectId, "drop_quality", dropId);
+        const { taskId } = await client.runCheck(systemId, "drop_quality", dropId);
         if (!wait) {
           return {
             content: [{
@@ -24966,9 +24966,9 @@ function registerEmbeddingTools(server, ctx, client) {
   );
   server.tool(
     "search",
-    "Free-text semantic search across project, teamspace, or org scope. Provide exactly one of projectId / 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 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.",
     {
-      projectId: external_exports.string().optional().describe("Search within a single project"),
+      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"),
       query: external_exports.string().describe("Natural language search query"),
@@ -24979,15 +24979,15 @@ function registerEmbeddingTools(server, ctx, client) {
       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 ({ projectId, teamspaceId, orgLevel, query, limit, includeArchived, entityType, noteType, noteStatus, beatId }) => {
-      const provided = [projectId, teamspaceId, orgLevel].filter(Boolean).length;
+    async ({ systemId, teamspaceId, orgLevel, query, limit, includeArchived, entityType, noteType, noteStatus, beatId }) => {
+      const provided = [systemId, teamspaceId, orgLevel].filter(Boolean).length;
       if (provided !== 1) {
-        throw new Error("Specify exactly one of projectId, teamspaceId, or orgLevel.");
+        throw new Error("Specify exactly one of systemId, teamspaceId, or orgLevel.");
       }
       let scope;
-      if (projectId) {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
-        scope = { projectId };
+      if (systemId) {
+        await assertProjectInOrg(client, systemId, ctx.orgId);
+        scope = { systemId };
       } else if (teamspaceId) {
         await assertTeamspaceInOrg(client, teamspaceId, ctx.orgId);
         scope = { teamspaceId };
@@ -25004,22 +25004,22 @@ function registerEmbeddingTools(server, ctx, client) {
     "Find Notes semantically similar to one or more Notes. Accepts a single Note ID or an array of Note IDs for batch duplicate detection. Results are grouped by source Note.",
     {
       noteId: external_exports.union([external_exports.string(), external_exports.array(external_exports.string())]).describe("Note ID or array of Note IDs to find similar notes for"),
-      projectId: external_exports.string().describe("The project ID the notes belong to"),
+      systemId: external_exports.string().describe("The project ID the notes belong to"),
       threshold: external_exports.coerce.number().min(0).max(1).optional().default(0.7).describe("Minimum similarity score (0-1). Default 0.7"),
       limit: external_exports.coerce.number().int().min(1).max(50).optional().default(10).describe("Max results per source note. Default 10"),
       includeArchived: external_exports.boolean().optional().default(false).describe("Include archived/deprecated notes in results (excluded by default)"),
       noteStatus: external_exports.enum(["active", "unvalidated", "validated", "invalidated", "inProgress", "resolved", "superseded", "dismissed"]).optional().describe("Restrict results to notes with a specific status (e.g. unvalidated). DynamoDB post-filter."),
       beatId: external_exports.string().optional().describe("Restrict results to notes belonging to a specific beat (DynamoDB post-filter)")
     },
-    async ({ noteId, projectId, threshold, limit, includeArchived = false, noteStatus, beatId }) => {
-      await assertProjectInOrg(client, projectId, ctx.orgId);
+    async ({ noteId, systemId, threshold, limit, includeArchived = false, noteStatus, beatId }) => {
+      await assertProjectInOrg(client, systemId, ctx.orgId);
       const ids = Array.isArray(noteId) ? noteId : [noteId];
       if (ids.length === 1) {
-        const results = await client.findSimilarNotes(ids[0], projectId, { threshold, limit, includeArchived, noteStatus, beatId });
+        const results = await client.findSimilarNotes(ids[0], systemId, { threshold, limit, includeArchived, noteStatus, beatId });
         const text = formatSimilarityResults(results, ids[0], "Similar Notes");
         return { content: [{ type: "text", text }] };
       }
-      const batchResults = await client.findSimilarNotesMulti(ids, projectId, { threshold, limit, includeArchived, noteStatus, beatId });
+      const batchResults = await client.findSimilarNotesMulti(ids, systemId, { threshold, limit, includeArchived, noteStatus, beatId });
       const sections = batchResults.map(
         (br) => formatSimilarityResults(br.results, br.sourceNoteId, "Similar Notes")
       );
@@ -25031,14 +25031,14 @@ function registerEmbeddingTools(server, ctx, client) {
     "Find Beats semantically similar to a given Beat. Useful for detecting duplicates, dependencies, or related capabilities.",
     {
       beatId: external_exports.string().describe("The beat ID to find similar beats for"),
-      projectId: external_exports.string().describe("The project ID the beat belongs to"),
+      systemId: external_exports.string().describe("The project ID the beat belongs to"),
       threshold: external_exports.coerce.number().min(0).max(1).optional().default(0.7).describe("Minimum similarity score (0-1). Default 0.7"),
       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 beats in results (excluded by default)")
     },
-    async ({ beatId, projectId, threshold, limit, includeArchived = false }) => {
+    async ({ beatId, systemId, threshold, limit, includeArchived = false }) => {
       await assertBeatInOrg(client, beatId, ctx.orgId);
-      const results = await client.findSimilarBeats(beatId, projectId, { threshold, limit, includeArchived });
+      const results = await client.findSimilarBeats(beatId, systemId, { threshold, limit, includeArchived });
       const text = formatSimilarityResults(results, beatId, "Similar Beats");
       return { content: [{ type: "text", text }] };
     }
@@ -25048,13 +25048,13 @@ function registerEmbeddingTools(server, ctx, client) {
     "Find Beats semantically related to a given Note. Surfaces missing affectsBeats links and helps classify unassigned Notes.",
     {
       noteId: external_exports.string().describe("The note ID to find related beats for"),
-      projectId: external_exports.string().describe("The project ID the note belongs to"),
+      systemId: external_exports.string().describe("The project ID the note belongs to"),
       threshold: external_exports.coerce.number().min(0).max(1).optional().default(0.7).describe("Minimum similarity score (0-1). Default 0.7"),
       limit: external_exports.coerce.number().int().min(1).max(50).optional().default(10).describe("Max results to return. Default 10")
     },
-    async ({ noteId, projectId, threshold, limit }) => {
-      await assertProjectInOrg(client, projectId, ctx.orgId);
-      const results = await client.findRelatedBeats(noteId, projectId, { threshold, limit });
+    async ({ noteId, systemId, threshold, limit }) => {
+      await assertProjectInOrg(client, systemId, ctx.orgId);
+      const results = await client.findRelatedBeats(noteId, systemId, { threshold, limit });
       const text = formatSimilarityResults(results, noteId, "Related Beats");
       return { content: [{ type: "text", text }] };
     }
@@ -25063,14 +25063,14 @@ function registerEmbeddingTools(server, ctx, client) {
     "cluster_notes",
     "Cluster semantically similar Notes using DBSCAN on vector embeddings. Returns clusters for review with member previews. Use this to discover natural groupings among notes and consolidate them under parent summary notes.",
     {
-      projectId: external_exports.string().describe("The project ID"),
+      systemId: external_exports.string().describe("The project ID"),
       threshold: external_exports.coerce.number().min(0).max(1).optional().default(0.75).describe("Cosine similarity threshold for clustering (0-1). Higher = tighter clusters. Default 0.75"),
       minClusterSize: external_exports.coerce.number().int().min(2).optional().default(3).describe("Minimum notes to form a cluster. Default 3"),
       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 ({ projectId, threshold, minClusterSize, includeLinked }) => {
-      await assertProjectInOrg(client, projectId, ctx.orgId);
-      const result = await client.clusterNotes(projectId, { threshold, minClusterSize, excludeAlreadyLinked: !includeLinked });
+    async ({ systemId, threshold, minClusterSize, includeLinked }) => {
+      await assertProjectInOrg(client, systemId, ctx.orgId);
+      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.` }] };
       }
@@ -25094,14 +25094,14 @@ ${members}`;
     "consolidate_notes",
     "Two-pass note consolidation: clusters notes via DBSCAN, then sends each cluster to an LLM for contextual analysis. Returns consolidation proposals (should these be grouped under a parent summary?) without modifying data. Use cluster_notes for a quick vector-only view; use this when ready to act on consolidation.",
     {
-      projectId: external_exports.string().describe("The project ID"),
+      systemId: external_exports.string().describe("The project ID"),
       threshold: external_exports.coerce.number().min(0).max(1).optional().default(0.65).describe("Cosine similarity threshold for clustering (0-1). Default 0.65"),
       minClusterSize: external_exports.coerce.number().int().min(2).optional().default(2).describe("Minimum notes to form a cluster. Default 2"),
       includeLinked: external_exports.coerce.boolean().optional().default(false).describe("Include notes that already have dependsOnNotes links. Default false.")
     },
-    async ({ projectId, threshold, minClusterSize, includeLinked }) => {
-      await assertProjectInOrg(client, projectId, ctx.orgId);
-      const result = await client.consolidateNotes(projectId, { threshold, minClusterSize, includeLinked });
+    async ({ systemId, threshold, minClusterSize, includeLinked }) => {
+      await assertProjectInOrg(client, systemId, ctx.orgId);
+      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.` }] };
       }
@@ -25337,18 +25337,18 @@ function registerLayerTools(server, ctx, client) {
     "list_system_layers",
     "List the architectural Layers declared on a System (e.g. frontend, backend, data). Layers are an evaluation lens for plan/build quality checks, not a work container.",
     {
-      projectId: external_exports.string().describe("The System ID")
+      systemId: external_exports.string().describe("The System ID")
     },
-    async ({ projectId }) => {
+    async ({ systemId }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         return { content: [{ type: "text", text: `Access denied: ${message}` }], isError: true };
       }
       let layers;
       try {
-        layers = await client.listSystemLayers(projectId);
+        layers = await client.listSystemLayers(systemId);
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         return { content: [{ type: "text", text: `Failed to list Layers: ${message}` }], isError: true };
@@ -25361,12 +25361,12 @@ function registerLayerTools(server, ctx, client) {
     "get_layer",
     "Get full details of a single Layer by ID, including its repo mapping and parent Layer (if it was split from one).",
     {
-      projectId: external_exports.string().describe("The System ID (for access control)"),
+      systemId: external_exports.string().describe("The System ID (for access control)"),
       layerId: external_exports.string().describe("The Layer ID")
     },
-    async ({ projectId, layerId }) => {
+    async ({ systemId, layerId }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         return { content: [{ type: "text", text: `Access denied: ${message}` }], isError: true };
@@ -25381,8 +25381,8 @@ function registerLayerTools(server, ctx, client) {
       if (!layer) {
         return { content: [{ type: "text", text: `Layer not found: "${layerId}"` }], isError: true };
       }
-      if (layer.projectId !== projectId) {
-        return { content: [{ type: "text", text: `Layer "${layerId}" does not belong to System "${projectId}".` }], isError: true };
+      if (layer.systemId !== systemId) {
+        return { content: [{ type: "text", text: `Layer "${layerId}" does not belong to System "${systemId}".` }], isError: true };
       }
       const text = formatLayerDetail(layer);
       return { content: [{ type: "text", text }] };
@@ -25392,16 +25392,16 @@ function registerLayerTools(server, ctx, client) {
     "create_layer",
     "Declare a new architectural Layer on a System (e.g. frontend, backend, data). Layers are an evaluation lens for plan/build quality checks. layerKey must be a lowercase slug and unique per System.",
     {
-      projectId: external_exports.string().describe("The System ID"),
+      systemId: external_exports.string().describe("The System ID"),
       layerKey: external_exports.string().regex(/^[a-z]([a-z0-9-]*[a-z0-9])?$/, "layerKey must be a lowercase slug (letters, digits, hyphens; start with a letter, no trailing hyphen)").describe('Stable lowercase slug for the Layer role, e.g. "frontend" or "agent-workers"'),
       name: external_exports.string().describe('Display name, e.g. "Frontend"'),
       description: external_exports.string().optional().describe("Optional description of the Layer"),
       parentLayerId: external_exports.string().optional().describe("Optional parent Layer to nest under (must be a Layer on the same System)"),
       repoPatterns: external_exports.array(external_exports.string()).optional().describe("Optional repo path patterns owned by this Layer")
     },
-    async ({ projectId, layerKey, name, description, parentLayerId, repoPatterns }) => {
+    async ({ systemId, layerKey, name, description, parentLayerId, repoPatterns }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         return { content: [{ type: "text", text: `Access denied: ${message}` }], isError: true };
@@ -25409,7 +25409,7 @@ function registerLayerTools(server, ctx, client) {
       let layer;
       try {
         layer = await client.createSystemLayer({
-          projectId,
+          systemId,
           layerKey,
           name,
           ...description !== void 0 && { description },
@@ -25421,7 +25421,7 @@ function registerLayerTools(server, ctx, client) {
         return { content: [{ type: "text", text: `Failed to create Layer: ${message}` }], isError: true };
       }
       if (!layer) {
-        return { content: [{ type: "text", text: `System "${projectId}" not found or not writable.` }], isError: true };
+        return { content: [{ type: "text", text: `System "${systemId}" not found or not writable.` }], isError: true };
       }
       return { content: [{ type: "text", text: `Created Layer.
 
@@ -25432,15 +25432,15 @@ ${formatLayerDetail(layer)}` }] };
     "update_layer",
     "Update a Layer's editable fields (name, description, repo mapping). Omitted fields are left unchanged. Archiving/reviving a Layer goes through transition_layer, not this tool. Requires write access to the System.",
     {
-      projectId: external_exports.string().describe("The System ID the Layer belongs to (for access control)"),
+      systemId: external_exports.string().describe("The System ID the Layer belongs to (for access control)"),
       layerId: external_exports.string().describe("The Layer ID to update"),
       name: external_exports.string().optional().describe("New display name"),
       description: external_exports.string().optional().describe("New description"),
       repoPatterns: external_exports.array(external_exports.string()).optional().describe("Replacement repo mapping (replaces the existing list)")
     },
-    async ({ projectId, layerId, name, description, repoPatterns }) => {
+    async ({ systemId, layerId, name, description, repoPatterns }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         return { content: [{ type: "text", text: `Access denied: ${message}` }], isError: true };
@@ -25453,8 +25453,8 @@ ${formatLayerDetail(layer)}` }] };
         return { content: [{ type: "text", text: `Failed to load Layer: ${message}` }], isError: true };
       }
       if (!existing) return { content: [{ type: "text", text: `Layer not found: "${layerId}"` }], isError: true };
-      if (existing.projectId !== projectId) {
-        return { content: [{ type: "text", text: `Layer "${layerId}" does not belong to System "${projectId}".` }], isError: true };
+      if (existing.systemId !== systemId) {
+        return { content: [{ type: "text", text: `Layer "${layerId}" does not belong to System "${systemId}".` }], isError: true };
       }
       let layer;
       try {
@@ -25477,14 +25477,14 @@ ${formatLayerDetail(layer)}` }] };
     "transition_layer",
     "Archive or revive a Layer. Archiving requires a reason (audit trail); reviving sets it back to active. Requires write access to the System.",
     {
-      projectId: external_exports.string().describe("The System ID the Layer belongs to (for access control)"),
+      systemId: external_exports.string().describe("The System ID the Layer belongs to (for access control)"),
       layerId: external_exports.string().describe("The Layer ID to transition"),
       status: external_exports.enum(["active", "archived"]).describe('Target status: "archived" to retire, "active" to revive'),
       reason: external_exports.string().optional().describe('Why the Layer is being archived (required when status is "archived")')
     },
-    async ({ projectId, layerId, status, reason }) => {
+    async ({ systemId, layerId, status, reason }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         return { content: [{ type: "text", text: `Access denied: ${message}` }], isError: true };
@@ -25497,8 +25497,8 @@ ${formatLayerDetail(layer)}` }] };
         return { content: [{ type: "text", text: `Failed to load Layer: ${message}` }], isError: true };
       }
       if (!existing) return { content: [{ type: "text", text: `Layer not found: "${layerId}"` }], isError: true };
-      if (existing.projectId !== projectId) {
-        return { content: [{ type: "text", text: `Layer "${layerId}" does not belong to System "${projectId}".` }], isError: true };
+      if (existing.systemId !== systemId) {
+        return { content: [{ type: "text", text: `Layer "${layerId}" does not belong to System "${systemId}".` }], isError: true };
       }
       let layer;
       try {
@@ -25823,13 +25823,13 @@ function registerNextActionsTools(server, ctx, client) {
     "get_next_actions",
     "Get prioritized list of recommended next actions for a project. Analyzes Beats, Revisions, and Notes to surface the highest-priority work: P0 (urgent bugs) \u2192 P1 (deploy) \u2192 P2 (build) \u2192 P3 (plan) \u2192 P4 (compose) \u2192 P5 (maintenance).",
     {
-      projectId: external_exports.string().describe("The project ID"),
+      systemId: external_exports.string().describe("The project ID"),
       limit: external_exports.coerce.number().optional().default(10).describe("Max actions to return")
     },
-    async ({ projectId, limit }) => {
+    async ({ systemId, limit }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
-        const actions = await client.getNextActions(projectId, { limit });
+        await assertProjectInOrg(client, systemId, ctx.orgId);
+        const actions = await client.getNextActions(systemId, { limit });
         return { content: [{ type: "text", text: formatNextActions(actions) }] };
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
@@ -25841,12 +25841,12 @@ function registerNextActionsTools(server, ctx, client) {
     "list_triage_actions",
     "List active triage actions from the ledger (open + acted). This is the stateful view of what needs attention \u2014 includes status tracking, task progress, and escalation state. Use this instead of get_next_actions when triage has been run.",
     {
-      projectId: external_exports.string().describe("The project ID")
+      systemId: external_exports.string().describe("The project ID")
     },
-    async ({ projectId }) => {
+    async ({ systemId }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
-        const actions = await client.listTriageActions(projectId);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
+        const actions = await client.listTriageActions(systemId);
         return { content: [{ type: "text", text: formatTriageActions(actions) }] };
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
@@ -25858,13 +25858,13 @@ function registerNextActionsTools(server, ctx, client) {
     "dismiss_triage_action",
     'Dismiss a triage action (human decides "not now"). The action will not be re-escalated until the underlying state changes.',
     {
-      projectId: external_exports.string().describe("The project ID"),
+      systemId: external_exports.string().describe("The project ID"),
       actionKey: external_exports.string().describe("The action key to dismiss (from list_triage_actions)")
     },
-    async ({ projectId, actionKey }) => {
+    async ({ systemId, actionKey }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
-        await client.dismissTriageAction(projectId, actionKey, ctx.user?.userId ?? "mcp");
+        await assertProjectInOrg(client, systemId, ctx.orgId);
+        await client.dismissTriageAction(systemId, actionKey, ctx.user?.userId ?? "mcp");
         return { content: [{ type: "text", text: `Action ${actionKey} dismissed.` }] };
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
@@ -27255,7 +27255,7 @@ function registerNoteTools(server, ctx, client) {
     "list_notes",
     "List Notes for a project. Without beatId: returns all notes (project-level + beat-level). With beatId: returns only notes scoped to that beat. Filterable by type, status, revisionId, beatVersionId, and significance. Use offset/limit to paginate beat-scoped results; use cursor for project-wide results.",
     {
-      projectId: external_exports.string().describe("The project ID"),
+      systemId: external_exports.string().describe("The project ID"),
       beatId: external_exports.string().optional().describe("Scope to a specific beat (omit for all project notes)"),
       noteType: external_exports.union([external_exports.enum(NOTE_TYPE_VALUES), external_exports.array(external_exports.enum(NOTE_TYPE_VALUES)).min(1)]).optional().describe('Filter by note type \u2014 single value or array for multi-select (e.g. ["constraint", "assumption"])'),
       status: external_exports.enum(NOTE_STATUS_VALUES).optional().describe("Filter by status"),
@@ -27268,7 +27268,7 @@ function registerNoteTools(server, ctx, client) {
       cursor: external_exports.string().optional().describe("Opaque pagination cursor from a previous response \u2014 use for project-wide note pagination (no beatId)"),
       orderBy: external_exports.enum(["newest", "oldest"]).optional().describe("Sort order \u2014 newest or oldest first. Applies to beat-scoped queries (beatId provided); omit to use DynamoDB scan order.")
     },
-    async ({ projectId, beatId, noteType, status, revisionId, beatVersionId, sourceDocumentNoteId, significance, offset = 0, limit = 100, cursor, orderBy }) => {
+    async ({ systemId, beatId, noteType, status, revisionId, beatVersionId, sourceDocumentNoteId, significance, offset = 0, limit = 100, cursor, orderBy }) => {
       if (Array.isArray(noteType) && noteType.length === 0) {
         return { content: [{ type: "text", text: "noteType must not be an empty array \u2014 omit it to return all types." }], isError: true };
       }
@@ -27280,7 +27280,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 assertProjectInOrg(client, projectId, ctx.orgId);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         return { content: [{ type: "text", text: `Access denied: ${message}` }], isError: true };
@@ -27320,7 +27320,7 @@ function registerNoteTools(server, ctx, client) {
         const SOURCE_DOC_FETCH_LIMIT = 5e3;
         let allNotesResult;
         try {
-          allNotesResult = await client.listAllSystemNotes(projectId, filters, SOURCE_DOC_FETCH_LIMIT);
+          allNotesResult = await client.listAllSystemNotes(systemId, filters, SOURCE_DOC_FETCH_LIMIT);
         } catch (err) {
           const message = err instanceof Error ? err.message : String(err);
           return { content: [{ type: "text", text: `Failed to list project notes: ${message}` }], isError: true };
@@ -27341,7 +27341,7 @@ function registerNoteTools(server, ctx, client) {
       } else {
         let projectNotesResult;
         try {
-          projectNotesResult = await client.listAllSystemNotes(projectId, filters, limit, cursor);
+          projectNotesResult = await client.listAllSystemNotes(systemId, filters, limit, cursor);
         } catch (err) {
           const message = err instanceof Error ? err.message : String(err);
           return { content: [{ type: "text", text: `Failed to list project notes: ${message}` }], isError: true };
@@ -27423,12 +27423,12 @@ function registerNoteTools(server, ctx, client) {
     "list_documents",
     "List uploaded documents for a project with processing status, filename, child note count, and AI summary. Use get_note with a document note ID for full details.",
     {
-      projectId: external_exports.string().describe("The project ID")
+      systemId: external_exports.string().describe("The project ID")
     },
-    async ({ projectId }) => {
-      await assertProjectInOrg(client, projectId, ctx.orgId);
+    async ({ systemId }) => {
+      await assertProjectInOrg(client, systemId, ctx.orgId);
       const DOCUMENT_FETCH_LIMIT = 5e3;
-      const { notes: docs, hasMore: truncated } = await client.listAllSystemNotes(projectId, { noteType: "document" }, DOCUMENT_FETCH_LIMIT);
+      const { notes: docs, hasMore: truncated } = await client.listAllSystemNotes(systemId, { noteType: "document" }, DOCUMENT_FETCH_LIMIT);
       const visibleDocs = docs.filter((d) => d.status !== DISMISSED_NOTE_STATUS);
       const truncationNotice = truncated && visibleDocs.length > 0 ? "\n\n> \u26A0\uFE0F This project has more than 5000 documents. Some documents may not be shown.\n" : "";
       const text = formatDocumentList(visibleDocs) + truncationNotice;
@@ -27439,16 +27439,16 @@ function registerNoteTools(server, ctx, client) {
     "get_note",
     "Get full details of a single Note by ID",
     {
-      projectId: external_exports.string().optional().describe("The project ID (for access control). Provide projectId or orgId, not both."),
-      orgId: external_exports.string().optional().describe("The org ID (for org-level notes). Provide orgId or projectId, not both."),
+      systemId: external_exports.string().optional().describe("The project ID (for access control). Provide systemId or orgId, not both."),
+      orgId: external_exports.string().optional().describe("The org ID (for org-level notes). Provide orgId or systemId, not both."),
       noteId: external_exports.string().describe("The note ID")
     },
-    async ({ projectId, orgId, noteId }) => {
-      if (projectId && orgId) {
-        return { content: [{ type: "text", text: "Provide projectId or orgId, not both." }], isError: true };
+    async ({ systemId, orgId, noteId }) => {
+      if (systemId && orgId) {
+        return { content: [{ type: "text", text: "Provide systemId or orgId, not both." }], isError: true };
       }
-      if (!projectId && !orgId) {
-        return { content: [{ type: "text", text: "Provide projectId or orgId (for access control)." }], isError: true };
+      if (!systemId && !orgId) {
+        return { content: [{ type: "text", text: "Provide systemId or orgId (for access control)." }], isError: true };
       }
       try {
         if (orgId) {
@@ -27461,7 +27461,7 @@ function registerNoteTools(server, ctx, client) {
           }
           return { content: [{ type: "text", text: formatNoteDetail(note2) }] };
         }
-        await assertProjectInOrg(client, projectId, ctx.orgId);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
         const note = await client.getNote(noteId);
         if (!note) {
           return { content: [{ type: "text", text: `Note not found: "${noteId}"` }], isError: true };
@@ -27476,15 +27476,15 @@ function registerNoteTools(server, ctx, client) {
   );
   server.tool(
     "create_note",
-    "Create a new Note. Provide exactly one of projectId, teamspaceId, movementId, or none (org-level): projectId scopes the note to a project (optionally with beatId), teamspaceId scopes it to a teamspace (no cascade to child projects), 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 projects.",
+    "Create a new Note. Provide exactly one of systemId, teamspaceId, movementId, or none (org-level): systemId scopes the note to a project (optionally with beatId), teamspaceId scopes it to a teamspace (no cascade to child projects), 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 projects.",
     {
-      projectId: external_exports.string().optional().describe("The project ID (omit for teamspace-, movement-, or org-level note)"),
+      systemId: external_exports.string().optional().describe("The project ID (omit for teamspace-, movement-, or org-level note)"),
       teamspaceId: external_exports.string().optional().describe("The teamspace ID (omit for project-, movement-, or org-level note)"),
       movementId: external_exports.string().min(1).optional().describe("The Movement ID (omit for project-, teamspace-, or org-level note)"),
       noteType: external_exports.enum(NOTE_TYPE_VALUES).describe("The type of note"),
       content: external_exports.string().describe("The note content"),
-      beatId: external_exports.string().optional().describe("Beat ID if this note is beat-scoped (requires projectId)"),
-      revisionId: external_exports.string().optional().describe("Revision ID if this note is revision-scoped (requires projectId)"),
+      beatId: external_exports.string().optional().describe("Beat ID if this note is beat-scoped (requires systemId)"),
+      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)"),
@@ -27492,20 +27492,20 @@ function registerNoteTools(server, ctx, client) {
       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 ({ projectId, teamspaceId, movementId, noteType, content, beatId, revisionId, beatVersionId, rationale, confidence, affectsBeats, dependsOnNotes, significance }) => {
+    async ({ systemId, teamspaceId, movementId, noteType, content, beatId, revisionId, beatVersionId, rationale, confidence, affectsBeats, dependsOnNotes, significance }) => {
       try {
-        if ([projectId, teamspaceId, movementId].filter(Boolean).length > 1) {
-          return { content: [{ type: "text", text: "Specify at most one of projectId, teamspaceId, or movementId." }], isError: true };
+        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 (projectId) {
-          await assertProjectInOrg(client, projectId, ctx.orgId);
-          const projectCode = projectId.substring(0, 4).toUpperCase();
-          const noteId = await client.getNextNoteId(projectCode, projectId);
+        if (systemId) {
+          await assertProjectInOrg(client, systemId, ctx.orgId);
+          const projectCode = systemId.substring(0, 4).toUpperCase();
+          const noteId = await client.getNextNoteId(projectCode, systemId);
           note = await client.createNote({
             noteId,
-            projectId,
+            projectId: systemId,
             beatId,
             revisionId,
             beatVersionId,
@@ -27577,8 +27577,8 @@ ${text}` }] };
     "update_note",
     "Update a Note (status, content, response, etc.). humanAssignee and agentAssignee are independent fields \u2014 both can be set simultaneously (a note can have a human owner and an agent collaborator). Set either to null to clear it.",
     {
-      projectId: external_exports.string().optional().describe("The project ID (for access control). Provide projectId or orgId, not both."),
-      orgId: external_exports.string().optional().describe("The org ID (for org-level notes). Provide orgId or projectId, not both."),
+      systemId: external_exports.string().optional().describe("The project ID (for access control). Provide systemId or orgId, not both."),
+      orgId: external_exports.string().optional().describe("The org ID (for org-level notes). Provide orgId or systemId, not both."),
       noteId: external_exports.string().describe("The note ID to update"),
       noteType: external_exports.enum(NOTE_TYPE_VALUES).optional().describe("Reclassify the note type (e.g. assumption \u2192 guidance)"),
       status: external_exports.enum(NOTE_STATUS_VALUES).optional().describe("New status"),
@@ -27592,13 +27592,13 @@ ${text}` }] };
       agentAssignee: agentAssigneeSchema.nullable().optional().describe("Assign or reassign this note to an agent (null to clear)"),
       significance: external_exports.enum(DECISION_SIGNIFICANCE_VALUES2).optional().describe("Significance tier for decision Notes (strategic | structural | implementation). Only meaningful on noteType=decision.")
     },
-    async ({ projectId, orgId, noteId, noteType, status, content, rationale, response, beatId, revisionId, dependsOnNotes, humanAssignee, agentAssignee, significance }) => {
+    async ({ systemId, orgId, noteId, noteType, status, content, rationale, response, beatId, revisionId, dependsOnNotes, humanAssignee, agentAssignee, significance }) => {
       try {
-        if (projectId && orgId) {
-          return { content: [{ type: "text", text: "Provide projectId or orgId, not both." }], isError: true };
+        if (systemId && orgId) {
+          return { content: [{ type: "text", text: "Provide systemId or orgId, not both." }], isError: true };
         }
-        if (!projectId && !orgId) {
-          return { content: [{ type: "text", text: "Provide projectId or orgId (for access control)." }], isError: true };
+        if (!systemId && !orgId) {
+          return { content: [{ type: "text", text: "Provide systemId or orgId (for access control)." }], isError: true };
         }
         if (orgId) {
           if (orgId !== ctx.orgId) {
@@ -27628,7 +27628,7 @@ ${text}` }] };
 
 ${formatNoteDetail(updated2)}` }] };
         }
-        await assertProjectInOrg(client, projectId, ctx.orgId);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
         const updated = await client.updateNote(noteId, {
           ...noteType !== void 0 && { noteType },
           status,
@@ -27659,7 +27659,7 @@ ${text}` }] };
     "bulk_update_notes",
     "Update multiple Notes in one call, applying the same fields to all. More efficient than calling update_note N times. Returns updated notes and any per-note failures.",
     {
-      projectId: external_exports.string().describe("The project ID (for access control)"),
+      systemId: external_exports.string().describe("The project ID (for access control)"),
       noteIds: external_exports.array(external_exports.string()).min(1).max(100).describe("Note IDs to update (max 100 per call)"),
       noteType: external_exports.enum(NOTE_TYPE_VALUES).optional().describe("Reclassify all notes to this type"),
       status: external_exports.enum(NOTE_STATUS_VALUES).optional().describe("New status for all notes"),
@@ -27668,9 +27668,9 @@ ${text}` }] };
       humanAssignee: humanAssigneeSchema.nullable().optional().describe("Assign or clear human assignee on all notes (null to clear)"),
       agentAssignee: agentAssigneeSchema.nullable().optional().describe("Assign or clear agent assignee on all notes (null to clear)")
     },
-    async ({ projectId, noteIds, noteType, status, content, response, humanAssignee, agentAssignee }) => {
+    async ({ systemId, noteIds, noteType, status, content, response, humanAssignee, agentAssignee }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
         const result = await client.bulkUpdateNotes(noteIds, {
           ...noteType !== void 0 && { noteType },
           status,
@@ -27701,15 +27701,15 @@ ${text}` }] };
     "reassign_note",
     "Reassign a misattributed note to a different beat (with audit trail)",
     {
-      projectId: external_exports.string().describe("The project ID (for access control)"),
+      systemId: external_exports.string().describe("The project ID (for access control)"),
       noteId: external_exports.string().describe("The note ID to reassign"),
       targetBeatId: external_exports.string().describe("The beat ID to move the note to"),
       targetRevisionId: external_exports.string().optional().describe("Optional revision ID to scope the note to"),
       reason: external_exports.string().describe("Why this note is being reassigned")
     },
-    async ({ projectId, noteId, targetBeatId, targetRevisionId, reason }) => {
+    async ({ systemId, noteId, targetBeatId, targetRevisionId, reason }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
         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 };
@@ -27725,15 +27725,15 @@ ${text}` }] };
     "remove_note",
     "Soft-remove a misattributed note by dismissing it (with audit trail)",
     {
-      projectId: external_exports.string().min(1).describe("The project ID (for access control)"),
+      systemId: external_exports.string().min(1).describe("The project ID (for access control)"),
       noteId: external_exports.string().min(1).describe("The note ID to remove"),
       reason: external_exports.string().min(1).max(500).optional().describe('Why this note is being removed (defaults to "Removed via remove_note")')
     },
-    async ({ projectId, noteId, reason }) => {
+    async ({ systemId, noteId, reason }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
         const note = await client.getNote(noteId);
-        if (!note || note.projectId !== projectId) {
+        if (!note || (note.systemId ?? note.projectId) !== systemId) {
           return { content: [{ type: "text", text: `Note not found: "${noteId}"` }], isError: true };
         }
         const removeReason = reason ?? "Removed via remove_note";
@@ -27752,15 +27752,15 @@ ${text}` }] };
     "dismiss_document",
     "Soft-remove an uploaded document by dismissing it \u2014 it will no longer appear in list_documents output. Only works on document-type notes; use remove_note for non-document notes.",
     {
-      projectId: external_exports.string().min(1).describe("The project ID (for access control)"),
+      systemId: external_exports.string().min(1).describe("The project ID (for access control)"),
       noteId: external_exports.string().min(1).describe("The document note ID to dismiss"),
       reason: external_exports.string().min(1).max(500).optional().describe('Why this document is being dismissed (defaults to "Dismissed via dismiss_document")')
     },
-    async ({ projectId, noteId, reason }) => {
+    async ({ systemId, noteId, reason }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
         const note = await client.getNote(noteId);
-        if (!note || note.projectId !== projectId) {
+        if (!note || (note.systemId ?? note.projectId) !== systemId) {
           return { content: [{ type: "text", text: `Document not found: "${noteId}"` }], isError: true };
         }
         if (note.noteType !== "document") {
@@ -27785,11 +27785,11 @@ ${text}` }] };
     "list_key_assumptions",
     "Get key assumptions sorted by criticality (highest risk first)",
     {
-      projectId: external_exports.string().describe("The project ID")
+      systemId: external_exports.string().describe("The project ID")
     },
-    async ({ projectId }) => {
-      await assertProjectInOrg(client, projectId, ctx.orgId);
-      const assumptions = await client.getKeyAssumptions(projectId);
+    async ({ systemId }) => {
+      await assertProjectInOrg(client, systemId, ctx.orgId);
+      const assumptions = await client.getKeyAssumptions(systemId);
       if (assumptions.length === 0) {
         return { content: [{ type: "text", text: "No unvalidated assumptions found." }] };
       }
@@ -28051,12 +28051,12 @@ ${formatTree(tree.root)}` }] };
       heading: external_exports.string().min(1).max(200).describe('Section label, e.g. "Decision Log"'),
       parentNoteId: external_exports.string().optional().describe("Parent page's Note ID; defaults to the notebook root"),
       noteType: external_exports.enum(["context", "constraint", "guidance", "decision", "document"]).optional().describe("Note type to collect (default: decision)"),
-      projectId: external_exports.string().optional().describe("Project scope; if omitted, the Notebook's first bound project scope is used"),
+      systemId: external_exports.string().optional().describe("Project scope; if omitted, the Notebook's first bound project scope is used"),
       limit: external_exports.number().int().min(1).max(500).optional().describe("Max members to show (default: 25)"),
       order: external_exports.enum(["newest", "oldest"]).optional().describe("Sort order (default: newest)"),
       significance: external_exports.enum(["strategic", "structural", "implementation"]).optional().describe("Only for decision notes \u2014 filter to a significance tier (e.g. strategic). Omit to include all.")
     },
-    async ({ notebookId, heading, parentNoteId, noteType, projectId, limit, order, significance }) => {
+    async ({ notebookId, heading, parentNoteId, noteType, systemId, limit, order, significance }) => {
       let notebook;
       try {
         notebook = await fetchNotebookInOrg(client, notebookId, ctx.orgId);
@@ -28069,7 +28069,7 @@ ${formatTree(tree.root)}` }] };
           isError: true
         };
       }
-      let scopeProjectId = projectId;
+      let scopeProjectId = systemId;
       if (!scopeProjectId) {
         try {
           const bindings = await client.getNotebookScopeBindings(notebookId);
@@ -28078,7 +28078,7 @@ ${formatTree(tree.root)}` }] };
         }
       }
       if (!scopeProjectId) {
-        return { content: [{ type: "text", text: "No project scope: pass projectId or bind the notebook to a project first." }], isError: true };
+        return { content: [{ type: "text", text: "No project scope: pass systemId or bind the notebook to a project first." }], isError: true };
       }
       let tree;
       try {
@@ -28139,12 +28139,12 @@ ${formatTree(tree.root)}` }] };
       parentNoteId: external_exports.string().optional().describe("The page Note ID the section sits under; defaults to the notebook root"),
       heading: external_exports.string().min(1).max(200).optional().describe("New section label"),
       noteType: external_exports.enum(["context", "constraint", "guidance", "decision", "document"]).optional().describe("New note type to collect"),
-      projectId: external_exports.string().optional().describe("New project scope"),
+      systemId: external_exports.string().optional().describe("New project scope"),
       limit: external_exports.number().int().min(1).max(500).optional().describe("New max members to show"),
       order: external_exports.enum(["newest", "oldest"]).optional().describe("New sort order"),
       significance: external_exports.enum(["strategic", "structural", "implementation"]).optional().describe("New significance-tier filter (decision notes only)")
     },
-    async ({ notebookId, elementId, parentNoteId, heading, noteType, projectId, limit, order, significance }) => {
+    async ({ notebookId, elementId, parentNoteId, heading, noteType, systemId, limit, order, significance }) => {
       let notebook;
       try {
         notebook = await fetchNotebookInOrg(client, notebookId, ctx.orgId);
@@ -28183,7 +28183,7 @@ ${formatTree(tree.root)}` }] };
       const base = existing.query;
       const mergedQuery = {
         source: "notes",
-        scope: projectId !== void 0 ? `project:${projectId}` : base.scope,
+        scope: systemId !== void 0 ? `project:${systemId}` : base.scope,
         noteType: noteType ?? base.noteType,
         limit: limit ?? base.limit,
         sortBy: order !== void 0 ? order === "oldest" ? "createdAt_asc" : "createdAt_desc" : base.sortBy,
@@ -28485,14 +28485,14 @@ function registerOnboardingTools(server, ctx, client) {
       "The PM reviews and confirms \u2014 use create_beat for each approved Beat, create_note for any Note conversions."
     ].join(" "),
     {
-      projectId: external_exports.string().describe("The newly created project ID"),
+      systemId: external_exports.string().describe("The newly created project ID"),
       projectTitle: external_exports.string().describe("The project title"),
       projectDescription: external_exports.string().optional().describe("Discovery context: pain points, goals, and constraints summary to inform the Beat structure"),
       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 ({ projectId, projectTitle, projectDescription, analysisJson }) => {
-      await assertProjectInOrg(client, projectId, ctx.orgId);
-      const result = await client.draftOnboardingBeats(projectId, { projectTitle, projectDescription, analysisJson });
+    async ({ systemId, projectTitle, projectDescription, analysisJson }) => {
+      await assertProjectInOrg(client, systemId, ctx.orgId);
+      const result = await client.draftOnboardingBeats(systemId, { projectTitle, projectDescription, analysisJson });
       if (!result.suggestions || result.suggestions.length === 0) {
         return {
           content: [{ type: "text", text: "Failed to generate Beat suggestions. Try providing more project context." }]
@@ -28558,14 +28558,14 @@ Error: ${msg}`);
       for (const p of projects) {
         try {
           const project = await client.createSystem({
-            projectId: (0, import_node_crypto.randomUUID)(),
+            systemId: (0, import_node_crypto.randomUUID)(),
             orgId: ctx.orgId,
             teamspaceId: teamspace.teamspaceId,
             ownerUserId: ctx.user?.userId ?? "system",
             title: p.title,
             description: p.description
           });
-          createdProjects.push({ projectId: project.projectId, title: project.title });
+          createdProjects.push({ systemId: project.systemId, title: project.title });
         } catch (err) {
           const msg = err instanceof Error ? err.message : String(err);
           lines.push(`
@@ -28578,7 +28578,7 @@ Error: ${msg}`);
       if (createdProjects.length > 0) {
         lines.push(`
 Projects (${createdProjects.length}):`);
-        for (const p of createdProjects) lines.push(`  [${p.projectId}] ${p.title}`);
+        for (const p of createdProjects) lines.push(`  [${p.systemId}] ${p.title}`);
       }
       const createdNotes = [];
       const teamspaceSlug = teamspace.slug ?? teamspaceName.toLowerCase().replace(/\s+/g, "-");
@@ -28604,7 +28604,7 @@ Projects (${createdProjects.length}):`);
             const n = await client.createNote({
               noteId: `N-TEMP-${(0, import_node_crypto.randomUUID)()}`,
               // overridden server-side
-              projectId: project.projectId,
+              projectId: project.systemId,
               noteType: note.noteType,
               content: note.content,
               rationale: note.rationale,
@@ -28802,7 +28802,7 @@ function registerOrganizationTools(server, ctx, client) {
       }
       const text = `System transferred.
 
-**System ID:** ${transferred.projectId}
+**System ID:** ${transferred.systemId}
 **Title:** ${transferred.title}
 **New Org:** ${transferred.orgId}`;
       return { content: [{ type: "text", text }] };
@@ -28926,7 +28926,7 @@ ${d.rationale}${d.suggestions?.length ? `
 function registerPlanQualityTools(server, ctx, client) {
   const schema = {
     beatVersionId: external_exports.string().describe("The Beat Version ID (e.g., bv-abc123). beat_version_quality targets Beat Versions only."),
-    projectId: external_exports.string().describe("The project ID"),
+    systemId: external_exports.string().describe("The project ID"),
     // The completeness dimension probes the codebase, so this tool accepts the
     // same repo overrides as run_check — without them the probe could only ever
     // read the default branch from this surface.
@@ -28934,7 +28934,7 @@ function registerPlanQualityTools(server, ctx, client) {
     localPath: external_exports.string().optional().describe("Absolute path to an already-cloned local copy of the repo \u2014 the completeness probe reads it instead of cloning"),
     wait: external_exports.boolean().optional().describe("If true, block until the check completes and return the scorecard inline. Default: false (returns taskId immediately).")
   };
-  const handler = async ({ beatVersionId, projectId, branch, localPath, wait }) => {
+  const handler = async ({ beatVersionId, systemId, branch, localPath, wait }) => {
     try {
       const targetError = beatVersionQualityTargetError(beatVersionId ?? "");
       if (targetError) {
@@ -28943,9 +28943,9 @@ function registerPlanQualityTools(server, ctx, client) {
           isError: true
         };
       }
-      await assertProjectInOrg(client, projectId, ctx.orgId);
+      await assertProjectInOrg(client, systemId, ctx.orgId);
       const opts = branch || localPath ? { branch, localPath } : void 0;
-      const task = await client.runCheck(projectId, "beat_version_quality", beatVersionId, opts);
+      const task = await client.runCheck(systemId, "beat_version_quality", beatVersionId, opts);
       if (!wait) {
         return {
           content: [{
@@ -29085,22 +29085,22 @@ function registerPortfolioCoherenceTools(server, ctx, client) {
     "check_portfolio_coherence",
     "Run a portfolio coherence check on a project. Clusters Beats by semantic similarity to surface fragmentation (merge candidates) and checks what fraction of Beats name an outcome their authoriser would recognise. By default returns a taskId immediately \u2014 set wait=true to block and receive the full report inline.",
     {
-      projectId: external_exports.string().min(1).describe("The project ID"),
+      systemId: external_exports.string().min(1).describe("The project ID"),
       wait: external_exports.boolean().optional().describe("Block until the check completes and return the report inline. Default: false.")
     },
-    async ({ projectId, wait }) => {
+    async ({ systemId, wait }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
-        const { taskId } = await client.runCheck(projectId, "portfolio_coherence", projectId);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
+        const { taskId } = await client.runCheck(systemId, "portfolio_coherence", systemId);
         if (!wait) {
           return {
             content: [{
               type: "text",
               text: [
-                `Portfolio coherence check enqueued for ${projectId}.`,
+                `Portfolio coherence check enqueued for ${systemId}.`,
                 `Task ID: ${taskId}`,
                 "",
-                `Use get_job_status with jobId="${taskId}" to poll, or list_checks with projectId="${projectId}" and checkType="portfolio_coherence" to view results.`
+                `Use get_job_status with jobId="${taskId}" to poll, or list_checks with systemId="${systemId}" and checkType="portfolio_coherence" to view results.`
               ].join("\n")
             }]
           };
@@ -29117,17 +29117,17 @@ function registerPortfolioCoherenceTools(server, ctx, client) {
     "consolidate_beats",
     "Consolidate a fragmented Beat cluster \u2014 identified by check_portfolio_coherence \u2014 into a single VP-level capability. By default (confirm omitted or false) returns a dry-run preview: surviving Beat, Beats to archive, Notes to reassign, and any in-flight Beat Versions. Set confirm=true to execute the merge.",
     {
-      projectId: external_exports.string().min(1).describe("The project ID \u2014 all beatIds must belong to this project"),
+      systemId: external_exports.string().min(1).describe("The project ID \u2014 all beatIds must belong to this project"),
       beatIds: external_exports.array(external_exports.string().min(1)).min(2).max(50).describe("All Beat IDs in the cluster (including the one that will survive)"),
       primaryBeatId: external_exports.string().min(1).optional().describe("Beat ID that survives \u2014 defaults to beatIds[0] if omitted"),
       rationale: external_exports.string().max(2e3).optional().describe("Why these Beats are being merged \u2014 auto-generated if omitted"),
       confirm: external_exports.boolean().optional().describe("false/omitted = preview; true = execute the merge")
     },
-    async ({ projectId, beatIds, primaryBeatId, rationale, confirm }) => {
+    async ({ systemId, beatIds, primaryBeatId, rationale, confirm }) => {
       const archivedBeatIds = [];
       let totalNotesReassigned = 0;
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
         const uniqueBeatIds = [...new Set(beatIds)];
         const resolvedPrimaryId = primaryBeatId ?? uniqueBeatIds[0];
         if (!uniqueBeatIds.includes(resolvedPrimaryId)) {
@@ -29143,19 +29143,19 @@ function registerPortfolioCoherenceTools(server, ctx, client) {
             isError: true
           };
         }
-        const allProjectBeats = await client.listSystemBeats(projectId);
+        const allProjectBeats = await client.listSystemBeats(systemId);
         const beatMap = new Map(allProjectBeats.map((b) => [b.beatId, b]));
         const primaryBeat = beatMap.get(resolvedPrimaryId);
         if (!primaryBeat) {
-          return { content: [{ type: "text", text: `Primary Beat "${resolvedPrimaryId}" not found in project "${projectId}".` }], isError: true };
+          return { content: [{ type: "text", text: `Primary Beat "${resolvedPrimaryId}" not found in project "${systemId}".` }], isError: true };
         }
         const missingIds = duplicateBeatIds.filter((id) => !beatMap.has(id));
         if (missingIds.length > 0) {
-          return { content: [{ type: "text", text: `Beat(s) not found in project "${projectId}": ${missingIds.join(", ")}` }], isError: true };
+          return { content: [{ type: "text", text: `Beat(s) not found in project "${systemId}": ${missingIds.join(", ")}` }], isError: true };
         }
         const dupBvResults = await Promise.allSettled(
           duplicateBeatIds.map(
-            (id) => client.listBeatVersions(projectId, { beatId: id, includeTerminal: false })
+            (id) => client.listBeatVersions(systemId, { beatId: id, includeTerminal: false })
           )
         );
         const bvRejected = dupBvResults.filter((r) => r.status === "rejected");
@@ -29328,11 +29328,11 @@ function registerRevisionLifecycleTools(server, ctx, client) {
           if (!parentBv) {
             return { content: [{ type: "text", text: `Beat Version not found: "${beatVersionId}"` }], isError: true };
           }
-          if (parentBv.beatId !== beatId || (parentBv.systemId ?? parentBv.projectId) !== (beat.systemId ?? beat.projectId)) {
+          if (parentBv.beatId !== beatId || parentBv.systemId !== beat.systemId) {
             return { content: [{ type: "text", text: `Beat Version "${beatVersionId}" belongs to a different Beat.` }], isError: true };
           }
         }
-        const { revision, warnings } = await client.createRevision(beat.systemId ?? beat.projectId, beatId, {
+        const { revision, warnings } = await client.createRevision(beat.systemId, beatId, {
           title,
           description,
           changeSummary,
@@ -29364,7 +29364,7 @@ function registerRevisionLifecycleTools(server, ctx, client) {
         }
         if (parentBv && !parentBv.targetDropId) {
           try {
-            const project = await client.getSystem(parentBv.projectId);
+            const project = await client.getSystem(parentBv.systemId);
             const accountId = project?.accountId;
             if (accountId) {
               const draftDrops = await client.listAccountDrops(accountId, { state: "draft" });
@@ -29420,7 +29420,7 @@ function registerRevisionLifecycleTools(server, ctx, client) {
           if (!bv) {
             return { content: [{ type: "text", text: `Beat Version not found: "${beatVersionId}"` }], isError: true };
           }
-          if (bv.beatId !== revision.beatId || (bv.systemId ?? bv.projectId) !== (revision.systemId ?? revision.projectId)) {
+          if (bv.beatId !== revision.beatId || bv.systemId !== revision.systemId) {
             return { content: [{ type: "text", text: `Beat Version "${beatVersionId}" belongs to a different Beat.` }], isError: true };
           }
         }
@@ -29589,7 +29589,7 @@ 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.projectId);
+            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.");
             } else {
@@ -29852,10 +29852,10 @@ function registerRevisionQualityTools(server, ctx, client) {
     "Run a five-dimension PR-readiness check on a Revision (Scoped, Traceable, Testable, Review-ready, Non-duplicating). Advisory only \u2014 no lifecycle transition or creation path gates on this score. By default returns a jobId immediately (fire-and-forget) \u2014 use get_job_status or list_checks to retrieve results. Set wait=true to block until the check completes and receive the scorecard inline. WARNING: wait=true holds the MCP session open for 30\u201360s \u2014 for bulk operations, omit wait and poll get_job_status separately.",
     {
       revisionId: external_exports.string().describe("The Revision ID (e.g., rev-abc123). revision_quality targets Revisions only."),
-      projectId: external_exports.string().describe("The project ID"),
+      systemId: external_exports.string().describe("The project ID"),
       wait: external_exports.boolean().optional().describe("If true, block until the check completes and return the scorecard inline. Default: false (returns taskId immediately).")
     },
-    async ({ revisionId, projectId, wait }) => {
+    async ({ revisionId, systemId, wait }) => {
       try {
         const targetError = revisionQualityTargetError(revisionId);
         if (targetError) {
@@ -29864,9 +29864,9 @@ function registerRevisionQualityTools(server, ctx, client) {
             isError: true
           };
         }
-        await assertProjectInOrg(client, projectId, ctx.orgId);
-        await assertRevisionInProject(client, revisionId, projectId);
-        const task = await client.runCheck(projectId, "revision_quality", revisionId);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
+        await assertRevisionInProject(client, revisionId, systemId);
+        const task = await client.runCheck(systemId, "revision_quality", revisionId);
         if (!wait) {
           return {
             content: [{
@@ -30330,10 +30330,10 @@ async function resolveSnapshotInput(input) {
 }
 function formatImportSummary(result, targetTeamspaceId) {
   if (!result.counts || result.counts.beats == null) {
-    throw new Error(`Import of system ${result.projectId} completed but returned no counts \u2014 check worker logs for a TransactionCanceledException`);
+    throw new Error(`Import of system ${result.systemId} completed but returned no counts \u2014 check worker logs for a TransactionCanceledException`);
   }
   const lines = [
-    `Imported system: ${result.projectId}`,
+    `Imported system: ${result.systemId}`,
     `  Beats: ${result.counts.beats}`,
     `  Proposals: ${result.counts.proposals}`,
     `  Revisions: ${result.counts.revisions}`,
@@ -30400,8 +30400,8 @@ function assertSnapshotShape(val, sourceHint) {
     throw new Error(`Snapshot${sourceHint} has an invalid or missing 'version' field \u2014 it may not be a valid project snapshot.`);
   }
   const systemOrProject = obj["system"] ?? obj["project"];
-  if (typeof systemOrProject !== "object" || systemOrProject === null || typeof systemOrProject["projectId"] !== "string") {
-    throw new Error(`Snapshot${sourceHint} is missing 'system.projectId' \u2014 it may not be a valid project snapshot.`);
+  if (typeof systemOrProject !== "object" || systemOrProject === null || typeof systemOrProject["systemId"] !== "string") {
+    throw new Error(`Snapshot${sourceHint} is missing 'system.systemId' \u2014 it may not be a valid project snapshot.`);
   }
 }
 
@@ -30414,12 +30414,12 @@ function registerSubscriptionTools(server, ctx, client) {
     {
       entityType: external_exports.enum(ENTITY_TYPES).describe("Type of entity to follow"),
       entityId: external_exports.string().describe("The entity ID (project ID, beat ID, or revision ID)"),
-      projectId: external_exports.string().describe("The project ID (for access control)")
+      systemId: external_exports.string().describe("The project ID (for access control)")
     },
-    async ({ entityType, entityId, projectId }) => {
+    async ({ entityType, entityId, systemId }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
-        await client.subscribe(ctx.user.userId, entityType, entityId, projectId, "manual");
+        await assertProjectInOrg(client, systemId, ctx.orgId);
+        await client.subscribe(ctx.user.userId, entityType, entityId, systemId, "manual");
         return {
           content: [{
             type: "text",
@@ -30653,7 +30653,7 @@ function registerProjectTools(server, ctx, client) {
       const lines = [
         `System updated successfully.`,
         "",
-        `**ID:** ${updated.projectId}`,
+        `**ID:** ${updated.systemId}`,
         `**Title:** ${updated.title}`,
         accountLine(nonEmpty, updated.accountId),
         updated.strategy ? `**Strategy:** (updated)` : "",
@@ -30690,7 +30690,7 @@ function registerProjectTools(server, ctx, client) {
             text: [
               "System archived successfully.",
               "",
-              `**ID:** ${updated.projectId}`,
+              `**ID:** ${updated.systemId}`,
               `**Title:** ${updated.title}`,
               `**Status:** ${updated.status}`
             ].join("\n")
@@ -30725,7 +30725,7 @@ function registerProjectTools(server, ctx, client) {
     const account = normalizeCreateAccountId(accountId);
     try {
       const project = await client.createSystem({
-        projectId: (0, import_crypto5.randomUUID)(),
+        systemId: (0, import_crypto5.randomUUID)(),
         orgId: ctx.orgId,
         ownerUserId: ctx.user.userId,
         title,
@@ -30741,7 +30741,7 @@ function registerProjectTools(server, ctx, client) {
       const text = [
         `System created successfully.`,
         "",
-        `**ID:** ${project.projectId}`,
+        `**ID:** ${project.systemId}`,
         `**Title:** ${project.title}`,
         `**Status:** ${project.status}`,
         project.accountId ? `**Account:** ${project.accountId}` : "",
@@ -30811,7 +30811,7 @@ function registerTeamspaceTools(server, ctx, client) {
         ];
         if (tsProjects.length > 0) {
           lines.push("", `Projects (${tsProjects.length}):`);
-          for (const p of tsProjects) lines.push(`  [${p.projectId}] ${p.title} \u2014 ${p.status ?? "unknown"}`);
+          for (const p of tsProjects) lines.push(`  [${p.systemId}] ${p.title} \u2014 ${p.status ?? "unknown"}`);
         } else {
           lines.push("Projects: (none)");
         }
@@ -31073,23 +31073,23 @@ function registerValueVelocityTools(server, ctx, client) {
     "propose_enablement_edges",
     'Propose directed enablement edges for a project \u2014 "Beat A accelerates Beat B". The LLM analyzes project Beats and proposes which ones unlock or accelerate others. Only proposed edges are created; a human must confirm before they affect Value Velocity scores. Pass beatId to scope the pass to edges FROM one Beat \u2014 strongly recommended on a large portfolio, where an unscoped pass can exceed the request timeout. If you already know the edge you want, skip proposing and use create_enablement_edge instead.',
     {
-      projectId: external_exports.string().describe("The project ID"),
+      systemId: external_exports.string().describe("The project ID"),
       beatId: external_exports.string().min(1).optional().describe("Scope the pass to edges FROM this Beat. Omit for a whole-project pass (slow on large portfolios).")
     },
-    async ({ projectId, beatId }) => {
+    async ({ systemId, beatId }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
         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);
-        const proposed = await client.proposeEnablementEdges(projectId, actorId, 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)." }] };
         }
         const lines = [
-          `Proposed ${proposed.length} enablement edge(s) for project ${projectId}${beatId ? ` scoped to ${beatId}` : ""}:`,
+          `Proposed ${proposed.length} enablement edge(s) for project ${systemId}${beatId ? ` scoped to ${beatId}` : ""}:`,
           "",
           "| Source Beat | Target Beat | Rationale |",
           "|-------------|------------|-----------|"
@@ -31461,13 +31461,13 @@ ${JSON.stringify(task.result, null, 2)}
     "list_tasks",
     "DEPRECATED: use `list_jobs`. List background jobs for a project with optional status filter.",
     {
-      projectId: external_exports.string().describe("The project ID"),
+      systemId: external_exports.string().describe("The project ID"),
       status: external_exports.enum(TASK_STATUSES).optional().describe("Filter by status"),
       limit: external_exports.coerce.number().optional().default(20).describe("Max number of jobs to return")
     },
-    async ({ projectId, status, limit }) => {
-      await assertProjectInOrg(client, projectId, ctx.orgId);
-      const tasks = await client.listSystemTasks(projectId, {
+    async ({ systemId, status, limit }) => {
+      await assertProjectInOrg(client, systemId, ctx.orgId);
+      const tasks = await client.listSystemTasks(systemId, {
         status,
         limit
       });
@@ -31519,13 +31519,13 @@ ${JSON.stringify(task.result, null, 2)}
     "list_jobs",
     "List background jobs for a project with optional status filter",
     {
-      projectId: external_exports.string().describe("The project ID"),
+      systemId: external_exports.string().describe("The project ID"),
       status: external_exports.enum(TASK_STATUSES).optional().describe("Filter by status"),
       limit: external_exports.coerce.number().optional().default(20).describe("Max number of jobs to return")
     },
-    async ({ projectId, status, limit }) => {
-      await assertProjectInOrg(client, projectId, ctx.orgId);
-      const tasks = await client.listSystemTasks(projectId, {
+    async ({ systemId, status, limit }) => {
+      await assertProjectInOrg(client, systemId, ctx.orgId);
+      const tasks = await client.listSystemTasks(systemId, {
         status,
         limit
       });
@@ -31543,13 +31543,13 @@ ${JSON.stringify(task.result, null, 2)}
     "draft_coda",
     "Generate and apply a Coda (description) for a Beat that has a title but no description. Uses project context, sibling Beats, related Notes, and codebase grep to write a resolved expression of the capability. The Coda is applied directly to the Beat, making it eligible for plan_beat_versions once a beat_quality check passes. An activity is logged so the Beat owner can review and edit. Returns a job ID \u2014 use get_job_status to track progress.",
     {
-      projectId: external_exports.string().describe("The project ID"),
+      systemId: external_exports.string().describe("The project ID"),
       beatId: external_exports.string().describe("The beat ID (must have a title but no description)")
     },
-    async ({ projectId, beatId }) => {
+    async ({ systemId, beatId }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
-        const task = await client.draftCoda(projectId, beatId);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
+        const task = await client.draftCoda(systemId, beatId);
         return {
           content: [{
             type: "text",
@@ -31557,7 +31557,7 @@ ${JSON.stringify(task.result, null, 2)}
               "Coda draft session queued.",
               "",
               `**Beat:** ${beatId}`,
-              `**Project:** ${projectId}`,
+              `**Project:** ${systemId}`,
               `**Task ID:** ${task.taskId}`,
               `**Status:** ${task.status}`,
               "",
@@ -31576,20 +31576,20 @@ ${JSON.stringify(task.result, null, 2)}
     "validate_assumptions",
     "Validate unvalidated assumption Notes against the codebase. Checks if assumptions are confirmed (validated), contradicted (invalidated), or have insufficient evidence (unvalidated). Low-criticality assumptions are auto-resolved; high-criticality are flagged for human review. Returns a job ID \u2014 use get_job_status to track progress.",
     {
-      projectId: external_exports.string().describe("The project ID"),
+      systemId: external_exports.string().describe("The project ID"),
       noteIds: external_exports.array(external_exports.string()).optional().describe("Specific assumption note IDs to validate. If omitted, validates all unvalidated assumptions.")
     },
-    async ({ projectId, noteIds }) => {
+    async ({ systemId, noteIds }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
-        const task = await client.validateAssumptions(projectId, noteIds);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
+        const task = await client.validateAssumptions(systemId, noteIds);
         return {
           content: [{
             type: "text",
             text: [
               "Assumption validation queued.",
               "",
-              `**Project:** ${projectId}`,
+              `**Project:** ${systemId}`,
               `**Scope:** ${noteIds ? `${noteIds.length} specific assumptions` : "All unvalidated assumptions"}`,
               `**Task ID:** ${task.taskId}`,
               `**Status:** ${task.status}`,
@@ -31610,15 +31610,15 @@ ${JSON.stringify(task.result, null, 2)}
     "start_session",
     'Start an agent session from a free-form message \u2014 like opening a Claude Code conversation pointed at your project. The message is the only instruction: describe what you want ("investigate why login fails", "implement revision rev-abc123", "what does the auth flow do?") and the agent resolves any entity references itself and does whatever the work needs \u2014 investigate and report findings, or change code and open a PR. A findings-only result with no PR is a valid outcome. Returns a job ID \u2014 use get_job_status to track progress. Requires agent sessions enabled on the project.',
     {
-      projectId: external_exports.string().min(1).describe("The project ID \u2014 the trusted scope the session is rooted at"),
+      systemId: external_exports.string().min(1).describe("The project ID \u2014 the trusted scope the session is rooted at"),
       message: external_exports.string().min(1).describe("Free-form first message describing what the session should do"),
       revisionId: external_exports.string().min(1).optional().describe("Optional Revision ID (rev-<uuid>). When provided, the Worker routes to the typed implementation session path (prepareRevisionImplementationSession), enabling file hint generation and richer session context. Omit for investigation, planning, or freeform sessions.")
     },
-    async ({ projectId, message, revisionId }) => {
+    async ({ systemId, message, revisionId }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
         const task = await client.startSession(
-          projectId,
+          systemId,
           message,
           { name: ctx.user.name, email: ctx.user.email },
           revisionId?.trim() ? { revisionId: revisionId.trim() } : void 0
@@ -31629,7 +31629,7 @@ ${JSON.stringify(task.result, null, 2)}
             text: [
               "Agent session queued.",
               "",
-              `**Project:** ${projectId}`,
+              `**Project:** ${systemId}`,
               `**Task ID:** ${task.taskId}`,
               `**Status:** ${task.status}`,
               "",
@@ -31648,20 +31648,20 @@ ${JSON.stringify(task.result, null, 2)}
     "plan_revision_batch",
     "Autonomously generate an implementation plan for planning Revisions. If revisionIds are omitted, discovers all unplanned planning Revisions and plans them all. Uses codebase-aware agent sessions when available, LLM-only fallback otherwise. Returns a job ID \u2014 use get_job_status to track progress.",
     {
-      projectId: external_exports.string().describe("The project ID"),
+      systemId: external_exports.string().describe("The project ID"),
       revisionIds: external_exports.array(external_exports.string()).optional().describe("Specific revision IDs to plan. If omitted, auto-discovers all unplanned planning revisions.")
     },
-    async ({ projectId, revisionIds }) => {
+    async ({ systemId, revisionIds }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
-        const task = await client.planRevisionBatch(projectId, revisionIds);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
+        const task = await client.planRevisionBatch(systemId, revisionIds);
         return {
           content: [{
             type: "text",
             text: [
               "Revision batch planning queued.",
               "",
-              `**Project:** ${projectId}`,
+              `**Project:** ${systemId}`,
               `**Scope:** ${revisionIds ? `${revisionIds.length} specific revision(s)` : "All unplanned planning revisions"}`,
               `**Task ID:** ${task.taskId}`,
               `**Status:** ${task.status}`,
@@ -31681,19 +31681,19 @@ ${JSON.stringify(task.result, null, 2)}
     "run_triage",
     "Run the autonomous triage loop for a project. Analyzes next actions, auto-executes safe actions (draft_coda, plan_revision_batch), and escalates items that need human judgment. Requires agentCapabilities.triage enabled on the project. Returns a job ID \u2014 use get_job_status to track progress.",
     {
-      projectId: external_exports.string().describe("The project ID")
+      systemId: external_exports.string().describe("The project ID")
     },
-    async ({ projectId }) => {
+    async ({ systemId }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
-        const task = await client.runTriage(projectId);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
+        const task = await client.runTriage(systemId);
         return {
           content: [{
             type: "text",
             text: [
               "Triage loop queued.",
               "",
-              `**Project:** ${projectId}`,
+              `**Project:** ${systemId}`,
               `**Task ID:** ${task.taskId}`,
               `**Status:** ${task.status}`,
               "",
@@ -31724,15 +31724,15 @@ ${JSON.stringify(task.result, null, 2)}
       "Returns a job ID \u2014 use `get_job_status` to track progress."
     ].join("\n"),
     {
-      projectId: external_exports.string().describe("The project ID"),
+      systemId: external_exports.string().describe("The project ID"),
       content: external_exports.string().describe('Document content \u2014 plain text (default) or base64-encoded binary (when encoding is "base64")'),
       filename: external_exports.string().optional().default("document.txt").describe('Original filename with extension (e.g., "sow.pdf", "spec.docx"). Used for format detection in binary mode.'),
       encoding: external_exports.enum(["base64"]).optional().describe('Set to "base64" when submitting binary files (DOCX, XLSX, PPTX, PDF). Omit for plain text.')
     },
-    async ({ projectId, content, filename, encoding }) => {
+    async ({ systemId, content, filename, encoding }) => {
       try {
-        await assertProjectInOrg(client, projectId, ctx.orgId);
-        const result = encoding === "base64" ? await client.analyzeBinaryDocument(projectId, content, filename) : await client.analyzeDocument(projectId, content, filename);
+        await assertProjectInOrg(client, systemId, ctx.orgId);
+        const result = encoding === "base64" ? await client.analyzeBinaryDocument(systemId, content, filename) : await client.analyzeDocument(systemId, content, filename);
         return {
           content: [{
             type: "text",
@@ -32176,7 +32176,7 @@ function createHttpClient(config2) {
         );
         const project = result?.project ? {
           ...result.project,
-          projectId: result.project.id ?? result.project.projectId,
+          systemId: result.project.id ?? result.project.systemId ?? result.project.projectId,
           title: result.project.name ?? result.project.title,
           orgId: result.project.organizationId ?? result.project.orgId
         } : void 0;
@@ -32196,7 +32196,7 @@ function createHttpClient(config2) {
       if (!raw) return void 0;
       return {
         ...raw,
-        projectId: raw.id ?? raw.projectId,
+        systemId: raw.id ?? raw.systemId ?? raw.projectId,
         title: raw.name ?? raw.title,
         orgId: raw.organizationId ?? raw.orgId
       };
@@ -32212,17 +32212,17 @@ function createHttpClient(config2) {
         // is created unlinked — invisible in the Account's Systems list.
         ...input.accountId !== void 0 && { accountId: input.accountId }
       });
-      return { ...raw, projectId: raw?.id ?? raw?.projectId, title: raw?.name ?? raw?.title, orgId: raw?.organizationId ?? raw?.orgId };
+      return { ...raw, systemId: raw?.id ?? raw?.systemId ?? raw?.projectId, title: raw?.name ?? raw?.title, orgId: raw?.organizationId ?? raw?.orgId };
     },
     updateSystem: async (projectId, updates) => {
       const raw = await request("PATCH", `/api/systems/${encodeURIComponent(projectId)}`, updates);
       if (!raw) return void 0;
-      return { ...raw, projectId: raw.id ?? raw.projectId, title: raw.name ?? raw.title, orgId: raw.organizationId ?? raw.orgId };
+      return { ...raw, systemId: raw.id ?? raw.systemId ?? raw.projectId, title: raw.name ?? raw.title, orgId: raw.organizationId ?? raw.orgId };
     },
     archiveSystem: async (projectId) => {
       const raw = await request("PATCH", `/api/systems/${encodeURIComponent(projectId)}/archive`);
       if (!raw) return void 0;
-      return { ...raw, projectId: raw.id ?? raw.projectId, title: raw.name ?? raw.title, orgId: raw.organizationId ?? raw.orgId };
+      return { ...raw, systemId: raw.id ?? raw.systemId ?? raw.projectId, title: raw.name ?? raw.title, orgId: raw.organizationId ?? raw.orgId };
     },
     getSystemFact: async (projectId) => {
       const result = await request("GET", `/api/systems/${encodeURIComponent(projectId)}/facts`);
@@ -32291,7 +32291,7 @@ function createHttpClient(config2) {
       return raw?.report;
     },
     createBeat: async (input) => {
-      const raw = await request("POST", `/api/systems/${encodeURIComponent(input.projectId)}/beats`, input);
+      const raw = await request("POST", `/api/systems/${encodeURIComponent(input.systemId)}/beats`, input);
       return { ...raw, beatId: raw.beatId ?? raw.id, status: raw.status ?? "open", beatStatus: coerceBeatStatusLocal(raw.beatStatus) };
     },
     updateBeat: async (beatId, updates) => {
@@ -32375,7 +32375,7 @@ function createHttpClient(config2) {
       return result?.layer;
     },
     createSystemLayer: async (input) => {
-      const { projectId, layerKey, name, description, parentLayerId, repoPatterns } = input;
+      const { systemId, layerKey, name, description, parentLayerId, repoPatterns } = input;
       const body = {
         layerKey,
         name,
@@ -32385,7 +32385,7 @@ function createHttpClient(config2) {
       };
       const result = await request(
         "POST",
-        `/api/systems/${encodeURIComponent(projectId)}/layers`,
+        `/api/systems/${encodeURIComponent(systemId)}/layers`,
         body
       );
       if (result === void 0) return void 0;
@@ -33000,7 +33000,7 @@ function createHttpClient(config2) {
       return { entries: result.activities ?? [], hasMore: false };
     },
     createActivity: async (input) => {
-      const result = await request("POST", `/api/systems/${encodeURIComponent(input.projectId)}/activities`, {
+      const result = await request("POST", `/api/systems/${encodeURIComponent(input.systemId)}/activities`, {
         action: input.action,
         importance: input.importance,
         reason: input.reason,
@@ -33185,7 +33185,7 @@ function createHttpClient(config2) {
         { projectId, message, ...triggeredBy && { triggeredBy }, ...trimmedRevisionId && { revisionId: trimmedRevisionId } }
       );
       if (!result?.taskId) throw new Error("Start session enqueue failed: no taskId returned");
-      return { taskId: result.taskId, taskType: "generic_session", status: result.status ?? "pending", projectId, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
+      return { taskId: result.taskId, taskType: "generic_session", status: result.status ?? "pending", systemId: projectId, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
     },
     planRevisionBatch: async (projectId, revisionIds) => {
       const result = await request(
@@ -33194,7 +33194,7 @@ function createHttpClient(config2) {
         revisionIds ? { revisionIds } : {}
       );
       if (!result?.taskId) throw new Error("Plan revision batch enqueue failed: no taskId returned");
-      return { taskId: result.taskId, taskType: "plan_revision_batch", status: result.status ?? "pending", projectId, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
+      return { taskId: result.taskId, taskType: "plan_revision_batch", status: result.status ?? "pending", systemId: projectId, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
     },
     draftCoda: async (projectId, beatId) => {
       const result = await request(
@@ -33203,7 +33203,7 @@ function createHttpClient(config2) {
         {}
       );
       if (!result?.taskId) throw new Error("Draft coda enqueue failed: no taskId returned");
-      return { taskId: result.taskId, taskType: "draft_coda", status: result.status ?? "pending", projectId, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
+      return { taskId: result.taskId, taskType: "draft_coda", status: result.status ?? "pending", systemId: projectId, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
     },
     composeRootCoda: async (orgId) => {
       const result = await request(
@@ -33212,7 +33212,7 @@ function createHttpClient(config2) {
         {}
       );
       if (!result?.taskId) throw new Error("Compose root Coda enqueue failed: no taskId returned");
-      return { taskId: result.taskId, taskType: "compose_root_coda", status: result.status ?? "pending", projectId: orgId, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
+      return { taskId: result.taskId, taskType: "compose_root_coda", status: result.status ?? "pending", systemId: orgId, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
     },
     validateAssumptions: async (projectId, noteIds) => {
       const result = await request(
@@ -33221,7 +33221,7 @@ function createHttpClient(config2) {
         noteIds ? { noteIds } : {}
       );
       if (!result?.taskId) throw new Error("Assumption validation enqueue failed: no taskId returned");
-      return { taskId: result.taskId, taskType: "validate_assumptions", status: result.status ?? "pending", projectId, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
+      return { taskId: result.taskId, taskType: "validate_assumptions", status: result.status ?? "pending", systemId: projectId, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
     },
     runTriage: async (projectId) => {
       const result = await request(
@@ -33230,7 +33230,7 @@ function createHttpClient(config2) {
         {}
       );
       if (!result?.taskId) throw new Error("Triage enqueue failed: no taskId returned");
-      return { taskId: result.taskId, taskType: "triage_loop", status: result.status ?? "pending", projectId, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
+      return { taskId: result.taskId, taskType: "triage_loop", status: result.status ?? "pending", systemId: projectId, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
     },
     baselineProject: async (projectId, options) => {
       const result = await request(
@@ -33239,7 +33239,7 @@ function createHttpClient(config2) {
         { beatIds: options?.beatIds, runChecks: options?.runChecks ?? true, localPath: options?.localPath }
       );
       if (!result?.taskId) throw new Error("Baseline enqueue failed: no taskId returned");
-      return { taskId: result.taskId, taskType: "baseline_project", status: result.status ?? "pending", projectId, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
+      return { taskId: result.taskId, taskType: "baseline_project", status: result.status ?? "pending", systemId: projectId, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
     },
     runCheck: async (projectId, checkType, targetId, options) => {
       const result = await request(
@@ -33248,7 +33248,7 @@ function createHttpClient(config2) {
         { checkType, targetId, branch: options?.branch, localPath: options?.localPath }
       );
       if (!result?.taskId) throw new Error("Check enqueue failed: no taskId returned");
-      return { taskId: result.taskId, taskType: "run_check", status: result.status ?? "pending", projectId, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
+      return { taskId: result.taskId, taskType: "run_check", status: result.status ?? "pending", systemId: projectId, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
     },
     // Subscriptions
     subscribe: async (userId, entityType, entityId, projectId, source) => {
@@ -33325,7 +33325,7 @@ function createHttpClient(config2) {
     },
     searchByText: async (scope, query, options) => {
       const params = new URLSearchParams({ q: query });
-      if ("projectId" in scope) params.set("systemId", scope.projectId);
+      if ("systemId" in scope) params.set("systemId", scope.systemId);
       else if ("teamspaceId" in scope) params.set("teamspaceId", scope.teamspaceId);
       else params.set("orgId", scope.orgId);
       if (options?.limit) params.set("limit", String(options.limit));
@@ -34161,7 +34161,7 @@ function loadConfig() {
   };
 }
 async function main() {
-  console.error(`[harmonica-mcp] v${"3.6.1"} starting\u2026`);
+  console.error(`[harmonica-mcp] v${"3.7.0"} starting\u2026`);
   const config2 = loadConfig();
   const client = createHttpClient({
     apiBaseUrl: config2.apiBaseUrl,