@daeda/mcp-pro 0.1.11 → 0.1.12

package/dist/index.js

@@ -3,7 +3,7 @@
 // src/index.ts
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { Effect as Effect91, Layer as Layer6, pipe as pipe77 } from "effect";
+import { Effect as Effect93, Layer as Layer6, pipe as pipe78 } from "effect";
 
 // src/plugins/crm-data.ts
 import { Effect as Effect3, pipe as pipe3 } from "effect";
@@ -78,6 +78,7 @@ var SyncError = class extends Data.TaggedError("SyncError") {
 
 // src/pure/csv-parser.ts
 import { unzipSync, gunzipSync } from "fflate";
+import Papa from "papaparse";
 var ZIP_MAGIC = [80, 75, 3, 4];
 var GZIP_MAGIC = [31, 139];
 var hasMagicBytes = (bytes, magic) => bytes.length >= magic.length && magic.every((b, i) => bytes[i] === b);
@@ -106,74 +107,6 @@ var decompressBytes = (bytes, contentType = "", contentEncoding = "", url = "")
   }
   return new TextDecoder().decode(bytes);
 };
-var splitCsvRows = (csv) => {
-  const rows = [];
-  let current = "";
-  let inQuotes = false;
-  for (let i = 0; i < csv.length; i++) {
-    const char = csv[i];
-    if (inQuotes) {
-      if (char === '"') {
-        if (i + 1 < csv.length && csv[i + 1] === '"') {
-          current += '""';
-          i++;
-        } else {
-          inQuotes = false;
-          current += char;
-        }
-      } else {
-        current += char;
-      }
-    } else {
-      if (char === '"') {
-        inQuotes = true;
-        current += char;
-      } else if (char === "\r") {
-        if (i + 1 < csv.length && csv[i + 1] === "\n") i++;
-        if (current.trim().length > 0) rows.push(current);
-        current = "";
-      } else if (char === "\n") {
-        if (current.trim().length > 0) rows.push(current);
-        current = "";
-      } else {
-        current += char;
-      }
-    }
-  }
-  if (current.trim().length > 0) rows.push(current);
-  return rows;
-};
-var parseCSVLine = (line) => {
-  const fields44 = [];
-  let current = "";
-  let inQuotes = false;
-  for (let i = 0; i < line.length; i++) {
-    const char = line[i];
-    if (inQuotes) {
-      if (char === '"') {
-        if (i + 1 < line.length && line[i + 1] === '"') {
-          current += '"';
-          i++;
-        } else {
-          inQuotes = false;
-        }
-      } else {
-        current += char;
-      }
-    } else {
-      if (char === '"') {
-        inQuotes = true;
-      } else if (char === ",") {
-        fields44.push(current);
-        current = "";
-      } else {
-        current += char;
-      }
-    }
-  }
-  fields44.push(current);
-  return fields44;
-};
 var EXPORT_NAME_TO_OBJECT_TYPE = {
   CONTACT: "contacts",
   COMPANY: "companies",
@@ -195,58 +128,43 @@ var normalizeAssociationLabel = (value) => {
   if (value === void 0) return null;
   return value.trim().length > 0 ? value : null;
 };
-var parseSupabaseAssociationCsv = (lines, headers, from, to) => {
-  const fromIdIndex = headers.findIndex((h) => h === "fromObjectId");
-  const toIdIndex = headers.findIndex((h) => h === "toObjectId");
-  const typeIndex = headers.findIndex((h) => h === "associationType");
-  const labelIndex = headers.findIndex((h) => h === "label");
-  if (fromIdIndex === -1 || toIdIndex === -1) {
-    throw new Error(`Missing fromObjectId/toObjectId columns in headers: ${headers.join(", ")}`);
-  }
-  const rows = [];
-  for (let i = 1; i < lines.length; i++) {
-    const values = parseCSVLine(lines[i]);
-    const fromId = values[fromIdIndex] ?? "";
-    const toId = values[toIdIndex] ?? "";
-    if (!fromId || !toId) continue;
-    rows.push({
-      fromObjectType: from,
-      fromId,
-      toObjectType: to,
-      toId,
-      associationType: typeIndex !== -1 ? values[typeIndex] ?? "" : "",
-      label: labelIndex !== -1 ? normalizeAssociationLabel(values[labelIndex]) : null
-    });
+var isAssociationHeader = (h) => h.startsWith("associations.ids.") || h.startsWith("associations.labels.") || h.startsWith("associations.");
+var parseRow = (csvContent) => Papa.parse(csvContent, {
+  header: true,
+  skipEmptyLines: true,
+  dynamicTyping: false
+});
+var findAssociationMappings = (headers) => {
+  const mappings = [];
+  for (const h of headers) {
+    if (!h.startsWith("associations.ids.")) continue;
+    const exportName = h.replace("associations.ids.", "");
+    const toObjectType = resolveObjectTypeName(exportName);
+    const labelsHeader = headers.find((lh) => lh === `associations.labels.${exportName}`) ?? headers.find((lh) => lh === `associations.${exportName}`) ?? null;
+    mappings.push({ toObjectType, idsHeader: h, labelsHeader });
   }
-  return rows;
+  return mappings;
 };
-var parseHubSpotAssociationCsv = (lines, headers, from, to) => {
-  const idIndex = headers.findIndex(
-    (h) => h === "hs_object_id" || h === "Record ID"
-  );
-  if (idIndex === -1) {
-    throw new Error(`No id column found in headers: ${headers.join(", ")}`);
-  }
-  const assocIdsIndex = headers.findIndex((h) => h.startsWith("associations.ids."));
-  if (assocIdsIndex === -1) {
-    throw new Error(`No associations.ids column found in headers: ${headers.join(", ")}`);
+var findIdField = (headers) => {
+  for (const candidate of ["hs_object_id", "Record ID", "id", "ID"]) {
+    if (headers.includes(candidate)) return candidate;
   }
-  const labelHeader = headers[assocIdsIndex].replace("associations.ids.", "associations.labels.");
-  const labelIndex = headers.findIndex((h) => h === labelHeader);
+  const lowerMatch = headers.find((h) => h.toLowerCase() === "id");
+  if (lowerMatch) return lowerMatch;
+  throw new Error(`No id column found in headers: ${headers.join(", ")}`);
+};
+var extractAssociations = (row, fromId, objectType, mappings) => {
   const rows = [];
-  for (let i = 1; i < lines.length; i++) {
-    const values = parseCSVLine(lines[i]);
-    const fromId = values[idIndex] ?? "";
-    if (!fromId) continue;
-    const idsRaw = values[assocIdsIndex] ?? "";
+  for (const mapping of mappings) {
+    const idsRaw = row[mapping.idsHeader] ?? "";
     if (!idsRaw) continue;
     const toIds = idsRaw.split(";").map((s) => s.trim()).filter(Boolean);
-    const labels = labelIndex !== -1 ? (values[labelIndex] ?? "").split(";").map((s) => s.trim()) : [];
+    const labels = mapping.labelsHeader ? (row[mapping.labelsHeader] ?? "").split(";").map((s) => s.trim()) : [];
     for (let j = 0; j < toIds.length; j++) {
       rows.push({
-        fromObjectType: from,
+        fromObjectType: objectType,
         fromId,
-        toObjectType: to,
+        toObjectType: mapping.toObjectType,
         toId: toIds[j],
         associationType: "",
         label: normalizeAssociationLabel(labels[j])
@@ -255,78 +173,85 @@ var parseHubSpotAssociationCsv = (lines, headers, from, to) => {
   }
   return rows;
 };
-var findAssociationColumns = (headers) => {
-  const columns = [];
-  for (let i = 0; i < headers.length; i++) {
-    const h = headers[i];
-    if (!h.startsWith("associations.ids.")) continue;
-    const exportName = h.replace("associations.ids.", "");
-    const toObjectType = resolveObjectTypeName(exportName);
-    const labelHeader = `associations.labels.${exportName}`;
-    const labelsIndex = headers.findIndex((lh) => lh === labelHeader);
-    columns.push({ toObjectType, idsIndex: i, labelsIndex });
-  }
-  return columns;
-};
-var isAssociationHeader = (h) => h.startsWith("associations.ids.") || h.startsWith("associations.labels.");
 var parseMergedExportCsv = (csvContent, objectType) => {
-  const lines = splitCsvRows(csvContent);
-  if (lines.length === 0) return { objects: [], associations: [] };
-  const headers = parseCSVLine(lines[0]);
-  const idIndex = headers.findIndex(
-    (h) => h.toLowerCase() === "id" || h === "Record ID" || h === "hs_object_id"
-  );
-  if (idIndex === -1) {
-    throw new Error(`No id column found in headers: ${headers.join(", ")}`);
-  }
-  const assocColumns = findAssociationColumns(headers);
-  const assocColumnIndices = /* @__PURE__ */ new Set();
-  for (const col of assocColumns) {
-    assocColumnIndices.add(col.idsIndex);
-    if (col.labelsIndex !== -1) assocColumnIndices.add(col.labelsIndex);
+  const result = parseRow(csvContent);
+  if (result.data.length === 0) return { objects: [], associations: [] };
+  const headers = result.meta.fields ?? [];
+  const idField = findIdField(headers);
+  const assocMappings = findAssociationMappings(headers);
+  const assocHeaders = /* @__PURE__ */ new Set();
+  for (const m of assocMappings) {
+    assocHeaders.add(m.idsHeader);
+    if (m.labelsHeader) assocHeaders.add(m.labelsHeader);
   }
+  const propertyHeaders = headers.filter(
+    (h) => h !== idField && !assocHeaders.has(h) && !isAssociationHeader(h)
+  );
   const objects = [];
   const associations = [];
-  for (let i = 1; i < lines.length; i++) {
-    const values = parseCSVLine(lines[i]);
-    const id = values[idIndex] ?? "";
+  for (const row of result.data) {
+    const id = row[idField] ?? "";
     if (!id) continue;
     const properties = {};
-    for (let j = 0; j < headers.length; j++) {
-      if (j === idIndex) continue;
-      if (assocColumnIndices.has(j)) continue;
-      if (isAssociationHeader(headers[j])) continue;
-      const key = headers[j];
-      const value = values[j];
+    for (const key of propertyHeaders) {
+      const value = row[key];
       properties[key] = value !== void 0 && value !== "" ? value : null;
     }
     objects.push({ id, properties });
-    for (const col of assocColumns) {
-      const idsRaw = values[col.idsIndex] ?? "";
-      if (!idsRaw) continue;
-      const toIds = idsRaw.split(";").map((s) => s.trim()).filter(Boolean);
-      const labels = col.labelsIndex !== -1 ? (values[col.labelsIndex] ?? "").split(";").map((s) => s.trim()) : [];
-      for (let j = 0; j < toIds.length; j++) {
-        associations.push({
-          fromObjectType: objectType,
-          fromId: id,
-          toObjectType: col.toObjectType,
-          toId: toIds[j],
-          associationType: "",
-          label: normalizeAssociationLabel(labels[j])
-        });
-      }
-    }
+    associations.push(...extractAssociations(row, id, objectType, assocMappings));
   }
   return { objects, associations };
 };
 var parseAssociationRows = (csvContent, objectType) => {
   const { from, to } = parseAssociationType(objectType);
-  const lines = splitCsvRows(csvContent);
-  if (lines.length === 0) return [];
-  const headers = parseCSVLine(lines[0]);
-  const isSupabaseFormat = headers.some((h) => h === "fromObjectId");
-  return isSupabaseFormat ? parseSupabaseAssociationCsv(lines, headers, from, to) : parseHubSpotAssociationCsv(lines, headers, from, to);
+  const result = parseRow(csvContent);
+  if (result.data.length === 0) return [];
+  const headers = result.meta.fields ?? [];
+  const isSupabaseFormat = headers.includes("fromObjectId");
+  if (isSupabaseFormat) {
+    const rows2 = [];
+    for (const row of result.data) {
+      const fromId = row["fromObjectId"] ?? "";
+      const toId = row["toObjectId"] ?? "";
+      if (!fromId || !toId) continue;
+      rows2.push({
+        fromObjectType: from,
+        fromId,
+        toObjectType: to,
+        toId,
+        associationType: row["associationType"] ?? "",
+        label: normalizeAssociationLabel(row["label"])
+      });
+    }
+    return rows2;
+  }
+  const idField = findIdField(headers);
+  const assocIdsHeader = headers.find((h) => h.startsWith("associations.ids."));
+  if (!assocIdsHeader) {
+    throw new Error(`No associations.ids column found in headers: ${headers.join(", ")}`);
+  }
+  const exportName = assocIdsHeader.replace("associations.ids.", "");
+  const labelHeader = headers.find((h) => h === `associations.labels.${exportName}`) ?? headers.find((h) => h === `associations.${exportName}`) ?? null;
+  const rows = [];
+  for (const row of result.data) {
+    const fromId = row[idField] ?? "";
+    if (!fromId) continue;
+    const idsRaw = row[assocIdsHeader] ?? "";
+    if (!idsRaw) continue;
+    const toIds = idsRaw.split(";").map((s) => s.trim()).filter(Boolean);
+    const labels = labelHeader ? (row[labelHeader] ?? "").split(";").map((s) => s.trim()) : [];
+    for (let j = 0; j < toIds.length; j++) {
+      rows.push({
+        fromObjectType: from,
+        fromId,
+        toObjectType: to,
+        toId: toIds[j],
+        associationType: "",
+        label: normalizeAssociationLabel(labels[j])
+      });
+    }
+  }
+  return rows;
 };
 
 // src/effects/csv-parser.ts
@@ -386,15 +311,16 @@ import path3 from "path";
 // src/paths.ts
 import os2 from "os";
 import path2 from "path";
-var DATA_ROOT = path2.join(os2.homedir(), ".daeda-mcp");
-var PORTALS_DIR = path2.join(DATA_ROOT, "portals");
-var portalDir = (portalId) => path2.join(PORTALS_DIR, String(portalId));
+var _dataRoot = path2.join(os2.homedir(), ".daeda-mcp");
+var DATA_ROOT = () => _dataRoot;
+var PORTALS_DIR = () => path2.join(_dataRoot, "portals");
+var portalDir = (portalId) => path2.join(PORTALS_DIR(), String(portalId));
 var dbPath = (portalId) => path2.join(portalDir(portalId), "hubspot.duckdb");
-var stateFilePath = () => path2.join(DATA_ROOT, "client_state.json");
+var stateFilePath = () => path2.join(_dataRoot, "client_state.json");
 var portalStatePath = (portalId) => path2.join(portalDir(portalId), "portal_state.json");
 var errorsDirPath = (portalId) => path2.join(portalDir(portalId), "errors");
-var CHARTS_DIR = path2.join(DATA_ROOT, "charts");
-var chartFilePath = (filename) => path2.join(CHARTS_DIR, filename);
+var CHARTS_DIR = () => path2.join(_dataRoot, "charts");
+var chartFilePath = (filename) => path2.join(CHARTS_DIR(), filename);
 
 // src/effects/save-error-csv.ts
 var logStderr = (message) => Effect2.sync(() => console.error(message));
@@ -1647,7 +1573,7 @@ var ConfigLive = Layer.succeed(
     ),
     save: (state) => Effect19.try({
       try: () => {
-        fs3.mkdirSync(DATA_ROOT, { recursive: true });
+        fs3.mkdirSync(DATA_ROOT(), { recursive: true });
         fs3.writeFileSync(stateFilePath(), JSON.stringify(state, null, 2), "utf-8");
       },
       catch: (error) => new ConfigWriteError({ path: stateFilePath(), cause: error })
@@ -2332,103 +2258,113 @@ var PortalStateLive = Layer3.effect(
 );
 
 // src/layers/SyncLayerLive.ts
-import { Effect as Effect24, Layer as Layer4, Ref as Ref3, pipe as pipe18 } from "effect";
+import { Effect as Effect24, Layer as Layer4, pipe as pipe18 } from "effect";
 
 // src/effects/run-full-sync.ts
 import { Effect as Effect22, Ref as Ref2, pipe as pipe16 } from "effect";
 var logStderr5 = (message) => Effect22.sync(() => console.error(message));
-var runFullSync = (ws, db, portalState, portalId, artifacts, progressRef, objectTypesToSync) => pipe16(
-  Effect22.Do,
-  Effect22.let(
-    "objectTypesToSyncSet",
-    () => objectTypesToSync ? new Set(objectTypesToSync) : void 0
-  ),
-  Effect22.let(
-    "toSync",
-    ({ objectTypesToSyncSet }) => filterUnsyncedArtifacts(artifacts, objectTypesToSyncSet)
-  ),
-  Effect22.tap(
-    ({ toSync }) => Ref2.set(progressRef, {
-      totalArtifacts: toSync.length,
-      completedArtifacts: 0,
-      currentArtifact: null,
-      status: "syncing"
-    })
-  ),
-  Effect22.tap(() => db.initializeDb(portalId)),
-  Effect22.let("artifactCtx", () => ({
-    db,
-    ws,
-    portalState,
-    portalId
-  })),
-  Effect22.tap(
-    ({ toSync, artifactCtx }) => Effect22.forEach(
-      toSync,
-      (artifact, idx) => pipe16(
-        Ref2.update(progressRef, (p) => ({
-          ...p,
-          currentArtifact: artifact.object_type
-        })),
-        Effect22.tap(
-          () => logStderr5(
-            `[sync] (${idx + 1}/${toSync.length}) Processing: ${artifact.object_type}`
-          )
-        ),
-        Effect22.flatMap(() => {
-          const plugin = findArtifactPlugin(artifact.object_type);
-          if (!plugin) {
-            return logStderr5(`[sync] No artifact plugin found for ${artifact.object_type}, skipping`);
-          }
-          return plugin.processArtifact(artifactCtx, artifact);
-        }),
-        Effect22.tap(
-          () => Ref2.update(progressRef, (p) => ({
-            ...p,
-            completedArtifacts: p.completedArtifacts + 1
-          }))
+var runFullSync = (ws, db, portalState, portalId, artifacts, objectTypesToSync) => pipe16(
+  Ref2.make({
+    totalArtifacts: 0,
+    completedArtifacts: 0,
+    currentArtifact: null,
+    status: "idle"
+  }),
+  Effect22.flatMap(
+    (progressRef) => pipe16(
+      Effect22.Do,
+      Effect22.let(
+        "objectTypesToSyncSet",
+        () => objectTypesToSync ? new Set(objectTypesToSync) : void 0
+      ),
+      Effect22.let(
+        "toSync",
+        ({ objectTypesToSyncSet }) => filterUnsyncedArtifacts(artifacts, objectTypesToSyncSet)
+      ),
+      Effect22.tap(
+        ({ toSync }) => Ref2.set(progressRef, {
+          totalArtifacts: toSync.length,
+          completedArtifacts: 0,
+          currentArtifact: null,
+          status: "syncing"
+        })
+      ),
+      Effect22.tap(() => db.initializeDb(portalId)),
+      Effect22.let("artifactCtx", () => ({
+        db,
+        ws,
+        portalState,
+        portalId
+      })),
+      Effect22.tap(
+        ({ toSync, artifactCtx }) => Effect22.forEach(
+          toSync,
+          (artifact, idx) => pipe16(
+            Ref2.update(progressRef, (p) => ({
+              ...p,
+              currentArtifact: artifact.object_type
+            })),
+            Effect22.tap(
+              () => logStderr5(
+                `[sync] (${idx + 1}/${toSync.length}) Processing: ${artifact.object_type}`
+              )
+            ),
+            Effect22.flatMap(() => {
+              const plugin = findArtifactPlugin(artifact.object_type);
+              if (!plugin) {
+                return logStderr5(`[sync] No artifact plugin found for ${artifact.object_type}, skipping`);
+              }
+              return plugin.processArtifact(artifactCtx, artifact);
+            }),
+            Effect22.tap(
+              () => Ref2.update(progressRef, (p) => ({
+                ...p,
+                completedArtifacts: p.completedArtifacts + 1
+              }))
+            )
+          ),
+          { concurrency: 1 }
         )
       ),
-      { concurrency: 1 }
+      Effect22.tap(
+        () => db.setMetadata("last_synced", (/* @__PURE__ */ new Date()).toISOString())
+      ),
+      Effect22.tap(({ toSync }) => {
+        const objectTypes = filterObjectTypes(toSync);
+        return Effect22.forEach(
+          objectTypes,
+          (ot) => db.setMetadata(`last_synced:${ot}`, (/* @__PURE__ */ new Date()).toISOString()),
+          { concurrency: "unbounded" }
+        );
+      }),
+      Effect22.tap(
+        () => db.setMetadata("portal_id", String(portalId))
+      ),
+      Effect22.tap(
+        () => portalState.touchSyncedAt(portalId).pipe(Effect22.catchAll(() => Effect22.void))
+      ),
+      Effect22.tap(
+        () => Ref2.update(progressRef, (p) => ({
+          ...p,
+          currentArtifact: null,
+          status: "complete"
+        }))
+      ),
+      Effect22.flatMap(() => Ref2.get(progressRef)),
+      Effect22.tapError(
+        (err) => Ref2.update(progressRef, (p) => ({
+          ...p,
+          status: "error",
+          error: String(err)
+        }))
+      ),
+      Effect22.mapError(
+        (err) => new SyncError({
+          message: `Full sync failed for portal ${portalId}`,
+          cause: err
+        })
+      )
     )
-  ),
-  Effect22.tap(
-    () => db.setMetadata("last_synced", (/* @__PURE__ */ new Date()).toISOString())
-  ),
-  Effect22.tap(({ toSync }) => {
-    const objectTypes = filterObjectTypes(toSync);
-    return Effect22.forEach(
-      objectTypes,
-      (ot) => db.setMetadata(`last_synced:${ot}`, (/* @__PURE__ */ new Date()).toISOString()),
-      { concurrency: "unbounded" }
-    );
-  }),
-  Effect22.tap(
-    () => db.setMetadata("portal_id", String(portalId))
-  ),
-  Effect22.tap(
-    () => portalState.touchSyncedAt(portalId).pipe(Effect22.catchAll(() => Effect22.void))
-  ),
-  Effect22.tap(
-    () => Ref2.update(progressRef, (p) => ({
-      ...p,
-      currentArtifact: null,
-      status: "complete"
-    }))
-  ),
-  Effect22.flatMap(() => Ref2.get(progressRef)),
-  Effect22.tapError(
-    (err) => Ref2.update(progressRef, (p) => ({
-      ...p,
-      status: "error",
-      error: String(err)
-    }))
-  ),
-  Effect22.mapError(
-    (err) => new SyncError({
-      message: `Full sync failed for portal ${portalId}`,
-      cause: err
-    })
   )
 );
 
@@ -2591,14 +2527,8 @@ var SyncLive = Layer4.effect(
     const ws = yield* WebSocketService;
     const db = yield* DatabaseService;
     const portalState = yield* PortalStateService;
-    const progressRef = yield* Ref3.make({
-      totalArtifacts: 0,
-      completedArtifacts: 0,
-      currentArtifact: null,
-      status: "idle"
-    });
     return {
-      syncArtifacts: (portalId, artifacts, objectTypesToSync) => runFullSync(ws, db, portalState, portalId, artifacts, progressRef, objectTypesToSync),
+      syncArtifacts: (portalId, artifacts, objectTypesToSync) => runFullSync(ws, db, portalState, portalId, artifacts, objectTypesToSync),
       syncMessagePlugins: (portalId) => pipe18(
         syncAllMessagePlugins(ws, db, portalState, portalId),
         Effect24.mapError(
@@ -2607,66 +2537,52 @@ var SyncLive = Layer4.effect(
             cause: err
           })
         )
-      ),
-      getProgress: () => Ref3.get(progressRef)
+      )
     };
   })
 );
 
 // src/layers/WebSocketLayerLive.ts
-import { Effect as Effect36, Layer as Layer5, Match, Ref as Ref15, Schedule, Duration, pipe as pipe30 } from "effect";
+import { Effect as Effect36, Layer as Layer5, Match, Ref as Ref14, Schedule, Duration, pipe as pipe30 } from "effect";
 
 // src/handlers/handle-register-response.ts
-import { Effect as Effect25, Ref as Ref4, pipe as pipe19 } from "effect";
+import { Effect as Effect25, Ref as Ref3, pipe as pipe19 } from "effect";
 var handleRegisterResponse = (payload, ctx) => !payload.success || !payload.target_portals ? Effect25.sync(
   () => console.error(`Registration failed: ${payload.error ?? "unknown"}`)
 ) : pipe19(
-  Ref4.set(ctx.portalsRef, payload.target_portals),
+  Ref3.set(ctx.portalsRef, payload.target_portals),
   Effect25.flatMap(
-    () => payload.encryption_key ? Ref4.set(ctx.encryptionKeyRef, payload.encryption_key) : Effect25.void
+    () => payload.encryption_key ? Ref3.set(ctx.encryptionKeyRef, payload.encryption_key) : Effect25.void
   ),
-  Effect25.flatMap(() => Ref4.get(ctx.handlersRef)),
+  Effect25.flatMap(() => Ref3.get(ctx.handlersRef)),
   Effect25.flatMap(
     (handlers) => Effect25.sync(() => {
       const portals = payload.target_portals;
-      const selectedPortalId = handlers?.autoSelectSinglePortal(portals) ?? null;
-      if (selectedPortalId !== null) {
-        Effect25.runFork(
-          pipe19(
-            Ref4.set(ctx.currentSyncPortalRef, selectedPortalId),
-            Effect25.flatMap(() => ctx.requireWs),
-            Effect25.flatMap((ws) => ctx.sendJson(ws, "sync:full", { target_portal: selectedPortalId })),
-            Effect25.catchAll(() => Effect25.void)
-          )
-        );
-      } else {
-        handlers?.onRegisterSuccess(portals);
-      }
+      handlers?.autoSelectSinglePortal(portals);
+      handlers?.onRegisterSuccess(portals);
     })
   )
 );
 
 // src/handlers/handle-sync-full-response.ts
-import { Effect as Effect26, Ref as Ref5, pipe as pipe20 } from "effect";
+import { Effect as Effect26, Ref as Ref4, pipe as pipe20 } from "effect";
 var handleSyncFullResponse = (payload, ctx) => !payload.success ? Effect26.sync(() => console.error(`Sync failed: ${payload.error ?? "unknown"}`)) : pipe20(
   Effect26.sync(() => console.error(`[sync:full] Received ${payload.artifacts.length} artifacts`)),
   Effect26.flatMap(() => {
     const artifacts = payload.artifacts.map((a) => ({ ...a, status: "NOT_STARTED" }));
     return pipe20(
-      Ref5.get(ctx.currentSyncPortalRef),
-      Effect26.flatMap((portalId) => Ref5.get(ctx.handlersRef).pipe(
-        Effect26.flatMap(
-          (handlers) => portalId !== null && handlers?.onSyncArtifacts ? Effect26.sync(() => handlers.onSyncArtifacts(portalId, artifacts)) : Effect26.void
-        )
-      ))
+      Ref4.get(ctx.handlersRef),
+      Effect26.flatMap(
+        (handlers) => handlers?.onSyncArtifacts ? Effect26.sync(() => handlers.onSyncArtifacts(payload.target_portal, artifacts)) : Effect26.void
+      )
     );
   })
 );
 
 // src/handlers/handle-sync-artifact-response.ts
-import { Effect as Effect27, Ref as Ref6, pipe as pipe21 } from "effect";
+import { Effect as Effect27, Ref as Ref5, pipe as pipe21 } from "effect";
 var handleSyncArtifactResponse = (payload, ctx) => pipe21(
-  Ref6.getAndSet(ctx.pendingArtifactRef, null),
+  Ref5.getAndSet(ctx.pendingArtifactRef, null),
   Effect27.flatMap(
     (pending) => pending !== null ? Effect27.sync(() => pending.resolve(payload)) : Effect27.void
   ),
@@ -2678,21 +2594,21 @@ var handleSyncArtifactResponse = (payload, ctx) => pipe21(
 );
 
 // src/handlers/handle-new-artifacts.ts
-import { Effect as Effect28, Ref as Ref7, pipe as pipe22 } from "effect";
+import { Effect as Effect28, Ref as Ref6, pipe as pipe22 } from "effect";
 var handleNewArtifacts = (payload, ctx) => pipe22(
   Effect28.sync(
     () => console.error(
       `[sync:new-artifacts] Received ${payload.artifacts.length} new artifact(s) for portal ${payload.target_portal}: ${payload.artifacts.map((a) => a.object_type).join(", ")}`
     )
   ),
-  Effect28.flatMap(() => Ref7.get(ctx.handlersRef)),
+  Effect28.flatMap(() => Ref6.get(ctx.handlersRef)),
   Effect28.flatMap(
     (handlers) => handlers?.onNewArtifacts ? Effect28.sync(() => handlers.onNewArtifacts(payload.target_portal, payload.artifacts)) : Effect28.void
   )
 );
 
 // src/handlers/handle-diff-batch.ts
-import { Effect as Effect29, Ref as Ref8, pipe as pipe23 } from "effect";
+import { Effect as Effect29, Ref as Ref7, pipe as pipe23 } from "effect";
 var handleDiffBatch = (payload, ctx) => !payload.success ? Effect29.sync(
   () => console.error(`Diff batch failed: ${payload.error ?? "unknown"}`)
 ) : pipe23(
@@ -2701,46 +2617,42 @@ var handleDiffBatch = (payload, ctx) => !payload.success ? Effect29.sync(
       `[sync:diff:batch] ${payload.object_type}: ${payload.records.length} records, ${payload.associations.length} associations (server_time: ${payload.server_time})${payload.truncated ? " (TRUNCATED)" : ""}`
     )
   ),
-  Effect29.flatMap(() => Ref8.get(ctx.currentSyncPortalRef)),
-  Effect29.flatMap((portalId) => Ref8.get(ctx.handlersRef).pipe(
-    Effect29.flatMap(
-      (handlers) => portalId !== null && handlers?.onDiffBatch ? Effect29.sync(() => handlers.onDiffBatch(portalId, payload)) : Effect29.void
-    )
-  ))
+  Effect29.flatMap(() => Ref7.get(ctx.handlersRef)),
+  Effect29.flatMap(
+    (handlers) => handlers?.onDiffBatch ? Effect29.sync(() => handlers.onDiffBatch(payload.target_portal, payload)) : Effect29.void
+  )
 );
 
 // src/handlers/handle-diff-complete.ts
-import { Effect as Effect30, Ref as Ref9, pipe as pipe24 } from "effect";
+import { Effect as Effect30, Ref as Ref8, pipe as pipe24 } from "effect";
 var handleDiffComplete = (payload, ctx) => pipe24(
   Effect30.sync(
     () => console.error(
       `[sync:diff:complete] ${payload.object_types_processed.length} types, ${payload.total_records} records, ${payload.total_associations} associations`
     )
   ),
-  Effect30.flatMap(() => Ref9.get(ctx.currentSyncPortalRef)),
-  Effect30.flatMap((portalId) => Ref9.get(ctx.handlersRef).pipe(
-    Effect30.flatMap(
-      (handlers) => portalId !== null && handlers?.onDiffComplete ? Effect30.sync(() => handlers.onDiffComplete(portalId, payload)) : Effect30.void
-    )
-  ))
+  Effect30.flatMap(() => Ref8.get(ctx.handlersRef)),
+  Effect30.flatMap(
+    (handlers) => handlers?.onDiffComplete ? Effect30.sync(() => handlers.onDiffComplete(payload.target_portal, payload)) : Effect30.void
+  )
 );
 
 // src/handlers/handle-subscribe-ack.ts
-import { Effect as Effect31, Ref as Ref10, pipe as pipe25 } from "effect";
+import { Effect as Effect31, Ref as Ref9, pipe as pipe25 } from "effect";
 var handleSubscribeAck = (payload, ctx) => pipe25(
   Effect31.sync(
     () => console.error(
       `[sync:subscribe:ack] Portal ${payload.target_portal}: ${payload.success ? "subscribed" : payload.error}`
     )
   ),
-  Effect31.flatMap(() => Ref10.get(ctx.handlersRef)),
+  Effect31.flatMap(() => Ref9.get(ctx.handlersRef)),
   Effect31.flatMap(
     (handlers) => handlers?.onSubscribeAck ? Effect31.sync(() => handlers.onSubscribeAck(payload)) : Effect31.void
   )
 );
 
 // src/handlers/handle-sync-update.ts
-import { Effect as Effect32, Ref as Ref11, pipe as pipe26 } from "effect";
+import { Effect as Effect32, Ref as Ref10, pipe as pipe26 } from "effect";
 var handleSyncUpdate = (payload, ctx) => !payload.success ? Effect32.sync(
   () => console.error(`Sync update failed: ${payload.error ?? "unknown"}`)
 ) : pipe26(
@@ -2749,36 +2661,34 @@ var handleSyncUpdate = (payload, ctx) => !payload.success ? Effect32.sync(
       `[sync:update] ${payload.object_type}: ${payload.records.length} records, ${payload.associations.length} associations (server_time: ${payload.server_time})`
     )
   ),
-  Effect32.flatMap(() => Ref11.get(ctx.currentSyncPortalRef)),
-  Effect32.flatMap((portalId) => Ref11.get(ctx.handlersRef).pipe(
-    Effect32.flatMap(
-      (handlers) => portalId !== null && handlers?.onDiffBatch ? Effect32.sync(() => handlers.onDiffBatch(portalId, payload)) : Effect32.void
-    )
-  ))
+  Effect32.flatMap(() => Ref10.get(ctx.handlersRef)),
+  Effect32.flatMap(
+    (handlers) => handlers?.onDiffBatch ? Effect32.sync(() => handlers.onDiffBatch(payload.target_portal, payload)) : Effect32.void
+  )
 );
 
 // src/handlers/handle-plan-create-response.ts
-import { Effect as Effect33, Ref as Ref12, pipe as pipe27 } from "effect";
+import { Effect as Effect33, Ref as Ref11, pipe as pipe27 } from "effect";
 var handlePlanCreateResponse = (payload, ctx) => pipe27(
-  Ref12.getAndSet(ctx.pendingPlanCreateRef, null),
+  Ref11.getAndSet(ctx.pendingPlanCreateRef, null),
   Effect33.flatMap(
     (pending) => pending ? Effect33.sync(() => pending.resolve(payload)) : Effect33.sync(() => console.error("[plan:create] No pending request for response"))
   )
 );
 
 // src/handlers/handle-plan-list-response.ts
-import { Effect as Effect34, Ref as Ref13, pipe as pipe28 } from "effect";
+import { Effect as Effect34, Ref as Ref12, pipe as pipe28 } from "effect";
 var handlePlanListResponse = (payload, ctx) => pipe28(
-  Ref13.getAndSet(ctx.pendingPlanListRef, null),
+  Ref12.getAndSet(ctx.pendingPlanListRef, null),
   Effect34.flatMap(
     (pending) => pending ? Effect34.sync(() => pending.resolve(payload)) : Effect34.sync(() => console.error("[plan:list] No pending request for response"))
   )
 );
 
 // src/handlers/handle-plugin-data-response.ts
-import { Effect as Effect35, Ref as Ref14, pipe as pipe29 } from "effect";
+import { Effect as Effect35, Ref as Ref13, pipe as pipe29 } from "effect";
 var handlePluginDataResponse = (payload, ctx) => pipe29(
-  Ref14.modify(ctx.pendingPluginRequestsRef, (pendingMap) => {
+  Ref13.modify(ctx.pendingPluginRequestsRef, (pendingMap) => {
     const next = new Map(pendingMap);
     const pending = next.get(payload.request_id);
     next.delete(payload.request_id);
@@ -2812,20 +2722,18 @@ var WS_URL = process.env.websocket_url ?? "wss://mcp-ws.daeda.tech";
 var WebSocketLive = Layer5.effect(
   WebSocketService,
   Effect36.gen(function* () {
-    const stateRef = yield* Ref15.make("disconnected");
-    const portalsRef = yield* Ref15.make([]);
-    const wsRef = yield* Ref15.make(null);
-    const syncedArtifactsRef = yield* Ref15.make(null);
-    const isReconnectingRef = yield* Ref15.make(false);
-    const currentSyncPortalRef = yield* Ref15.make(null);
-    const pendingArtifactRef = yield* Ref15.make(null);
-    const pendingPluginRequestsRef = yield* Ref15.make(/* @__PURE__ */ new Map());
-    const pendingPlanCreateRef = yield* Ref15.make(null);
-    const pendingPlanListRef = yield* Ref15.make(null);
-    const handlersRef = yield* Ref15.make(null);
-    const encryptionKeyRef = yield* Ref15.make(null);
+    const stateRef = yield* Ref14.make("disconnected");
+    const portalsRef = yield* Ref14.make([]);
+    const wsRef = yield* Ref14.make(null);
+    const isReconnectingRef = yield* Ref14.make(false);
+    const pendingArtifactRef = yield* Ref14.make(null);
+    const pendingPluginRequestsRef = yield* Ref14.make(/* @__PURE__ */ new Map());
+    const pendingPlanCreateRef = yield* Ref14.make(null);
+    const pendingPlanListRef = yield* Ref14.make(null);
+    const handlersRef = yield* Ref14.make(null);
+    const encryptionKeyRef = yield* Ref14.make(null);
     const requireWs = pipe30(
-      Ref15.get(wsRef),
+      Ref14.get(wsRef),
       Effect36.flatMap(
         (ws) => ws === null ? Effect36.fail(new WebSocketError({ url: WS_URL, cause: new Error("WebSocket not connected") })) : Effect36.succeed(ws)
       )
@@ -2833,8 +2741,6 @@ var WebSocketLive = Layer5.effect(
     const sendJson = (ws, type, payload) => Effect36.sync(() => ws.send(JSON.stringify({ type, payload })));
     const ctx = {
       portalsRef,
-      syncedArtifactsRef,
-      currentSyncPortalRef,
       pendingArtifactRef,
       pendingPluginRequestsRef,
       pendingPlanCreateRef,
@@ -2875,13 +2781,13 @@ var WebSocketLive = Layer5.effect(
     });
     const wireCloseHandler = (ws) => Effect36.sync(() => {
       ws.onclose = () => {
-        const pending = Effect36.runSync(Ref15.getAndSet(pendingArtifactRef, null));
+        const pending = Effect36.runSync(Ref14.getAndSet(pendingArtifactRef, null));
         if (pending) {
           pending.reject(new WebSocketError({ url: WS_URL, cause: new Error("WebSocket closed") }));
         }
         pipe30(
-          Ref15.set(stateRef, "disconnected"),
-          Effect36.flatMap(() => Ref15.set(wsRef, null)),
+          Ref14.set(stateRef, "disconnected"),
+          Effect36.flatMap(() => Ref14.set(wsRef, null)),
           Effect36.flatMap(() => scheduleReconnect()),
           Effect36.runFork
         );
@@ -2889,7 +2795,7 @@ var WebSocketLive = Layer5.effect(
     });
     const connectInternal = () => pipe30(
       Effect36.sync(() => new WebSocket(WS_URL)),
-      Effect36.tap((ws) => Ref15.set(wsRef, ws)),
+      Effect36.tap((ws) => Ref14.set(wsRef, ws)),
       Effect36.tap((ws) => wireMessageHandler(ws)),
       Effect36.tap((ws) => wireCloseHandler(ws)),
       Effect36.flatMap(
@@ -2897,8 +2803,8 @@ var WebSocketLive = Layer5.effect(
           ws.onopen = () => {
             console.error(`[ws] Connected to ${WS_URL}, sending register`);
             pipe30(
-              Ref15.set(stateRef, "connected"),
-              Effect36.flatMap(() => Ref15.set(isReconnectingRef, false)),
+              Ref14.set(stateRef, "connected"),
+              Effect36.flatMap(() => Ref14.set(isReconnectingRef, false)),
               Effect36.flatMap(() => sendJson(ws, "register", { license_key: LICENSE_KEY })),
               Effect36.runFork
             );
@@ -2911,7 +2817,7 @@ var WebSocketLive = Layer5.effect(
       )
     );
     const scheduleReconnect = () => pipe30(
-      Ref15.getAndSet(isReconnectingRef, true),
+      Ref14.getAndSet(isReconnectingRef, true),
       Effect36.flatMap(
         (wasAlready) => wasAlready ? Effect36.void : pipe30(
           Effect36.sync(() => console.error(`[ws] Scheduling reconnect to ${WS_URL}`)),
@@ -2926,21 +2832,19 @@ var WebSocketLive = Layer5.effect(
       )
     );
     const connect = () => pipe30(
-      Ref15.getAndSet(isReconnectingRef, true),
+      Ref14.getAndSet(isReconnectingRef, true),
       Effect36.flatMap(
         (wasAlready) => wasAlready ? Effect36.void : pipe30(connectInternal(), Effect36.retry(Schedule.fixed(Duration.seconds(3))))
       )
     );
     const send = (data) => pipe30(requireWs, Effect36.flatMap((ws) => Effect36.sync(() => ws.send(JSON.stringify(data)))));
     const sendSyncFull = (portalId) => pipe30(
-      Ref15.set(currentSyncPortalRef, portalId),
-      Effect36.flatMap(() => requireWs),
+      requireWs,
       Effect36.tap(() => Effect36.sync(() => console.error(`[sync:full] Sending request for portal ${portalId}`))),
       Effect36.flatMap((ws) => sendJson(ws, "sync:full", { target_portal: portalId }))
     );
     const sendSyncDiff = (portalId, lastSyncTimes) => pipe30(
-      Ref15.set(currentSyncPortalRef, portalId),
-      Effect36.flatMap(() => requireWs),
+      requireWs,
       Effect36.tap(() => Effect36.sync(() => console.error(`[sync:diff] Sending request for portal ${portalId}`))),
       Effect36.flatMap((ws) => sendJson(ws, "sync:diff", { target_portal: portalId, last_sync_times: lastSyncTimes }))
     );
@@ -2949,17 +2853,21 @@ var WebSocketLive = Layer5.effect(
       Effect36.tap(() => Effect36.sync(() => console.error(`[sync:subscribe] Sending request for portal ${portalId}`))),
       Effect36.flatMap((ws) => sendJson(ws, "sync:subscribe", { target_portal: portalId }))
     );
+    const sendSyncUnsubscribe = (portalId) => pipe30(
+      requireWs,
+      Effect36.tap(() => Effect36.sync(() => console.error(`[sync:unsubscribe] Sending request for portal ${portalId}`))),
+      Effect36.flatMap((ws) => sendJson(ws, "sync:unsubscribe", { target_portal: portalId }))
+    );
     return {
       connect,
       send,
       sendSyncFull,
       sendSyncDiff,
       sendSyncSubscribe,
-      getState: () => Ref15.get(stateRef),
-      getPortals: () => Ref15.get(portalsRef),
-      setPortals: (portals) => Ref15.set(portalsRef, portals),
-      getSyncedArtifacts: () => Ref15.get(syncedArtifactsRef),
-      setSyncedArtifacts: (syncedArtifacts) => Ref15.set(syncedArtifactsRef, syncedArtifacts),
+      sendSyncUnsubscribe,
+      getState: () => Ref14.get(stateRef),
+      getPortals: () => Ref14.get(portalsRef),
+      setPortals: (portals) => Ref14.set(portalsRef, portals),
       requestArtifactUrl: (artifactId) => pipe30(
         requireWs,
         Effect36.flatMap(
@@ -2968,7 +2876,7 @@ var WebSocketLive = Layer5.effect(
               resolve: (payload) => resume(Effect36.succeed(payload)),
               reject: (error) => resume(Effect36.fail(error))
             };
-            Effect36.runSync(Ref15.set(pendingArtifactRef, pending));
+            Effect36.runSync(Ref14.set(pendingArtifactRef, pending));
             ws.send(JSON.stringify({ type: "sync:artifact", payload: { artifact_id: artifactId } }));
           })
         ),
@@ -2987,10 +2895,10 @@ var WebSocketLive = Layer5.effect(
                 resolve: (payload) => resume(Effect36.succeed(payload)),
                 reject: (error) => resume(Effect36.fail(error))
               };
-              const pendingMap = Effect36.runSync(Ref15.get(pendingPluginRequestsRef));
+              const pendingMap = Effect36.runSync(Ref14.get(pendingPluginRequestsRef));
               const next = new Map(pendingMap);
               next.set(requestId, pending);
-              Effect36.runSync(Ref15.set(pendingPluginRequestsRef, next));
+              Effect36.runSync(Ref14.set(pendingPluginRequestsRef, next));
               ws.send(JSON.stringify({
                 type: "sync:plugin-data",
                 payload: {
@@ -3008,7 +2916,7 @@ var WebSocketLive = Layer5.effect(
               })
             }),
             Effect36.tapError(
-              () => Ref15.update(pendingPluginRequestsRef, (pendingMap) => {
+              () => Ref14.update(pendingPluginRequestsRef, (pendingMap) => {
                 const next = new Map(pendingMap);
                 next.delete(requestId);
                 return next;
@@ -3025,7 +2933,7 @@ var WebSocketLive = Layer5.effect(
               resolve: (payload) => resume(Effect36.succeed(payload)),
               reject: (error) => resume(Effect36.fail(error))
             };
-            Effect36.runSync(Ref15.set(pendingPlanCreateRef, pending));
+            Effect36.runSync(Ref14.set(pendingPlanCreateRef, pending));
             ws.send(JSON.stringify({ type: "plan:create", payload: { target_portal: portalId, ...plan.dry_run ? { dry_run: true } : {}, plan } }));
           })
         ),
@@ -3042,7 +2950,7 @@ var WebSocketLive = Layer5.effect(
               resolve: (payload) => resume(Effect36.succeed(payload)),
               reject: (error) => resume(Effect36.fail(error))
             };
-            Effect36.runSync(Ref15.set(pendingPlanListRef, pending));
+            Effect36.runSync(Ref14.set(pendingPlanListRef, pending));
             ws.send(JSON.stringify({ type: "plan:list", payload: { target_portal: portalId, ...status && { status } } }));
           })
         ),
@@ -3051,89 +2959,33 @@ var WebSocketLive = Layer5.effect(
           onTimeout: () => new WebSocketError({ url: WS_URL, cause: new Error("Plan list request timed out") })
         })
       ),
-      registerHandlers: (handlers) => Ref15.set(handlersRef, handlers),
-      getEncryptionKey: () => Ref15.get(encryptionKeyRef)
+      registerHandlers: (handlers) => Ref14.set(handlersRef, handlers),
+      getEncryptionKey: () => Ref14.get(encryptionKeyRef)
     };
   })
 );
 
 // src/tools/portal_selection.ts
 import { z as z12 } from "zod";
-import { Effect as Effect38, pipe as pipe32 } from "effect";
-
-// src/effects/read-connection.ts
 import { Effect as Effect37, pipe as pipe31 } from "effect";
-import { DuckDBInstance as DuckDBInstance2 } from "@duckdb/node-api";
-import fs6 from "fs";
-var handles = /* @__PURE__ */ new Map();
-var getReadConnection = (portalId, encryptionKey) => pipe31(
-  Effect37.sync(() => handles.get(portalId)),
-  Effect37.flatMap(
-    (existing) => existing ? Effect37.succeed(existing.conn) : pipe31(
-      Effect37.sync(() => dbPath(portalId)),
-      Effect37.filterOrFail(
-        (dbFile) => fs6.existsSync(dbFile),
-        () => new DatabaseError({
-          message: `Database not found for portal ${portalId}. Has it been synced?`
-        })
-      ),
-      Effect37.flatMap(
-        (dbFile) => Effect37.tryPromise({
-          try: async () => {
-            const instance = await DuckDBInstance2.create(":memory:");
-            const conn = await instance.connect();
-            const escapedPath = dbFile.replace(/'/g, "''");
-            if (encryptionKey) {
-              const escapedKey = encryptionKey.replace(/'/g, "''");
-              await conn.run(`ATTACH '${escapedPath}' AS portal_db (ENCRYPTION_KEY '${escapedKey}', READ_ONLY)`);
-            } else {
-              await conn.run(`ATTACH '${escapedPath}' AS portal_db (READ_ONLY)`);
-            }
-            await conn.run(`USE portal_db`);
-            handles.set(portalId, { conn, instance });
-            return conn;
-          },
-          catch: (e) => new DatabaseError({
-            message: `Failed to open read connection for portal ${portalId}`,
-            cause: e
-          })
-        })
-      )
-    )
-  )
-);
-var closeAllReadConnections = () => Effect37.sync(() => {
-  for (const [portalId] of handles) {
-    const handle = handles.get(portalId);
-    if (!handle) continue;
-    try {
-      handle.conn.closeSync();
-      handle.instance.closeSync();
-    } catch {
-    }
-    handles.delete(portalId);
-  }
-});
-
-// src/tools/portal_selection.ts
 function getSelectedPortalId(config) {
-  return Effect38.runSync(
-    config.load().pipe(Effect38.map((state) => state.selectedPortalId))
+  return Effect37.runSync(
+    config.load().pipe(Effect37.map((state) => state.selectedPortalId))
   );
 }
 function setSelectedPortalId(config, portalId) {
-  Effect38.runSync(config.save({ selectedPortalId: portalId }));
+  Effect37.runSync(config.save({ selectedPortalId: portalId }));
 }
 function registerPortalSelection(server2, deps) {
-  const { ws, config } = deps;
+  const { ws, config, handoffSelectedPortal } = deps;
   server2.registerPrompt(
     "select-portal",
     {
       description: "Show available HubSpot portals and select one to work with"
     },
     async () => {
-      const targetPortals = Effect38.runSync(ws.getPortals());
-      const selectedPortalId = getSelectedPortalId(config);
+      const targetPortals = Effect37.runSync(ws.getPortals());
+      const selectedPortalId2 = getSelectedPortalId(config);
       if (targetPortals.length === 0) {
         return {
           messages: [{
@@ -3142,7 +2994,7 @@ function registerPortalSelection(server2, deps) {
           }]
         };
       }
-      const currentSelection = selectedPortalId ? targetPortals.find((p) => p.target_portal === selectedPortalId) : null;
+      const currentSelection = selectedPortalId2 ? targetPortals.find((p) => p.target_portal === selectedPortalId2) : null;
       const portalList = targetPortals.map((p) => `- **${p.target_name ?? "Unnamed"}** (ID: ${p.target_portal})`).join("\n");
       const statusText = currentSelection ? `Currently selected: **${currentSelection.target_name ?? "Unnamed"}** (${currentSelection.target_portal})` : "No portal currently selected.";
       return {
@@ -3165,13 +3017,15 @@ Which portal would you like to use? Use the \`set_portal\` tool to select one.`
   server2.registerTool(
     "set_portal",
     {
-      description: "Select which HubSpot portal (account) to work with. This must be set before running any queries or creating plans.",
+      description: `Select which HubSpot portal (account) to work with. Sets the default portal used by tools when portalIds is not explicitly provided. This also triggers a full artifact sync and real-time subscription for the selected portal.
+
+Other tools accept an optional portalIds parameter to target specific portals regardless of this selection. All registered portals are kept warm with background data syncing.`,
       inputSchema: {
         portalId: z12.number().describe("The portal ID to select")
       }
     },
     async ({ portalId }) => {
-      const targetPortals = Effect38.runSync(ws.getPortals());
+      const targetPortals = Effect37.runSync(ws.getPortals());
       const portal = targetPortals.find((p) => p.target_portal === portalId);
       if (!portal) {
         const available = targetPortals.map((p) => p.target_portal).join(", ");
@@ -3183,9 +3037,12 @@ Which portal would you like to use? Use the \`set_portal\` tool to select one.`
           isError: true
         };
       }
-      Effect38.runSync(closeAllReadConnections());
-      setSelectedPortalId(config, portalId);
-      Effect38.runFork(pipe32(ws.sendSyncFull(portalId), Effect38.catchAll(() => Effect38.void)));
+      if (handoffSelectedPortal) {
+        handoffSelectedPortal(portalId);
+      } else {
+        setSelectedPortalId(config, portalId);
+        Effect37.runFork(pipe31(ws.sendSyncFull(portalId), Effect37.catchAll(() => Effect37.void)));
+      }
       return {
         content: [{
           type: "text",
@@ -3208,8 +3065,139 @@ function autoSelectSinglePortal(config, portals) {
 // src/tools/query.ts
 import { z as z13 } from "zod";
 import { Effect as Effect39 } from "effect";
+
+// src/effects/read-connection.ts
+import { Effect as Effect38, pipe as pipe32 } from "effect";
+import { DuckDBInstance as DuckDBInstance2 } from "@duckdb/node-api";
+import fs6 from "fs";
+var handles = /* @__PURE__ */ new Map();
+var closeHandle = (portalId) => {
+  const handle = handles.get(portalId);
+  if (!handle) return;
+  try {
+    handle.conn.closeSync();
+    handle.instance.closeSync();
+  } catch {
+  }
+  handles.delete(portalId);
+};
+var getFreshnessToken = (portalId, dbFile) => Effect38.try({
+  try: () => {
+    const stat = fs6.statSync(dbFile);
+    return `${stat.mtimeMs}:${stat.size}`;
+  },
+  catch: (e) => new DatabaseError({
+    message: `Failed to read database freshness for portal ${portalId}`,
+    cause: e
+  })
+});
+var openReadHandle = (portalId, dbFile, encryptionKey, freshnessToken) => Effect38.tryPromise({
+  try: async () => {
+    const instance = await DuckDBInstance2.create(":memory:");
+    const conn = await instance.connect();
+    const escapedPath = dbFile.replace(/'/g, "''");
+    if (encryptionKey) {
+      const escapedKey = encryptionKey.replace(/'/g, "''");
+      await conn.run(`ATTACH '${escapedPath}' AS portal_db (ENCRYPTION_KEY '${escapedKey}', READ_ONLY)`);
+    } else {
+      await conn.run(`ATTACH '${escapedPath}' AS portal_db (READ_ONLY)`);
+    }
+    await conn.run("USE portal_db");
+    handles.set(portalId, { conn, instance, freshnessToken });
+    return conn;
+  },
+  catch: (e) => new DatabaseError({
+    message: `Failed to open read connection for portal ${portalId}`,
+    cause: e
+  })
+});
+var getReadConnection = (portalId, encryptionKey) => pipe32(
+  Effect38.Do,
+  Effect38.let("dbFile", () => dbPath(portalId)),
+  Effect38.filterOrFail(
+    ({ dbFile }) => fs6.existsSync(dbFile),
+    () => new DatabaseError({
+      message: `Database not found for portal ${portalId}. Has it been synced?`
+    })
+  ),
+  Effect38.bind("freshnessToken", ({ dbFile }) => getFreshnessToken(portalId, dbFile)),
+  Effect38.tap(
+    ({ freshnessToken }) => Effect38.sync(() => {
+      const existing = handles.get(portalId);
+      if (!existing || existing.freshnessToken === freshnessToken) return;
+      closeHandle(portalId);
+    })
+  ),
+  Effect38.flatMap(
+    ({ dbFile, freshnessToken }) => pipe32(
+      Effect38.sync(() => handles.get(portalId)),
+      Effect38.flatMap(
+        (existing) => existing ? Effect38.succeed(existing.conn) : openReadHandle(portalId, dbFile, encryptionKey, freshnessToken)
+      )
+    )
+  )
+);
+
+// src/pure/resolve-portal-ids.ts
+var dedupePortalIds = (portalIds) => {
+  const seen = /* @__PURE__ */ new Set();
+  const deduped = [];
+  for (const portalId of portalIds) {
+    if (seen.has(portalId)) continue;
+    seen.add(portalId);
+    deduped.push(portalId);
+  }
+  return deduped;
+};
+var resolvePortalIds = (explicitPortalIds, selectedPortalId2, portals) => {
+  if (explicitPortalIds !== void 0) {
+    if (explicitPortalIds.length === 0) {
+      return { error: "portalIds must include at least one portal ID." };
+    }
+    const deduped = dedupePortalIds(explicitPortalIds);
+    const availableIds = new Set(portals.map((portal) => portal.target_portal));
+    const invalidPortalIds = deduped.filter((portalId) => !availableIds.has(portalId));
+    if (invalidPortalIds.length > 0) {
+      return {
+        error: `Portal ID(s) not available: ${invalidPortalIds.join(", ")}`
+      };
+    }
+    return {
+      portalIds: deduped,
+      explicit: true
+    };
+  }
+  if (selectedPortalId2 === null) {
+    return {
+      error: "No portal selected. Use the set_portal tool first or pass portalIds."
+    };
+  }
+  return {
+    portalIds: [selectedPortalId2],
+    explicit: false
+  };
+};
+
+// src/tools/query.ts
 var MAX_ROWS = 200;
 var hasLimitClause = (sql) => /\bLIMIT\s+\d+/i.test(sql);
+var runQueryForPortal = async (portalId, trimmedSql, finalSql, getEncryptionKey) => {
+  const conn = await Effect39.runPromise(getReadConnection(portalId, getEncryptionKey()));
+  const start = performance.now();
+  const reader = await conn.runAndReadAll(finalSql);
+  const rows = reader.getRowObjects();
+  const elapsed = (performance.now() - start).toFixed(1);
+  return {
+    rows,
+    rowCount: rows.length,
+    executionTimeMs: elapsed,
+    ...rows.length >= MAX_ROWS && !hasLimitClause(trimmedSql) ? {
+      truncated: true,
+      note: `Results capped at ${MAX_ROWS} rows. Add your own LIMIT clause for different limits.`
+    } : {}
+  };
+};
+var stringifyResult = (value) => JSON.stringify(value, (_, inner) => typeof inner === "bigint" ? Number(inner) : inner, 2);
 function registerQueryTool(server2, deps) {
   const schemaDocs = [
     '- The "sync_metadata" table has: key TEXT, value TEXT',
@@ -3230,6 +3218,10 @@ Use this to answer questions about HubSpot data such as:
 
 Only SELECT statements are allowed. Results are capped at ${MAX_ROWS} rows.
 
+Optional: pass portalIds to run the same query across one or more specific portals. When portalIds is provided, the result is always a JSON object keyed by portal ID, where each value is the query result or an error.
+
+Data freshness: each portal's data is automatically checked for freshness before querying. If new artifacts have been synced since the last query, they are ingested first. Results reflect the latest synced state.
+
 IMPORTANT: Always use the 'status' tool with section "schema" first to discover available object types and property names before writing queries. Do not guess property names.
 
 The database schema:
@@ -3240,14 +3232,15 @@ Example queries:
 - SELECT from_object_type, to_object_type, COUNT(*) as cnt FROM associations GROUP BY 1, 2 ORDER BY cnt DESC
 - SELECT id, json_extract_string(properties, '$.dealname') as name, json_extract_string(properties, '$.amount') as amount FROM deals WHERE json_extract_string(properties, '$.dealstage') = 'closedwon' LIMIT 20`,
       inputSchema: {
-        sql: z13.string().describe("A SELECT SQL query to run against the DuckDB database")
+        sql: z13.string().describe("A SELECT SQL query to run against the DuckDB database"),
+        portalIds: z13.array(z13.number()).optional().describe("Optional explicit portal IDs to query. If provided, results are keyed by portal ID.")
       }
     },
-    async ({ sql }) => {
-      const portalId = deps.getSelectedPortalId();
-      if (portalId === null) {
+    async ({ sql, portalIds }) => {
+      const portalResolution = resolvePortalIds(portalIds, deps.getSelectedPortalId(), deps.getPortals());
+      if ("error" in portalResolution) {
         return {
-          content: [{ type: "text", text: "No portal selected. Use the set_portal tool first." }],
+          content: [{ type: "text", text: portalResolution.error }],
           isError: true
         };
       }
@@ -3259,28 +3252,48 @@ Example queries:
         };
       }
       const finalSql = hasLimitClause(trimmed) ? trimmed : `${trimmed} LIMIT ${MAX_ROWS}`;
-      try {
-        const conn = await Effect39.runPromise(getReadConnection(portalId, deps.getEncryptionKey()));
-        const start = performance.now();
-        const reader = await conn.runAndReadAll(finalSql);
-        const rows = reader.getRowObjects();
-        const elapsed = (performance.now() - start).toFixed(1);
-        const result = {
-          rows,
-          rowCount: rows.length,
-          executionTimeMs: elapsed,
-          ...rows.length >= MAX_ROWS && !hasLimitClause(trimmed) ? { truncated: true, note: `Results capped at ${MAX_ROWS} rows. Add your own LIMIT clause for different limits.` } : {}
-        };
-        return {
-          content: [{ type: "text", text: JSON.stringify(result, (_, v) => typeof v === "bigint" ? Number(v) : v, 2) }]
-        };
-      } catch (e) {
-        const message = e instanceof Error ? e.message : String(e);
-        return {
-          content: [{ type: "text", text: `Query error: ${message}` }],
-          isError: true
-        };
+      if (!portalResolution.explicit) {
+        const [portalId] = portalResolution.portalIds;
+        try {
+          await deps.ensureFresh(portalId);
+          const result = await runQueryForPortal(
+            portalId,
+            trimmed,
+            finalSql,
+            deps.getEncryptionKey
+          );
+          return {
+            content: [{ type: "text", text: stringifyResult(result) }]
+          };
+        } catch (e) {
+          const message = e instanceof Error ? e.message : String(e);
+          return {
+            content: [{ type: "text", text: `Query error: ${message}` }],
+            isError: true
+          };
+        }
+      }
+      const keyedResults = {};
+      let hadAnyErrors = false;
+      for (const portalId of portalResolution.portalIds) {
+        try {
+          await deps.ensureFresh(portalId);
+          keyedResults[String(portalId)] = await runQueryForPortal(
+            portalId,
+            trimmed,
+            finalSql,
+            deps.getEncryptionKey
+          );
+        } catch (e) {
+          hadAnyErrors = true;
+          const message = e instanceof Error ? e.message : String(e);
+          keyedResults[String(portalId)] = { error: message };
+        }
       }
+      return {
+        content: [{ type: "text", text: stringifyResult(keyedResults) }],
+        ...hadAnyErrors ? { isError: true } : {}
+      };
     }
   );
 }
@@ -3327,8 +3340,8 @@ function mapQueryResultsToChartData(rows, columns) {
   }));
   return { labels, datasets };
 }
-function generateChartHtml(options) {
-  const { chartType, data, title, sql } = options;
+function generateChartHtml(options2) {
+  const { chartType, data, title, sql } = options2;
   const datasets = data.datasets.map((ds, i) => ({
     label: ds.label,
     data: ds.data,
@@ -3490,7 +3503,64 @@ function openInBrowser(target) {
 // src/tools/chart.ts
 var MAX_ROWS2 = 200;
 var hasLimitClause2 = (sql) => /\bLIMIT\s+\d+/i.test(sql);
+var runQueryForPortal2 = async (portalId, sql, getEncryptionKey) => {
+  const conn = await Effect40.runPromise(getReadConnection(portalId, getEncryptionKey()));
+  const start = performance.now();
+  const reader = await conn.runAndReadAll(sql);
+  const rows = reader.getRowObjects();
+  const elapsed = (performance.now() - start).toFixed(1);
+  const columns = rows.length > 0 ? Object.keys(rows[0]) : [];
+  return {
+    portalId,
+    rows,
+    columns,
+    executionTimeMs: elapsed
+  };
+};
+var buildMergedPortalChartData = (portalRows) => {
+  const allLabels = [];
+  const seenLabels = /* @__PURE__ */ new Set();
+  for (const entry of portalRows) {
+    const labelColumn = entry.columns[0];
+    for (const row of entry.rows) {
+      const label = String(row[labelColumn] ?? "");
+      if (seenLabels.has(label)) continue;
+      seenLabels.add(label);
+      allLabels.push(label);
+    }
+  }
+  const datasets = [];
+  for (const entry of portalRows) {
+    const labelColumn = entry.columns[0];
+    const dataColumns = entry.columns.slice(1);
+    for (const dataColumn of dataColumns) {
+      const valuesByLabel = /* @__PURE__ */ new Map();
+      for (const row of entry.rows) {
+        const label = String(row[labelColumn] ?? "");
+        const value = Number(row[dataColumn]);
+        valuesByLabel.set(label, Number.isFinite(value) ? value : 0);
+      }
+      datasets.push({
+        label: `Portal ${entry.portalId} - ${dataColumn}`,
+        data: allLabels.map((label) => valuesByLabel.get(label) ?? 0)
+      });
+    }
+  }
+  return {
+    labels: allLabels,
+    datasets
+  };
+};
+var writeChartFile = (chartType, html) => {
+  mkdirSync4(CHARTS_DIR(), { recursive: true });
+  const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+  const filename = `${timestamp}-${chartType}.html`;
+  const filePath = chartFilePath(filename);
+  writeFileSync4(filePath, html, "utf-8");
+  return filePath;
+};
 function registerChartTool(server2, deps) {
+  const openChartFile = deps.openChartFile ?? openInBrowser;
   server2.registerTool(
     "chart",
     {
@@ -3504,6 +3574,10 @@ Use this when the user wants to visualize HubSpot data, such as:
 
 Only SELECT statements are allowed. Results are capped at ${MAX_ROWS2} rows.
 
+Optional: pass portalIds to run the same chart query across one or more specific portals. When portalIds is provided, results include a JSON object keyed by portal ID with per-portal summaries, and chart datasets are labeled by portal.
+
+Data freshness: each portal's data is automatically checked for freshness before charting. Results reflect the latest synced state.
+
 The query results map to the chart as follows:
 - First column \u2192 X-axis labels (categories)
 - Remaining columns \u2192 one dataset per column (Y-axis values, must be numeric)
@@ -3519,14 +3593,15 @@ SELECT json_extract_string(properties, '$.dealstage') as stage, COUNT(*) as coun
       inputSchema: {
         sql: z14.string().describe("A SELECT SQL query. First column = labels, remaining columns = numeric datasets."),
         chart_type: z14.enum(["bar", "line"]).describe("The chart type to render."),
-        title: z14.string().optional().describe("Chart title. Auto-generated from chart type if omitted.")
+        title: z14.string().optional().describe("Chart title. Auto-generated from chart type if omitted."),
+        portalIds: z14.array(z14.number()).optional().describe("Optional explicit portal IDs to chart. If provided, output includes keyed portal results.")
       }
     },
-    async ({ sql, chart_type, title }) => {
-      const portalId = deps.getSelectedPortalId();
-      if (portalId === null) {
+    async ({ sql, chart_type, title, portalIds }) => {
+      const portalResolution = resolvePortalIds(portalIds, deps.getSelectedPortalId(), deps.getPortals());
+      if ("error" in portalResolution) {
         return {
-          content: [{ type: "text", text: "No portal selected. Use the set_portal tool first." }],
+          content: [{ type: "text", text: portalResolution.error }],
           isError: true
         };
       }
@@ -3538,55 +3613,120 @@ SELECT json_extract_string(properties, '$.dealstage') as stage, COUNT(*) as coun
         };
       }
       const finalSql = hasLimitClause2(trimmed) ? trimmed : `${trimmed} LIMIT ${MAX_ROWS2}`;
-      try {
-        const conn = await Effect40.runPromise(getReadConnection(portalId, deps.getEncryptionKey()));
-        const start = performance.now();
-        const reader = await conn.runAndReadAll(finalSql);
-        const rows = reader.getRowObjects();
-        const elapsed = (performance.now() - start).toFixed(1);
-        if (rows.length === 0) {
-          return {
-            content: [{ type: "text", text: "Query returned no rows \u2014 nothing to chart." }],
-            isError: true
+      if (!portalResolution.explicit) {
+        const [portalId] = portalResolution.portalIds;
+        try {
+          await deps.ensureFresh(portalId);
+          const result = await runQueryForPortal2(portalId, finalSql, deps.getEncryptionKey);
+          if (result.rows.length === 0) {
+            return {
+              content: [{ type: "text", text: "Query returned no rows - nothing to chart." }],
+              isError: true
+            };
+          }
+          if (result.columns.length < 2) {
+            return {
+              content: [{
+                type: "text",
+                text: "Chart requires at least 2 columns: one for labels (x-axis) and one for values (y-axis). Your query returned only 1 column."
+              }],
+              isError: true
+            };
+          }
+          const chartData = mapQueryResultsToChartData(result.rows, result.columns);
+          const chartTitle = title ?? `${chart_type === "bar" ? "Bar" : "Line"} Chart - ${result.columns.slice(1).join(", ")} by ${result.columns[0]}`;
+          const html = generateChartHtml({
+            chartType: chart_type,
+            data: chartData,
+            title: chartTitle,
+            sql: trimmed
+          });
+          const filePath = writeChartFile(chart_type, html);
+          openChartFile(filePath);
+          const dataColumns = result.columns.slice(1);
+          const summary = [
+            `Chart generated and opened in browser.`,
+            ``,
+            `Type: ${chart_type}`,
+            `Title: ${chartTitle}`,
+            `Labels (x-axis): ${result.columns[0]} (${result.rows.length} values)`,
+            `Datasets: ${dataColumns.join(", ")}`,
+            `Query time: ${result.executionTimeMs}ms`,
+            `File: ${filePath}`
+          ].join("\n");
+          return {
+            content: [{ type: "text", text: summary }]
           };
-        }
-        const columns = Object.keys(rows[0]);
-        if (columns.length < 2) {
+        } catch (e) {
+          const message = e instanceof Error ? e.message : String(e);
           return {
-            content: [{
-              type: "text",
-              text: "Chart requires at least 2 columns: one for labels (x-axis) and one for values (y-axis). Your query returned only 1 column."
-            }],
+            content: [{ type: "text", text: `Chart error: ${message}` }],
             isError: true
           };
         }
-        const chartData = mapQueryResultsToChartData(rows, columns);
-        const chartTitle = title ?? `${chart_type === "bar" ? "Bar" : "Line"} Chart \u2014 ${columns.slice(1).join(", ")} by ${columns[0]}`;
+      }
+      const keyedPortalResults = {};
+      const successfulPortals = [];
+      let hadErrors = false;
+      for (const portalId of portalResolution.portalIds) {
+        try {
+          await deps.ensureFresh(portalId);
+          const result = await runQueryForPortal2(portalId, finalSql, deps.getEncryptionKey);
+          if (result.rows.length === 0) {
+            hadErrors = true;
+            keyedPortalResults[String(portalId)] = { error: "Query returned no rows - nothing to chart." };
+            continue;
+          }
+          if (result.columns.length < 2) {
+            hadErrors = true;
+            keyedPortalResults[String(portalId)] = {
+              error: "Chart requires at least 2 columns: one for labels (x-axis) and one for values (y-axis)."
+            };
+            continue;
+          }
+          successfulPortals.push(result);
+          keyedPortalResults[String(portalId)] = {
+            rowCount: result.rows.length,
+            executionTimeMs: result.executionTimeMs,
+            labelColumn: result.columns[0],
+            datasetColumns: result.columns.slice(1)
+          };
+        } catch (e) {
+          hadErrors = true;
+          const message = e instanceof Error ? e.message : String(e);
+          keyedPortalResults[String(portalId)] = { error: message };
+        }
+      }
+      if (successfulPortals.length === 0) {
+        return {
+          content: [{ type: "text", text: JSON.stringify(keyedPortalResults, null, 2) }],
+          isError: true
+        };
+      }
+      try {
+        const chartData = buildMergedPortalChartData(successfulPortals);
+        const chartTitle = title ?? `${chart_type === "bar" ? "Bar" : "Line"} Chart - Portal Comparison`;
         const html = generateChartHtml({
           chartType: chart_type,
           data: chartData,
           title: chartTitle,
           sql: trimmed
         });
-        mkdirSync4(CHARTS_DIR, { recursive: true });
-        const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-        const filename = `${timestamp}-${chart_type}.html`;
-        const filePath = chartFilePath(filename);
-        writeFileSync4(filePath, html, "utf-8");
-        openInBrowser(filePath);
-        const dataColumns = columns.slice(1);
-        const summary = [
-          `Chart generated and opened in browser.`,
-          ``,
-          `Type: ${chart_type}`,
-          `Title: ${chartTitle}`,
-          `Labels (x-axis): ${columns[0]} (${rows.length} values)`,
-          `Datasets: ${dataColumns.join(", ")}`,
-          `Query time: ${elapsed}ms`,
-          `File: ${filePath}`
-        ].join("\n");
+        const filePath = writeChartFile(chart_type, html);
+        openChartFile(filePath);
+        const response = {
+          chart: {
+            type: chart_type,
+            title: chartTitle,
+            labels: chartData.labels.length,
+            datasets: chartData.datasets.length,
+            file: filePath
+          },
+          portals: keyedPortalResults
+        };
         return {
-          content: [{ type: "text", text: summary }]
+          content: [{ type: "text", text: JSON.stringify(response, null, 2) }],
+          ...hadErrors ? { isError: true } : {}
         };
       } catch (e) {
         const message = e instanceof Error ? e.message : String(e);
@@ -3616,25 +3756,21 @@ function getDbFileSize(portalId) {
   return fs7.statSync(db).size;
 }
 async function buildConnectionSection(deps) {
-  const selectedPortalId = deps.getSelectedPortalId();
+  const selectedPortalId2 = deps.getSelectedPortalId();
   const connectionState = deps.getConnectionState();
   const portals = deps.getPortals();
   return {
     connectionState,
-    selectedPortalId,
+    selectedPortalId: selectedPortalId2,
     portals: portals.map((p) => ({
       portalId: p.target_portal,
       name: p.target_name,
-      selected: p.target_portal === selectedPortalId
+      selected: p.target_portal === selectedPortalId2
     })),
     totalPortals: portals.length
   };
 }
-async function buildSchemaSection(getSelectedPortalId2, getEncryptionKey) {
-  const portalId = getSelectedPortalId2();
-  if (portalId === null) {
-    return { error: "No portal selected. Use the set_portal tool first." };
-  }
+async function buildSchemaSection(portalId, getEncryptionKey) {
   const conn = await Effect41.runPromise(getReadConnection(portalId, getEncryptionKey()));
   const allPluginTableNames = new Set(getAllTableNames());
   const sectionResults = await Promise.all(
@@ -3666,25 +3802,66 @@ function registerStatusTool(server2, deps) {
 
 IMPORTANT: Always call this with section "schema" before writing any queries. It reveals which CRM object types are synced (contacts, companies, deals, tickets, custom objects, etc.), their available property names, record counts, and association types. This prevents query errors from incorrect property or object names.
 
+Optional: pass portalIds to fetch schema status for specific portals. When portalIds is provided, schema output is a JSON object keyed by portal ID.
+
+Data readiness: all registered portals are synced in the background. Schema status reflects which object types have completed syncing and are queryable. If a portal is still syncing, some object types may not yet appear.
+
 Use "connection" to check which portals are available and which is selected.
 Use "schema" to discover object types, property keys, record counts, and associations before writing queries.
 Use "all" to get everything at once.`,
     inputSchema: {
       section: SECTION_SCHEMA.describe(
         'Which information to retrieve: "connection" for portal list and state, "schema" for database structure, "all" for both.'
-      )
+      ),
+      portalIds: z15.array(z15.number()).optional().describe("Optional explicit portal IDs for schema status. If provided, schema output is keyed by portal ID.")
     }
-  }, async ({ section }) => {
+  }, async ({ section, portalIds }) => {
     try {
       let result = {};
+      let explicitSchemaHadErrors = false;
       if (section === "connection" || section === "all") {
         result.connection = await buildConnectionSection(deps);
       }
       if (section === "schema" || section === "all") {
-        result.schema = await buildSchemaSection(deps.getSelectedPortalId, deps.getEncryptionKey);
+        const portalResolution = resolvePortalIds(
+          portalIds,
+          deps.getSelectedPortalId(),
+          deps.getPortals()
+        );
+        if ("error" in portalResolution) {
+          if (portalIds === void 0) {
+            result.schema = { error: portalResolution.error };
+          } else {
+            return {
+              content: [{ type: "text", text: portalResolution.error }],
+              isError: true
+            };
+          }
+        } else if (portalResolution.explicit) {
+          const schemaByPortal = {};
+          for (const portalId of portalResolution.portalIds) {
+            try {
+              await deps.ensureFresh(portalId);
+              schemaByPortal[String(portalId)] = await buildSchemaSection(
+                portalId,
+                deps.getEncryptionKey
+              );
+            } catch (e) {
+              explicitSchemaHadErrors = true;
+              const message = e instanceof Error ? e.message : String(e);
+              schemaByPortal[String(portalId)] = { error: message };
+            }
+          }
+          result.schema = schemaByPortal;
+        } else {
+          const [portalId] = portalResolution.portalIds;
+          await deps.ensureFresh(portalId);
+          result.schema = await buildSchemaSection(portalId, deps.getEncryptionKey);
+        }
       }
       return {
-        content: [{ type: "text", text: JSON.stringify(result) }]
+        content: [{ type: "text", text: JSON.stringify(result) }],
+        ...explicitSchemaHadErrors ? { isError: true } : {}
       };
     } catch (e) {
       const message = e instanceof Error ? e.message : String(e);
@@ -3700,34 +3877,39 @@ Use "all" to get everything at once.`,
 import { z as z61 } from "zod";
 
 // src/tools/draft_state.ts
-var currentDraft = null;
-var getDraft = () => currentDraft;
-var hasDraft = () => currentDraft !== null;
-var setDraft = (plan) => {
-  currentDraft = plan;
-};
-var addOperationsToDraft = (ops) => {
-  if (!currentDraft) throw new Error("No draft plan exists");
-  currentDraft.operations.push(...ops);
-  return currentDraft.operations.length;
-};
-var replaceOperationInDraft = (index, op) => {
-  if (!currentDraft) throw new Error("No draft plan exists");
-  if (index < 0 || index >= currentDraft.operations.length) {
-    throw new Error(`Operation index ${index} out of bounds (0-${currentDraft.operations.length - 1})`);
+var drafts = /* @__PURE__ */ new Map();
+var requireDraft = (portalId) => {
+  const draft = drafts.get(portalId);
+  if (!draft) throw new Error("No draft plan exists");
+  return draft;
+};
+var getDraft = (portalId) => drafts.get(portalId) ?? null;
+var hasDraft = (portalId) => drafts.has(portalId);
+var setDraft = (portalId, plan) => {
+  drafts.set(portalId, plan);
+};
+var addOperationsToDraft = (portalId, ops) => {
+  const draft = requireDraft(portalId);
+  draft.operations.push(...ops);
+  return draft.operations.length;
+};
+var replaceOperationInDraft = (portalId, index, op) => {
+  const draft = requireDraft(portalId);
+  if (index < 0 || index >= draft.operations.length) {
+    throw new Error(`Operation index ${index} out of bounds (0-${draft.operations.length - 1})`);
   }
-  currentDraft.operations[index] = op;
+  draft.operations[index] = op;
 };
-var removeOperationFromDraft = (index) => {
-  if (!currentDraft) throw new Error("No draft plan exists");
-  if (index < 0 || index >= currentDraft.operations.length) {
-    throw new Error(`Operation index ${index} out of bounds (0-${currentDraft.operations.length - 1})`);
+var removeOperationFromDraft = (portalId, index) => {
+  const draft = requireDraft(portalId);
+  if (index < 0 || index >= draft.operations.length) {
+    throw new Error(`Operation index ${index} out of bounds (0-${draft.operations.length - 1})`);
   }
-  currentDraft.operations.splice(index, 1);
-  return currentDraft.operations.length;
+  draft.operations.splice(index, 1);
+  return draft.operations.length;
 };
-var clearDraft = () => {
-  currentDraft = null;
+var clearDraft = (portalId) => {
+  drafts.delete(portalId);
 };
 
 // src/pure/operation-conversion.ts
@@ -3907,12 +4089,12 @@ var updatePropertyMeta = {
     }
   },
   toNested: (description, fields44) => {
-    const { object_type, property_name, new_label, new_description, new_group_name, options, ...rest } = fields44;
+    const { object_type, property_name, new_label, new_description, new_group_name, options: options2, ...rest } = fields44;
     const updates = {};
     if (new_label !== void 0) updates.label = new_label;
     if (new_description !== void 0) updates.description = new_description;
     if (new_group_name !== void 0) updates.group_name = new_group_name;
-    if (options !== void 0) updates.options = options;
+    if (options2 !== void 0) updates.options = options2;
     return { type: "update_property", object_type, property_name, description, updates, ...rest };
   },
   requiredScopes: (op) => [getWriteScope(op.object_type)],
@@ -6358,7 +6540,7 @@ var buildRuleLines = (rules, optionLabelMap) => rules.map((rule) => {
   const labels = rule.visible_options.map((v) => optionLabelMap.get(v) ?? v).join(", ");
   return `   - When "${rule.controlling_property}" = "${rule.controlling_value}": Show "${labels}"`;
 }).join("\n");
-var buildOptionLabelMap = (options) => new Map(options.map((o) => [o.value, o.label]));
+var buildOptionLabelMap = (options2) => new Map(options2.map((o) => [o.value, o.label]));
 var getUniqueControllingProperties = (rules) => [...new Set(rules.map((r) => r.controlling_property))];
 var buildConditionalOptionsTask = (property, objectType, rules) => {
   const subject = `Configure conditional options for "${property.label}" on ${formatObjectType(objectType)}`;
@@ -10765,12 +10947,18 @@ var summariseFields = (op) => {
     return `${k}: ${String(v)}`;
   }).join(", ");
 };
-var formatPlanView = () => {
-  const draft = getDraft();
+var formatPlanView = (portalId) => {
+  const draft = getDraft(portalId);
+  if (!draft) {
+    return [
+      `Portal ${portalId}: no draft plan exists.`,
+      "Provide title and description to start a new plan."
+    ].join("\n");
+  }
   const lines = [
-    `Draft Plan: "${draft.title}"`,
+    `Portal ${portalId} Draft Plan: "${draft.title}"`,
     `Description: ${draft.description}`,
-    ``
+    ""
   ];
   if (draft.operations.length === 0) {
     lines.push("Operations: (none)");
@@ -10788,9 +10976,36 @@ var formatPlanView = () => {
   }
   return lines.join("\n");
 };
-function registerBuildPlanTool(server2) {
+var serialiseDraft = (portalId) => {
+  const draft = getDraft(portalId);
+  if (!draft) return null;
+  return {
+    title: draft.title,
+    description: draft.description,
+    operationCount: draft.operations.length,
+    operations: draft.operations.map((operation, index) => {
+      const op = operation;
+      return {
+        index: index + 1,
+        type: String(op.type ?? "unknown"),
+        description: String(op.description ?? "")
+      };
+    })
+  };
+};
+var formatDraftResponse = (portalIds, explicit) => {
+  if (!explicit) {
+    return formatPlanView(portalIds[0]);
+  }
+  const keyed = {};
+  for (const portalId of portalIds) {
+    keyed[String(portalId)] = serialiseDraft(portalId);
+  }
+  return JSON.stringify(keyed, null, 2);
+};
+function registerBuildPlanTool(server2, deps) {
   server2.registerTool("build_plan", {
-    description: `Use this tool whenever the user wants to make changes to their HubSpot CRM configuration or data. This is the ONLY way to modify HubSpot \u2014 there is no direct API access. All CRM write operations must go through a plan.
+    description: `Use this tool whenever the user wants to make changes to their HubSpot CRM configuration or data. This is the ONLY way to modify HubSpot - there is no direct API access. All CRM write operations must go through a plan.
 
 Supports ${OPERATION_TYPE_COUNT} operation types across these categories:
 - Properties & groups: create, update, or delete custom properties and property groups
@@ -10803,20 +11018,25 @@ Supports ${OPERATION_TYPE_COUNT} operation types across these categories:
 
 CREATING A PLAN:
   Provide title + description (+ optional operations) to start a new draft.
-  If a draft already exists, pass force: true to discard it and start fresh.
+  If a targeted draft already exists, pass force: true to discard it and start fresh.
+
+PORTAL TARGETING:
+  Optionally pass portalIds to target one or more specific portals.
+  If omitted, the selected portal is used.
+  When portalIds is explicit, the response is a JSON object keyed by portal ID.
 
 ADDING OPERATIONS:
-  Provide operations to append them to the existing draft.
+  Provide operations to append them to existing targeted drafts.
   Each operation needs: type, description, and fields.
-  Use describe_operations first to discover available types and their required fields.
+  Use describe_operations first to discover available types and required fields.
 
 EDITING OPERATIONS:
   Provide edits to replace or remove operations by their 1-based index.
-  Edits are applied atomically \u2014 if any replacement fails validation, no changes are made.
+  Edits require exactly one targeted portal.
+  Edits are applied atomically - if any replacement fails validation, no changes are made.
 
 VIEWING THE PLAN:
-  Call with no parameters (or just title/description) to see the current draft state.
-  The current plan view is always returned in the response.
+  Call with no operations/edits to see current draft state for the targeted portal(s).
 
 IMPORTANT: After building the plan, present it to the user and ask for confirmation before calling submit_plan.
 
@@ -10827,43 +11047,77 @@ WORKFLOW:
 4. submit_plan (dry_run: true) - Validate without saving (optional)
 5. submit_plan - Submit after user confirms`,
     inputSchema: {
-      title: z61.string().optional().describe("Short, descriptive title (required when creating a new plan)"),
-      description: z61.string().optional().describe("Detailed explanation of what the plan does and why (required when creating a new plan)"),
-      operations: z61.array(FlatOperationSchema).optional().describe("Operations to add to the plan"),
+      title: z61.string().optional().describe("Short, descriptive title (required when creating a new draft)"),
+      description: z61.string().optional().describe("Detailed explanation of what the plan does and why (required when creating a new draft)"),
+      operations: z61.array(FlatOperationSchema).optional().describe("Operations to add to targeted draft(s)"),
       edits: z61.array(EditSchema).optional().describe("Edits to apply: replace or remove operations by 1-based index"),
-      force: z61.boolean().optional().describe("If true, discard any existing draft and start fresh")
+      force: z61.boolean().optional().describe("If true, discard targeted draft(s) and start fresh"),
+      portalIds: z61.array(z61.number()).optional().describe("Optional explicit portal IDs to target. If provided, responses are keyed by portal ID.")
+    }
+  }, async ({ title, description, operations, edits, force, portalIds }) => {
+    const portalResolution = resolvePortalIds(
+      portalIds,
+      deps.getSelectedPortalId(),
+      deps.getPortals()
+    );
+    if ("error" in portalResolution) {
+      return {
+        content: [{ type: "text", text: portalResolution.error }],
+        isError: true
+      };
+    }
+    const targetPortalIds = portalResolution.portalIds;
+    const explicit = portalResolution.explicit;
+    if (edits && edits.length > 0 && targetPortalIds.length !== 1) {
+      return {
+        content: [{ type: "text", text: "When using edits, target exactly one portal. Provide a single portal ID in portalIds." }],
+        isError: true
+      };
     }
-  }, async ({ title, description, operations, edits, force }) => {
-    if (!hasDraft()) {
+    const missingPortalIds = targetPortalIds.filter((portalId) => !hasDraft(portalId));
+    if (force) {
       if (!title || !description) {
         return {
-          content: [{ type: "text", text: "No draft plan exists. Provide title and description to start a new plan." }],
+          content: [{ type: "text", text: "When using force: true, provide title and description for the new draft." }],
           isError: true
         };
       }
-      setDraft({ title, description, operations: [] });
-    } else if (force) {
-      if (!title || !description) {
+      for (const portalId of targetPortalIds) {
+        clearDraft(portalId);
+        setDraft(portalId, { title, description, operations: [] });
+      }
+    } else {
+      if (missingPortalIds.length > 0 && (!title || !description)) {
+        const plural = missingPortalIds.length > 1 ? "portals" : "portal";
         return {
-          content: [{ type: "text", text: "When using force: true, provide title and description for the new plan." }],
+          content: [{
+            type: "text",
+            text: `No draft plan exists for ${plural}: ${missingPortalIds.join(", ")}. Provide title and description to start a new draft.`
+          }],
           isError: true
         };
       }
-      clearDraft();
-      setDraft({ title, description, operations: [] });
-    } else {
-      if (title || description) {
-        const draft = getDraft();
-        if (title) draft.title = title;
-        if (description) draft.description = description;
+      for (const portalId of targetPortalIds) {
+        if (!hasDraft(portalId)) {
+          setDraft(portalId, { title, description, operations: [] });
+          continue;
+        }
+        if (title || description) {
+          const draft = getDraft(portalId);
+          if (title) draft.title = title;
+          if (description) draft.description = description;
+        }
       }
     }
     if (edits && edits.length > 0) {
-      const draft = getDraft();
+      const portalId = targetPortalIds[0];
+      const draft = getDraft(portalId);
       const opCount = draft.operations.length;
       if (opCount === 0) {
         return {
-          content: [{ type: "text", text: "Draft has no operations to edit. Provide operations to add them first.\n\n" + formatPlanView() }],
+          content: [{ type: "text", text: `Draft has no operations to edit. Provide operations to add them first.
+
+${formatPlanView(portalId)}` }],
           isError: true
         };
       }
@@ -10872,7 +11126,7 @@ WORKFLOW:
           return {
             content: [{ type: "text", text: `Index ${edit.index} is out of range. Draft has ${opCount} operation(s) (indices 1-${opCount}).
 
-${formatPlanView()}` }],
+${formatPlanView(portalId)}` }],
             isError: true
           };
         }
@@ -10880,18 +11134,17 @@ ${formatPlanView()}` }],
           return {
             content: [{ type: "text", text: `Edit at index ${edit.index}: "replace" action requires an operation.
 
-${formatPlanView()}` }],
+${formatPlanView(portalId)}` }],
             isError: true
           };
         }
       }
-      const replaces = edits.filter((e) => e.action === "replace");
-      const removes = edits.filter((e) => e.action === "remove");
+      const replaces = edits.filter((edit) => edit.action === "replace");
+      const removes = edits.filter((edit) => edit.action === "remove");
       const nestedReplacements = [];
       const errors = [];
       for (const edit of replaces) {
-        const flat = edit.operation;
-        const nested = nestOperation(flat);
+        const nested = nestOperation(edit.operation);
         if (typeof nested === "string") {
           errors.push(`Index ${edit.index}: ${nested}`);
           continue;
@@ -10904,7 +11157,6 @@ ${formatPlanView()}` }],
         nestedReplacements.push({ zeroIndex: edit.index - 1, nested });
       }
       if (errors.length > 0) {
-        const hint = "Use describe_operations to check field requirements.";
         return {
           content: [{
             type: "text",
@@ -10912,44 +11164,58 @@ ${formatPlanView()}` }],
 
 ${errors.join("\n\n")}
 
-${hint}
+Use describe_operations to check field requirements.
 
-${formatPlanView()}`
+${formatPlanView(portalId)}`
           }],
           isError: true
         };
       }
       for (const { zeroIndex, nested } of nestedReplacements) {
-        replaceOperationInDraft(zeroIndex, nested);
+        replaceOperationInDraft(portalId, zeroIndex, nested);
       }
-      const removeIndices = removes.map((e) => e.index - 1).sort((a, b) => b - a);
-      for (const idx of removeIndices) {
-        removeOperationFromDraft(idx);
+      const removeIndices = removes.map((edit) => edit.index - 1).sort((a, b) => b - a);
+      for (const index of removeIndices) {
+        removeOperationFromDraft(portalId, index);
       }
     }
     if (operations && operations.length > 0) {
-      const draft = getDraft();
-      const startIndex = draft.operations.length + 1;
-      const { nested, errors } = convertAndValidateOperations(operations, startIndex);
-      if (errors.length > 0) {
-        const hint = "Use describe_operations to see the required fields for each operation type.";
+      const validatedByPortal = /* @__PURE__ */ new Map();
+      const portalErrors = [];
+      for (const portalId of targetPortalIds) {
+        const draft = getDraft(portalId);
+        const startIndex = draft.operations.length + 1;
+        const { nested, errors } = convertAndValidateOperations(operations, startIndex);
+        if (errors.length > 0) {
+          portalErrors.push(`Portal ${portalId}:
+${errors.join("\n")}`);
+          continue;
+        }
+        validatedByPortal.set(portalId, nested);
+      }
+      if (portalErrors.length > 0) {
         return {
           content: [{
             type: "text",
-            text: `${errors.length} operation(s) failed validation:
-
-${errors.join("\n\n")}
+            text: `${portalErrors.length} portal(s) failed operation validation:
 
-${hint}
+${portalErrors.join("\n\n")}
 
-${formatPlanView()}`
+Use describe_operations to see the required fields for each operation type.`
           }],
           isError: true
         };
       }
-      addOperationsToDraft(nested);
+      for (const portalId of targetPortalIds) {
+        addOperationsToDraft(portalId, validatedByPortal.get(portalId) ?? []);
+      }
     }
-    return { content: [{ type: "text", text: formatPlanView() }] };
+    return {
+      content: [{
+        type: "text",
+        text: formatDraftResponse(targetPortalIds, explicit)
+      }]
+    };
   });
 }
 
@@ -10997,16 +11263,16 @@ import { Effect as Effect89 } from "effect";
 var formatFixHint = (issue, summary) => {
   const opNum = issue.operation_index + 1;
   const opInfo = summary?.operations[issue.operation_index];
-  const label = opInfo ? `${opInfo.type} "${opInfo.description}"` : `operation`;
+  const label = opInfo ? `${opInfo.type} "${opInfo.description}"` : "operation";
   const severity = issue.severity === "error" ? "ERROR" : "WARNING";
-  return `  ${severity} [Op ${opNum}] (${label}): ${issue.code} \u2014 ${issue.message}`;
+  return `  ${severity} [Op ${opNum}] (${label}): ${issue.code} - ${issue.message}`;
 };
 var formatValidationIssues = (response) => {
   const v = response.validation;
   const lines = [];
   if (response.summary) {
     lines.push(`Summary: ${response.summary.operation_count} operation(s)`);
-    lines.push(``);
+    lines.push("");
   }
   const errors = v.issues.filter((i) => i.severity === "error");
   const warnings = v.issues.filter((i) => i.severity === "warning");
@@ -11015,165 +11281,272 @@ var formatValidationIssues = (response) => {
     for (const issue of errors) {
       lines.push(formatFixHint(issue, response.summary));
     }
-    lines.push(``);
+    lines.push("");
   }
   if (warnings.length > 0) {
     lines.push(`Warnings (${warnings.length}):`);
     for (const issue of warnings) {
       lines.push(formatFixHint(issue, response.summary));
     }
-    lines.push(``);
+    lines.push("");
   }
   if (!v.scope_check?.valid) {
     lines.push(`Scope issue: Missing scopes: ${v.scope_check.missingScopes.join(", ")}`);
-    lines.push(`The user may need to re-authorize the portal with write permissions.`);
-    lines.push(``);
+    lines.push("The user may need to re-authorize the portal with write permissions.");
+    lines.push("");
   }
   return lines;
 };
+var submitPortalDraft = async (portalId, dryRun, deps) => {
+  const draft = getDraft(portalId);
+  if (!draft) {
+    return {
+      kind: "error",
+      message: "No draft plan exists. Start one with build_plan first."
+    };
+  }
+  if (draft.operations.length === 0) {
+    return {
+      kind: "error",
+      message: "Draft plan has no operations. Use build_plan to add operations before submitting."
+    };
+  }
+  try {
+    const response = await Effect89.runPromise(
+      deps.ws.sendPlanCreate(portalId, {
+        title: draft.title,
+        description: draft.description,
+        operations: draft.operations,
+        dry_run: dryRun
+      })
+    );
+    if (!response.success && !response.validation) {
+      return {
+        kind: "error",
+        message: `Failed to submit plan: ${response.error ?? "Unknown error"}`
+      };
+    }
+    if (!response.success && response.validation) {
+      return {
+        kind: "validation_failed",
+        response
+      };
+    }
+    if (response.dry_run) {
+      return {
+        kind: "dry_run_success",
+        response
+      };
+    }
+    clearDraft(portalId);
+    return {
+      kind: "submit_success",
+      response
+    };
+  } catch (e) {
+    const message = e instanceof Error ? e.message : String(e);
+    return {
+      kind: "error",
+      message: `Error submitting plan: ${message}`
+    };
+  }
+};
+var toKeyedResult = (result) => {
+  switch (result.kind) {
+    case "error":
+      return { success: false, error: result.message };
+    case "validation_failed":
+      return {
+        success: false,
+        error: "Plan validation failed",
+        summary: result.response.summary,
+        validation: result.response.validation,
+        scope_warning: result.response.scope_warning
+      };
+    case "dry_run_success":
+      return {
+        success: true,
+        dry_run: true,
+        summary: result.response.summary,
+        validation: result.response.validation,
+        scope_warning: result.response.scope_warning
+      };
+    case "submit_success":
+      return {
+        success: true,
+        dry_run: false,
+        plan_id: result.response.plan_id,
+        summary: result.response.summary,
+        validation: result.response.validation,
+        scope_warning: result.response.scope_warning
+      };
+  }
+};
+var formatSinglePortalResult = (result) => {
+  if (result.kind === "error") {
+    return {
+      text: result.message,
+      isError: true
+    };
+  }
+  if (result.kind === "validation_failed") {
+    const response2 = result.response;
+    const lines2 = [
+      "Plan validation failed - the plan was NOT saved. Fix the issues below and resubmit.",
+      "",
+      ...formatValidationIssues(response2),
+      "Use build_plan with edits to fix issues, then submit_plan again."
+    ];
+    return { text: lines2.join("\n") };
+  }
+  if (result.kind === "dry_run_success") {
+    const response2 = result.response;
+    const summary2 = response2.summary;
+    const opLines2 = summary2.operations.map(
+      (op, i) => `  ${i + 1}. [${op.type}] ${op.description} (${op.record_count} records)`
+    );
+    const lines2 = [
+      "Validation passed - plan is ready to submit.",
+      "",
+      "Summary:",
+      `  Operations: ${summary2.operation_count}`,
+      `  Total records affected: ${summary2.total_record_count}`,
+      "",
+      "Operations:",
+      ...opLines2
+    ];
+    if (response2.validation?.issues && response2.validation.issues.length > 0) {
+      lines2.push("", ...formatValidationIssues(response2));
+    }
+    if (response2.scope_warning) {
+      lines2.push("", `WARNING: ${response2.scope_warning}`);
+    }
+    lines2.push("", "Draft is preserved. Call submit_plan() (without dry_run) to save the plan.");
+    return { text: lines2.join("\n") };
+  }
+  const response = result.response;
+  const summary = response.summary;
+  const opLines = summary.operations.map(
+    (op, i) => `  ${i + 1}. [${op.type}] ${op.description} (${op.record_count} records)`
+  );
+  const lines = [
+    "Plan submitted successfully.",
+    "",
+    `Plan ID: ${response.plan_id}`,
+    "Status: DRAFT (awaiting review in HubSpot UI)",
+    "",
+    "Summary:",
+    `  Operations: ${summary.operation_count}`,
+    `  Total records affected: ${summary.total_record_count}`,
+    "",
+    "Operations:",
+    ...opLines
+  ];
+  if (response.validation) {
+    const validation = response.validation;
+    if (validation.issues && validation.issues.length > 0) {
+      lines.push("", "Validation warnings:");
+      for (const issue of validation.issues) {
+        lines.push(`  - [Op ${issue.operation_index + 1}] ${issue.code}: ${issue.message}`);
+      }
+    }
+    if (!validation.scope_check?.valid) {
+      lines.push("", `Scope warning: Missing scopes: ${validation.scope_check.missingScopes.join(", ")}`);
+    }
+  }
+  if (response.scope_warning) {
+    lines.push("", `WARNING: ${response.scope_warning}`);
+  }
+  lines.push("", "The user can review and execute this plan in their HubSpot settings page.");
+  return { text: lines.join("\n") };
+};
 function registerSubmitPlanTool(server2, deps) {
   server2.registerTool("submit_plan", {
-    description: `Validate and/or submit the current draft write plan.
+    description: `Validate and/or submit draft write plans.
+
+IMPORTANT: Always present the plan to the user and get explicit confirmation BEFORE calling this tool. Never submit a plan without user approval.
 
-IMPORTANT: Always present the plan to the user and get their explicit confirmation BEFORE calling this tool. Never submit a plan without user approval.
+PORTAL TARGETING:
+  Optionally pass portalIds to submit one or more specific portal drafts.
+  If omitted, the selected portal is used.
+  When portalIds is explicit, results are a JSON object keyed by portal ID.
 
 MODES:
-  - dry_run: true  \u2014 Validate only. Runs full server-side validation (scopes, HubSpot checks) without saving. The draft is preserved so you can fix issues with build_plan.
-  - dry_run: false (default) \u2014 Validate AND save. If valid, saves the plan as a DRAFT for user review in HubSpot. The draft is cleared on success.
+  - dry_run: true  - Validate only. Runs full server-side validation (scopes, HubSpot checks) without saving. Drafts are preserved.
+  - dry_run: false (default) - Validate AND save. Successful portals are saved as DRAFT and their drafts are cleared.
 
 RECOMMENDED WORKFLOW:
 1. Build the plan with build_plan
 2. Present the plan to the user and ask for confirmation
 3. Call submit_plan(dry_run: true) to validate
 4. Fix any issues with build_plan(edits: [...])
-5. Call submit_plan() to save after user confirms
-
-After a successful submission, the user can review and execute the plan in their HubSpot settings page.`,
+5. Call submit_plan() to save after user confirms`,
     inputSchema: {
-      dry_run: z63.boolean().optional().describe("If true, validate only without saving. Defaults to false.")
-    }
-  }, async ({ dry_run }) => {
-    const draft = getDraft();
-    if (!draft) {
-      return {
-        content: [{ type: "text", text: "No draft plan exists. Start one with build_plan first." }],
-        isError: true
-      };
-    }
-    if (draft.operations.length === 0) {
-      return {
-        content: [{ type: "text", text: "Draft plan has no operations. Use build_plan to add operations before submitting." }],
-        isError: true
-      };
-    }
-    const portalId = deps.getSelectedPortalId();
-    if (portalId === null) {
+      dry_run: z63.boolean().optional().describe("If true, validate only without saving. Defaults to false."),
+      portalIds: z63.array(z63.number()).optional().describe("Optional explicit portal IDs to submit. If provided, results are keyed by portal ID.")
+    }
+  }, async ({ dry_run, portalIds }) => {
+    const portalResolution = resolvePortalIds(
+      portalIds,
+      deps.getSelectedPortalId(),
+      deps.getPortals()
+    );
+    if ("error" in portalResolution) {
       return {
-        content: [{ type: "text", text: "No portal selected. Use the set_portal tool first." }],
+        content: [{ type: "text", text: portalResolution.error }],
         isError: true
       };
     }
-    try {
-      const response = await Effect89.runPromise(
-        deps.ws.sendPlanCreate(portalId, {
-          title: draft.title,
-          description: draft.description,
-          operations: draft.operations,
-          dry_run: dry_run ?? false
-        })
-      );
-      if (!response.success && !response.validation) {
-        return {
-          content: [{ type: "text", text: `Failed to submit plan: ${response.error ?? "Unknown error"}` }],
-          isError: true
-        };
-      }
-      if (!response.success && response.validation) {
-        const lines2 = [
-          `Plan validation failed \u2014 the plan was NOT saved. Fix the issues below and resubmit.`,
-          ``,
-          ...formatValidationIssues(response),
-          `Use build_plan with edits to fix issues, then submit_plan again.`
-        ];
-        return { content: [{ type: "text", text: lines2.join("\n") }] };
-      }
-      if (response.dry_run) {
-        const summary2 = response.summary;
-        const opLines2 = summary2.operations.map(
-          (op, i) => `  ${i + 1}. [${op.type}] ${op.description} (${op.record_count} records)`
-        );
-        const lines2 = [
-          `Validation passed \u2014 plan is ready to submit.`,
-          ``,
-          `Summary:`,
-          `  Operations: ${summary2.operation_count}`,
-          `  Total records affected: ${summary2.total_record_count}`,
-          ``,
-          `Operations:`,
-          ...opLines2
-        ];
-        if (response.validation?.issues && response.validation.issues.length > 0) {
-          lines2.push(``, ...formatValidationIssues(response));
-        }
-        if (response.scope_warning) {
-          lines2.push(``, `WARNING: ${response.scope_warning}`);
+    const targetPortalIds = portalResolution.portalIds;
+    const dryRun = dry_run ?? false;
+    if (portalResolution.explicit) {
+      const keyed = {};
+      let hadAnyErrors = false;
+      for (const portalId2 of targetPortalIds) {
+        const result2 = await submitPortalDraft(portalId2, dryRun, deps);
+        const keyedResult = toKeyedResult(result2);
+        keyed[String(portalId2)] = keyedResult;
+        if (!keyedResult.success) {
+          hadAnyErrors = true;
         }
-        lines2.push(``, `Draft is preserved. Call submit_plan() (without dry_run) to save the plan.`);
-        return { content: [{ type: "text", text: lines2.join("\n") }] };
       }
-      clearDraft();
-      const summary = response.summary;
-      const opLines = summary.operations.map(
-        (op, i) => `  ${i + 1}. [${op.type}] ${op.description} (${op.record_count} records)`
-      );
-      const lines = [
-        `Plan submitted successfully.`,
-        ``,
-        `Plan ID: ${response.plan_id}`,
-        `Status: DRAFT (awaiting review in HubSpot UI)`,
-        ``,
-        `Summary:`,
-        `  Operations: ${summary.operation_count}`,
-        `  Total records affected: ${summary.total_record_count}`,
-        ``,
-        `Operations:`,
-        ...opLines
-      ];
-      if (response.validation) {
-        const v = response.validation;
-        if (v.issues && v.issues.length > 0) {
-          lines.push(``, `Validation warnings:`);
-          for (const issue of v.issues) {
-            lines.push(`  - [Op ${issue.operation_index + 1}] ${issue.code}: ${issue.message}`);
-          }
-        }
-        if (!v.scope_check?.valid) {
-          lines.push(``, `Scope warning: Missing scopes: ${v.scope_check.missingScopes.join(", ")}`);
-        }
-      }
-      if (response.scope_warning) {
-        lines.push(``, `WARNING: ${response.scope_warning}`);
-      }
-      lines.push(``, `The user can review and execute this plan in their HubSpot settings page.`);
-      return { content: [{ type: "text", text: lines.join("\n") }] };
-    } catch (e) {
-      const message = e instanceof Error ? e.message : String(e);
       return {
-        content: [{ type: "text", text: `Error submitting plan: ${message}` }],
-        isError: true
+        content: [{ type: "text", text: JSON.stringify(keyed, null, 2) }],
+        ...hadAnyErrors ? { isError: true } : {}
       };
     }
+    const portalId = targetPortalIds[0];
+    const result = await submitPortalDraft(portalId, dryRun, deps);
+    const formatted = formatSinglePortalResult(result);
+    return {
+      content: [{ type: "text", text: formatted.text }],
+      ...formatted.isError ? { isError: true } : {}
+    };
   });
 }
 
 // src/tools/get_plans.ts
 import { z as z64 } from "zod";
 import { Effect as Effect90 } from "effect";
+var serialiseDraft2 = (portalId) => {
+  const draft = getDraft(portalId);
+  if (!draft) return null;
+  return {
+    title: draft.title,
+    description: draft.description,
+    operationCount: draft.operations.length
+  };
+};
 function registerGetPlansTool(server2, deps) {
   server2.registerTool("get_plans", {
-    description: `List write plans for the selected HubSpot portal. Shows plans created by AI along with their current execution status.
+    description: `List write plans for one or more HubSpot portals, including current local draft state.
 
-Use this to check on previously submitted plans, see if they've been reviewed, or find failed plans that need attention.
+Use this to check submitted plans and view draft readiness before calling submit_plan.
+
+PORTAL TARGETING:
+  Optionally pass portalIds to fetch plans for specific portals.
+  If omitted, the selected portal is used.
+  When portalIds is explicit, results are a JSON object keyed by portal ID.
 
 Statuses:
 - DRAFT: Awaiting user review in HubSpot UI
@@ -11182,16 +11555,59 @@ Statuses:
 - FAILED: Execution failed
 - REJECTED: User rejected the plan`,
     inputSchema: {
-      status: z64.enum(["DRAFT", "REJECTED", "EXECUTING", "EXECUTED", "FAILED"]).optional().describe("Filter by plan status. Omit to show all plans.")
-    }
-  }, async ({ status }) => {
-    const portalId = deps.getSelectedPortalId();
-    if (portalId === null) {
+      status: z64.enum(["DRAFT", "REJECTED", "EXECUTING", "EXECUTED", "FAILED"]).optional().describe("Filter by plan status. Omit to show all plans."),
+      portalIds: z64.array(z64.number()).optional().describe("Optional explicit portal IDs. If provided, results are keyed by portal ID.")
+    }
+  }, async ({ status, portalIds }) => {
+    const portalResolution = resolvePortalIds(
+      portalIds,
+      deps.getSelectedPortalId(),
+      deps.getPortals()
+    );
+    if ("error" in portalResolution) {
       return {
-        content: [{ type: "text", text: "No portal selected. Use the set_portal tool first." }],
+        content: [{ type: "text", text: portalResolution.error }],
         isError: true
       };
     }
+    const targetPortalIds = portalResolution.portalIds;
+    if (portalResolution.explicit) {
+      const keyed = {};
+      let hadAnyErrors = false;
+      for (const portalId2 of targetPortalIds) {
+        const draft2 = serialiseDraft2(portalId2);
+        try {
+          const response = await Effect90.runPromise(
+            deps.ws.sendPlanList(portalId2, status)
+          );
+          if (!response.success) {
+            hadAnyErrors = true;
+            keyed[String(portalId2)] = {
+              draft: draft2,
+              error: `Failed to list plans: ${response.error}`
+            };
+            continue;
+          }
+          keyed[String(portalId2)] = {
+            draft: draft2,
+            plans: response.plans ?? []
+          };
+        } catch (e) {
+          hadAnyErrors = true;
+          const message = e instanceof Error ? e.message : String(e);
+          keyed[String(portalId2)] = {
+            draft: draft2,
+            error: `Error listing plans: ${message}`
+          };
+        }
+      }
+      return {
+        content: [{ type: "text", text: JSON.stringify(keyed, null, 2) }],
+        ...hadAnyErrors ? { isError: true } : {}
+      };
+    }
+    const portalId = targetPortalIds[0];
+    const draft = serialiseDraft2(portalId);
     try {
       const response = await Effect90.runPromise(
         deps.ws.sendPlanList(portalId, status)
@@ -11203,19 +11619,22 @@ Statuses:
         };
       }
       const plans = response.plans ?? [];
+      const draftLine = draft ? `Current draft: "${draft.title}" (${draft.operationCount} operation(s))` : "Current draft: none";
       if (plans.length === 0) {
         const filterMsg = status ? ` with status ${status}` : "";
         return {
-          content: [{ type: "text", text: `No plans found${filterMsg}.` }]
+          content: [{ type: "text", text: `${draftLine}
+No plans found${filterMsg}.` }]
         };
       }
-      const lines = plans.map((p) => {
-        const executed = p.executed_at ? ` | Executed: ${p.executed_at}` : "";
-        return `- [${p.status}] ${p.title} (${p.operation_count} ops, ${p.total_record_count} records) | Created: ${p.created_at}${executed} | ID: ${p.id}`;
+      const lines = plans.map((plan) => {
+        const executed = plan.executed_at ? ` | Executed: ${plan.executed_at}` : "";
+        return `- [${plan.status}] ${plan.title} (${plan.operation_count} ops, ${plan.total_record_count} records) | Created: ${plan.created_at}${executed} | ID: ${plan.id}`;
       });
       const result = [
         `Plans for portal ${portalId}:`,
-        ``,
+        draftLine,
+        "",
         ...lines
       ].join("\n");
       return { content: [{ type: "text", text: result }] };
@@ -11229,182 +11648,566 @@ Statuses:
   });
 }
 
+// src/pure/sync-lifecycle.ts
+var dedupePortalIds2 = (portalIds) => {
+  const seen = /* @__PURE__ */ new Set();
+  const deduped = [];
+  for (const portalId of portalIds) {
+    if (seen.has(portalId)) continue;
+    seen.add(portalId);
+    deduped.push(portalId);
+  }
+  return deduped;
+};
+var orderPortalWarmupIds = (portals, selectedPortalId2) => {
+  const portalIds = dedupePortalIds2(portals.map((portal) => portal.target_portal));
+  if (selectedPortalId2 === null || !portalIds.includes(selectedPortalId2)) {
+    return portalIds;
+  }
+  return [selectedPortalId2, ...portalIds.filter((portalId) => portalId !== selectedPortalId2)];
+};
+var resolveDiffFlow = (portalId, selectedPortalId2) => selectedPortalId2 === portalId ? "diff_then_subscribe" : "diff";
+var shouldSubscribeAfterDiffComplete = (portalId, selectedPortalId2, success) => success && selectedPortalId2 === portalId;
+
+// src/effects/artifact-queue.ts
+import { Effect as Effect91 } from "effect";
+var DEFAULT_OPTIONS = {
+  maxRetries: 2,
+  baseBackoffMs: 500
+};
+var DEFAULT_PROCESSOR = (portalId, artifact) => Effect91.sync(() => {
+  console.error(
+    `[artifact-queue] No processor configured for portal ${portalId} artifact ${artifact.object_type}`
+  );
+  return false;
+});
+var selectedPortalId = null;
+var inFlightJob = null;
+var workerRunning = false;
+var workerGeneration = 0;
+var options = { ...DEFAULT_OPTIONS };
+var processArtifact2 = DEFAULT_PROCESSOR;
+var pendingJobs = [];
+var activeKeys = /* @__PURE__ */ new Set();
+var drainWaiters = /* @__PURE__ */ new Map();
+var makeJobKey = (portalId, artifactId) => `${portalId}:${artifactId}`;
+var sleep = (ms) => new Promise((resolve) => {
+  setTimeout(resolve, ms);
+});
+var isPortalDrained = (portalId) => inFlightJob?.portalId !== portalId && !pendingJobs.some((job) => job.portalId === portalId);
+var resolvePortalWaiters = (portalId, drained) => {
+  const waiters = drainWaiters.get(portalId);
+  if (!waiters) return;
+  for (const waiter of waiters) {
+    if (waiter.timeoutId !== null) {
+      clearTimeout(waiter.timeoutId);
+    }
+    waiter.resolve(drained);
+  }
+  drainWaiters.delete(portalId);
+};
+var maybeResolvePortalDrain = (portalId) => {
+  if (isPortalDrained(portalId)) {
+    resolvePortalWaiters(portalId, true);
+  }
+};
+var dequeueNextJob = () => {
+  if (pendingJobs.length === 0) return null;
+  if (selectedPortalId === null) {
+    return pendingJobs.shift() ?? null;
+  }
+  const selectedIdx = pendingJobs.findIndex((job) => job.portalId === selectedPortalId);
+  if (selectedIdx === -1) {
+    return pendingJobs.shift() ?? null;
+  }
+  return pendingJobs.splice(selectedIdx, 1)[0] ?? null;
+};
+var processJobWithRetry = async (job, generation) => {
+  const maxAttempts = options.maxRetries + 1;
+  for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
+    if (generation !== workerGeneration) return;
+    const succeeded = await Effect91.runPromise(
+      processArtifact2(job.portalId, job.artifact).pipe(
+        Effect91.catchAll(
+          (error) => Effect91.sync(() => {
+            console.error(
+              `[artifact-queue] Ingest failed for portal ${job.portalId} artifact ${job.artifact.object_type}:`,
+              error
+            );
+            return false;
+          })
+        )
+      )
+    );
+    if (succeeded) return;
+    if (attempt >= maxAttempts) {
+      console.error(
+        `[artifact-queue] Exhausted retries for portal ${job.portalId} artifact ${job.artifact.object_type}`
+      );
+      return;
+    }
+    const backoffMs = options.baseBackoffMs * 2 ** (attempt - 1);
+    console.error(
+      `[artifact-queue] Retry ${attempt}/${options.maxRetries} for portal ${job.portalId} artifact ${job.artifact.object_type} in ${backoffMs}ms`
+    );
+    await sleep(backoffMs);
+  }
+};
+var runWorker = async (generation) => {
+  while (generation === workerGeneration) {
+    const job = dequeueNextJob();
+    if (!job) {
+      if (generation === workerGeneration) {
+        workerRunning = false;
+      }
+      return;
+    }
+    inFlightJob = job;
+    try {
+      await processJobWithRetry(job, generation);
+    } catch (error) {
+      console.error("[artifact-queue] Unexpected worker failure:", error);
+    } finally {
+      if (generation !== workerGeneration) return;
+      inFlightJob = null;
+      activeKeys.delete(job.key);
+      maybeResolvePortalDrain(job.portalId);
+    }
+  }
+};
+var startWorkerIfNeeded = () => {
+  if (workerRunning || pendingJobs.length === 0) return;
+  workerRunning = true;
+  const generation = workerGeneration;
+  void runWorker(generation);
+};
+var configureArtifactQueue = (processor, nextOptions) => {
+  processArtifact2 = processor;
+  options = {
+    ...DEFAULT_OPTIONS,
+    ...nextOptions ?? {}
+  };
+  startWorkerIfNeeded();
+};
+var enqueueArtifacts = (portalId, artifacts) => {
+  let enqueued = 0;
+  for (const artifact of artifacts) {
+    const key = makeJobKey(portalId, artifact.id);
+    if (activeKeys.has(key)) continue;
+    activeKeys.add(key);
+    pendingJobs.push({ portalId, artifact, key });
+    enqueued += 1;
+  }
+  if (enqueued > 0) {
+    startWorkerIfNeeded();
+  }
+};
+var waitForPortalDrain = (portalId, timeoutMs) => {
+  if (!hasPendingForPortal(portalId)) {
+    return Promise.resolve(true);
+  }
+  if (timeoutMs <= 0) {
+    return Promise.resolve(false);
+  }
+  return new Promise((resolve) => {
+    const waiter = {
+      resolve,
+      timeoutId: null
+    };
+    const timeoutId = setTimeout(() => {
+      const waiters2 = drainWaiters.get(portalId);
+      if (waiters2) {
+        waiters2.delete(waiter);
+        if (waiters2.size === 0) {
+          drainWaiters.delete(portalId);
+        }
+      }
+      waiter.timeoutId = null;
+      resolve(false);
+    }, timeoutMs);
+    waiter.timeoutId = timeoutId;
+    const waiters = drainWaiters.get(portalId) ?? /* @__PURE__ */ new Set();
+    waiters.add(waiter);
+    drainWaiters.set(portalId, waiters);
+    maybeResolvePortalDrain(portalId);
+  });
+};
+var hasPendingForPortal = (portalId) => inFlightJob?.portalId === portalId || pendingJobs.some((job) => job.portalId === portalId);
+var setSelectedPortal = (portalId) => {
+  selectedPortalId = portalId;
+};
+
+// src/effects/ensure-fresh.ts
+import fs8 from "fs";
+import { Effect as Effect92, pipe as pipe77 } from "effect";
+var DEFAULT_MAX_AGE_MS = 3e5;
+var DEFAULT_QUEUE_DRAIN_TIMEOUT_MS = 12e4;
+var DEFAULT_DIFF_TIMEOUT_MS = 3e4;
+var DIFF_POLL_INTERVAL_MS = 100;
+var LAST_DIFF_CHECKED_AT_KEY = "last_diff_checked_at";
+var createEnsureFresh = (deps, options2) => {
+  const maxAgeMs = options2?.maxAgeMs ?? DEFAULT_MAX_AGE_MS;
+  const queueDrainTimeoutMs = options2?.queueDrainTimeoutMs ?? DEFAULT_QUEUE_DRAIN_TIMEOUT_MS;
+  const diffTimeoutMs = options2?.diffTimeoutMs ?? DEFAULT_DIFF_TIMEOUT_MS;
+  return async (portalId) => {
+    const selectedPortalId2 = deps.getSelectedPortalId();
+    if (selectedPortalId2 === portalId) {
+      return;
+    }
+    const drained = await deps.waitForPortalDrain(portalId, queueDrainTimeoutMs);
+    if (!drained) {
+      throw new Error(`Timed out waiting for portal ${portalId} artifact queue drain.`);
+    }
+    if (!deps.hasLocalDatabase(portalId)) {
+      throw new Error(
+        `Portal ${portalId} has no synced data yet. Background sync in progress - retry shortly.`
+      );
+    }
+    const checkedAt = await deps.getFreshnessCheckedAt(portalId);
+    const stale = checkedAt === null || Date.now() - checkedAt.getTime() > maxAgeMs;
+    if (!stale) {
+      return;
+    }
+    const objectSyncTimes = await deps.getObjectSyncTimes(portalId);
+    if (Object.keys(objectSyncTimes).length === 0) {
+      await deps.setFreshnessCheckedAt(portalId, /* @__PURE__ */ new Date());
+      return;
+    }
+    const diffRequestedAt = Date.now();
+    await deps.sendSyncDiff(portalId, objectSyncTimes);
+    const completed = await deps.waitForDiffCompletion(portalId, diffRequestedAt, diffTimeoutMs);
+    if (!completed) {
+      throw new Error(`Timed out waiting for sync diff completion for portal ${portalId}.`);
+    }
+    await deps.setFreshnessCheckedAt(portalId, /* @__PURE__ */ new Date());
+  };
+};
+var parseDate = (value) => {
+  if (!value) return null;
+  const parsed = Date.parse(value);
+  return Number.isNaN(parsed) ? null : new Date(parsed);
+};
+var sleep2 = (ms) => new Promise((resolve) => {
+  setTimeout(resolve, ms);
+});
+var runDatabaseForPortal = (portalId, getEncryptionKey, run) => Effect92.runPromise(
+  pipe77(
+    DatabaseService,
+    Effect92.flatMap((db) => run(db)),
+    Effect92.provide(makeDatabaseLive(portalId, getEncryptionKey()))
+  )
+);
+var waitForPortalSyncedAtAfter = (portalState, portalId, sinceMs, timeoutMs) => (async () => {
+  const startedAt = Date.now();
+  while (Date.now() - startedAt <= timeoutMs) {
+    const syncedAtMs = await Effect92.runPromise(
+      pipe77(
+        portalState.get(portalId),
+        Effect92.map((state) => state.syncedAt.getTime()),
+        Effect92.catchAll(() => Effect92.succeed(0))
+      )
+    );
+    if (syncedAtMs > sinceMs) {
+      return true;
+    }
+    await sleep2(DIFF_POLL_INTERVAL_MS);
+  }
+  return false;
+})();
+var makeEnsureFresh = (deps, options2) => createEnsureFresh(
+  {
+    getSelectedPortalId: deps.getSelectedPortalId,
+    waitForPortalDrain,
+    hasLocalDatabase: (portalId) => fs8.existsSync(dbPath(portalId)),
+    getFreshnessCheckedAt: (portalId) => runDatabaseForPortal(
+      portalId,
+      deps.getEncryptionKey,
+      (db) => pipe77(
+        db.getMetadata(LAST_DIFF_CHECKED_AT_KEY),
+        Effect92.map((value) => parseDate(value))
+      )
+    ),
+    getObjectSyncTimes: (portalId) => runDatabaseForPortal(portalId, deps.getEncryptionKey, (db) => db.getObjectSyncTimes()),
+    sendSyncDiff: (portalId, lastSyncTimes) => Effect92.runPromise(
+      deps.ws.sendSyncDiff(portalId, lastSyncTimes).pipe(
+        Effect92.mapError(
+          (error) => error instanceof Error ? error : new Error(`Failed to request sync diff for portal ${portalId}`)
+        )
+      )
+    ).then(() => void 0),
+    waitForDiffCompletion: (portalId, sinceMs, timeoutMs) => waitForPortalSyncedAtAfter(deps.portalState, portalId, sinceMs, timeoutMs),
+    setFreshnessCheckedAt: (portalId, checkedAt) => runDatabaseForPortal(
+      portalId,
+      deps.getEncryptionKey,
+      (db) => db.setMetadata(LAST_DIFF_CHECKED_AT_KEY, checkedAt.toISOString())
+    ).then(() => void 0)
+  },
+  options2
+);
+
 // src/index.ts
 var server = new McpServer({
   name: "mcp-pro-client",
   version: "1.0.0"
 });
-var mainProgram = Effect91.gen(function* () {
+var QUEUE_DRAIN_TIMEOUT_MS = 12e4;
+var mainProgram = Effect93.gen(function* () {
   const ws = yield* WebSocketService;
   const config = yield* ConfigService;
   const portalState = yield* PortalStateService;
   const getPortalId = () => getSelectedPortalId(config);
-  const getEncryptionKey = () => Effect91.runSync(ws.getEncryptionKey());
-  registerPortalSelection(server, { ws, config });
-  registerQueryTool(server, { getSelectedPortalId: getPortalId, getEncryptionKey });
-  registerChartTool(server, { getSelectedPortalId: getPortalId, getEncryptionKey });
+  const getPortals = () => Effect93.runSync(ws.getPortals());
+  const getEncryptionKey = () => Effect93.runSync(ws.getEncryptionKey());
+  const ensureFresh = makeEnsureFresh({
+    getSelectedPortalId: getPortalId,
+    getEncryptionKey,
+    ws,
+    portalState
+  });
+  const handoffSelectedPortal = (nextPortalId) => {
+    const previousPortalId = getSelectedPortalId(config);
+    if (previousPortalId !== null && previousPortalId !== nextPortalId) {
+      Effect93.runSync(
+        pipe78(
+          ws.sendSyncUnsubscribe(previousPortalId),
+          Effect93.catchAll(() => Effect93.void)
+        )
+      );
+    }
+    setSelectedPortal(nextPortalId);
+    Effect93.runSync(config.save({ selectedPortalId: nextPortalId }));
+    Effect93.runFork(pipe78(ws.sendSyncFull(nextPortalId), Effect93.catchAll(() => Effect93.void)));
+  };
+  registerPortalSelection(server, { ws, config, handoffSelectedPortal });
+  registerQueryTool(server, {
+    getSelectedPortalId: getPortalId,
+    getPortals,
+    ensureFresh,
+    getEncryptionKey
+  });
+  registerChartTool(server, {
+    getSelectedPortalId: getPortalId,
+    getPortals,
+    ensureFresh,
+    getEncryptionKey
+  });
   registerStatusTool(server, {
-    getConnectionState: () => Effect91.runSync(ws.getState()),
-    getPortals: () => Effect91.runSync(ws.getPortals()),
+    getConnectionState: () => Effect93.runSync(ws.getState()),
+    getPortals,
     getSelectedPortalId: getPortalId,
+    ensureFresh,
     getEncryptionKey
   });
-  registerBuildPlanTool(server);
+  registerBuildPlanTool(server, {
+    getSelectedPortalId: getPortalId,
+    getPortals
+  });
   registerDescribeOperationsTool(server);
-  registerSubmitPlanTool(server, { getSelectedPortalId: getPortalId, ws });
-  registerGetPlansTool(server, { getSelectedPortalId: getPortalId, ws });
+  registerSubmitPlanTool(server, {
+    getSelectedPortalId: getPortalId,
+    getPortals,
+    ws
+  });
+  registerGetPlansTool(server, {
+    getSelectedPortalId: getPortalId,
+    getPortals,
+    ws
+  });
   const state = yield* config.load();
   yield* config.save(state);
+  setSelectedPortal(state.selectedPortalId);
   if (state.selectedPortalId !== null) {
-    const cached = yield* portalState.load(state.selectedPortalId).pipe(Effect91.catchAll(() => Effect91.succeed(null)));
+    const cached = yield* portalState.load(state.selectedPortalId).pipe(Effect93.catchAll(() => Effect93.succeed(null)));
     if (cached !== null) {
-      yield* ws.setSyncedArtifacts(cached);
-      yield* Effect91.sync(
+      yield* Effect93.sync(
         () => console.error(`[startup] Loaded ${cached.artifacts.length} cached artifacts for portal ${state.selectedPortalId}`)
       );
     }
   }
+  const pendingPortalFollowUps = /* @__PURE__ */ new Set();
+  const runDiffFlow = (portalId) => {
+    const selectedPortalId2 = getSelectedPortalId(config);
+    const flow = resolveDiffFlow(portalId, selectedPortalId2);
+    if (flow === "diff_then_subscribe") {
+      triggerDiffThenSubscribe(portalId);
+      return;
+    }
+    triggerDiff(portalId);
+  };
+  const schedulePortalFollowUpAfterDrain = (portalId, source) => {
+    if (pendingPortalFollowUps.has(portalId)) {
+      console.error(`[live-sync] Follow-up already scheduled for portal ${portalId}, coalescing ${source}`);
+      return;
+    }
+    pendingPortalFollowUps.add(portalId);
+    Effect93.runFork(
+      pipe78(
+        Effect93.promise(() => waitForPortalDrain(portalId, QUEUE_DRAIN_TIMEOUT_MS)),
+        Effect93.flatMap(
+          (drained) => drained ? Effect93.sync(() => {
+            console.error(`[live-sync] Queue drained for portal ${portalId} after ${source} \u2014 triggering diff flow`);
+            runDiffFlow(portalId);
+          }) : Effect93.sync(
+            () => console.error(`[live-sync] Timed out waiting for portal ${portalId} queue drain after ${source}`)
+          )
+        ),
+        Effect93.ensuring(
+          Effect93.sync(() => {
+            pendingPortalFollowUps.delete(portalId);
+          })
+        ),
+        Effect93.catchAll(
+          (error) => Effect93.sync(() => {
+            console.error(`[live-sync] Failed post-queue follow-up for portal ${portalId}:`, error);
+          })
+        )
+      )
+    );
+  };
+  const subscribeIfStillSelected = (portalId) => {
+    const selectedPortalId2 = getSelectedPortalId(config);
+    if (selectedPortalId2 !== portalId) {
+      console.error(
+        `[live-sync] Skipping subscribe for portal ${portalId} because selected portal is ${selectedPortalId2 ?? "none"}`
+      );
+      return;
+    }
+    Effect93.runFork(pipe78(ws.sendSyncSubscribe(portalId), Effect93.catchAll(() => Effect93.void)));
+  };
+  const triggerDiff = (portalId) => {
+    const dbLayer = makeDatabaseLive(portalId, getEncryptionKey());
+    pipe78(
+      DatabaseService,
+      Effect93.flatMap((db) => db.getObjectSyncTimes()),
+      Effect93.provide(dbLayer),
+      Effect93.catchAll(() => Effect93.succeed({})),
+      Effect93.flatMap((syncTimes) => {
+        const count = Object.keys(syncTimes).length;
+        if (count === 0) {
+          return Effect93.sync(() => {
+            console.error(`[live-sync] No watermarks found in DuckDB for portal ${portalId}, skipping diff`);
+          });
+        }
+        return pipe78(
+          Effect93.sync(() => {
+            console.error(`[live-sync] Triggering catch-up diff for portal ${portalId} with ${count} object types: ${JSON.stringify(syncTimes)}`);
+          }),
+          Effect93.flatMap(() => pipe78(ws.sendSyncDiff(portalId, syncTimes), Effect93.catchAll(() => Effect93.void)))
+        );
+      }),
+      Effect93.runFork
+    );
+  };
   const triggerDiffThenSubscribe = (portalId) => {
     const dbLayer = makeDatabaseLive(portalId, getEncryptionKey());
-    pipe77(
+    pipe78(
       DatabaseService,
-      Effect91.flatMap((db) => db.getObjectSyncTimes()),
-      Effect91.provide(dbLayer),
-      Effect91.catchAll(() => Effect91.succeed({})),
-      Effect91.tap(
-        (syncTimes) => Effect91.sync(() => {
-          const count = Object.keys(syncTimes).length;
-          if (count > 0) {
+      Effect93.flatMap((db) => db.getObjectSyncTimes()),
+      Effect93.provide(dbLayer),
+      Effect93.catchAll(() => Effect93.succeed({})),
+      Effect93.flatMap((syncTimes) => {
+        const count = Object.keys(syncTimes).length;
+        if (count === 0) {
+          return Effect93.sync(() => {
+            console.error(`[live-sync] No watermarks found in DuckDB for portal ${portalId}, subscribing directly`);
+            subscribeIfStillSelected(portalId);
+          });
+        }
+        return pipe78(
+          Effect93.sync(() => {
             console.error(`[live-sync] Triggering catch-up diff for portal ${portalId} with ${count} object types: ${JSON.stringify(syncTimes)}`);
-            Effect91.runFork(pipe77(ws.sendSyncDiff(portalId, syncTimes), Effect91.catchAll(() => Effect91.void)));
-          } else {
-            console.error(`[live-sync] No watermarks found in DuckDB, subscribing directly for portal ${portalId}`);
-            Effect91.runFork(pipe77(ws.sendSyncSubscribe(portalId), Effect91.catchAll(() => Effect91.void)));
-          }
-        })
-      ),
-      Effect91.runFork
+          }),
+          Effect93.flatMap(() => pipe78(ws.sendSyncDiff(portalId, syncTimes), Effect93.catchAll(() => Effect93.void)))
+        );
+      }),
+      Effect93.runFork
     );
   };
+  const makeSyncLayer = (portalId) => {
+    const dbLayer = makeDatabaseLive(portalId, getEncryptionKey());
+    const wsLayer = Layer6.succeed(WebSocketService, ws);
+    const configLayer = Layer6.succeed(ConfigService, config);
+    const portalStateLayer = Layer6.succeed(PortalStateService, portalState);
+    return SyncLive.pipe(
+      Layer6.provide(Layer6.mergeAll(wsLayer, dbLayer, configLayer, portalStateLayer))
+    );
+  };
+  configureArtifactQueue(
+    (portalId, artifact) => pipe78(
+      SyncService,
+      Effect93.flatMap((sync) => sync.syncArtifacts(portalId, [artifact], [artifact.object_type])),
+      Effect93.flatMap(() => portalState.get(portalId)),
+      Effect93.map((portal) => {
+        const status = portal.artifacts.find((a) => a.object_type === artifact.object_type)?.status;
+        if (status !== "SYNCED") {
+          console.error(
+            `[artifact-queue] Artifact ${artifact.object_type} for portal ${portalId} finished with status ${status ?? "MISSING"}`
+          );
+        }
+        return status === "SYNCED";
+      }),
+      Effect93.catchAll(
+        (err) => Effect93.sync(() => {
+          console.error(
+            `[artifact-queue] Failed ingest for portal ${portalId} artifact ${artifact.object_type}:`,
+            err
+          );
+          return false;
+        })
+      ),
+      Effect93.provide(makeSyncLayer(portalId))
+    )
+  );
   yield* ws.registerHandlers({
     onSyncArtifacts: (portalId, artifacts) => {
       const incomingWithStatus = artifacts.map((a) => ({ ...a, status: "NOT_STARTED" }));
-      const updated = pipe77(
+      const updated = pipe78(
         portalState.setArtifacts(portalId, incomingWithStatus),
-        Effect91.tap((s) => ws.setSyncedArtifacts(s)),
-        Effect91.tap(
-          (s) => Effect91.sync(
+        Effect93.tap(
+          (s) => Effect93.sync(
             () => console.error(`[sync:full] Saved ${s.artifacts.length} artifacts for portal ${portalId}`)
           )
         ),
-        Effect91.catchAll(() => Effect91.succeed(null)),
-        Effect91.runSync
+        Effect93.catchAll(() => Effect93.succeed(null)),
+        Effect93.runSync
       );
       if (!updated) return;
       const objectTypesToSync = incomingWithStatus.map((a) => a.object_type);
       const toSync = filterUnsyncedArtifacts(updated.artifacts, new Set(objectTypesToSync));
       if (toSync.length === 0) {
-        console.error(`[live-sync] All ${artifacts.length} artifacts already SYNCED for portal ${portalId} \u2014 syncing message plugins then catch-up diff`);
-        const dbLayer2 = makeDatabaseLive(portalId, getEncryptionKey());
-        const wsLayer2 = Layer6.succeed(WebSocketService, ws);
-        const configLayer2 = Layer6.succeed(ConfigService, config);
-        const portalStateLayer2 = Layer6.succeed(PortalStateService, portalState);
-        const syncLayer2 = SyncLive.pipe(
-          Layer6.provide(Layer6.mergeAll(wsLayer2, dbLayer2, configLayer2, portalStateLayer2))
+        console.error(
+          `[artifact-queue] All ${artifacts.length} artifacts already SYNCED for portal ${portalId} \u2014 no enqueue needed`
         );
-        pipe77(
-          SyncService,
-          Effect91.flatMap((sync) => sync.syncMessagePlugins(portalId)),
-          Effect91.tap(
-            () => Effect91.sync(() => {
-              console.error(`[live-sync] Message plugins synced for portal ${portalId} \u2014 starting catch-up diff`);
-              triggerDiffThenSubscribe(portalId);
-            })
-          ),
-          Effect91.catchAll(
-            (err) => Effect91.sync(() => {
-              console.error(`[live-sync] Message plugin sync failed:`, err);
-              triggerDiffThenSubscribe(portalId);
-            })
-          ),
-          Effect91.provide(syncLayer2),
-          Effect91.runFork
+      } else {
+        console.error(
+          `[artifact-queue] Enqueueing ${toSync.length}/${artifacts.length} artifacts for portal ${portalId}`
         );
-        return;
+        enqueueArtifacts(portalId, toSync);
       }
-      console.error(`[sync] ${toSync.length}/${artifacts.length} artifacts need syncing`);
-      const dbLayer = makeDatabaseLive(portalId, getEncryptionKey());
-      const wsLayer = Layer6.succeed(WebSocketService, ws);
-      const configLayer = Layer6.succeed(ConfigService, config);
-      const portalStateLayer = Layer6.succeed(PortalStateService, portalState);
-      const syncLayer = SyncLive.pipe(
-        Layer6.provide(Layer6.mergeAll(wsLayer, dbLayer, configLayer, portalStateLayer))
-      );
-      pipe77(
-        SyncService,
-        Effect91.flatMap(
-          (sync) => Effect91.all([
-            sync.syncArtifacts(portalId, updated.artifacts, objectTypesToSync).pipe(
-              Effect91.tap(
-                (progress) => Effect91.sync(() => {
-                  console.error(`[sync] Complete: ${progress.completedArtifacts}/${progress.totalArtifacts} artifacts synced`);
-                  console.error(`[live-sync] Artifact sync done for portal ${portalId} \u2014 starting catch-up diff`);
-                  triggerDiffThenSubscribe(portalId);
-                })
-              ),
-              Effect91.catchAll(
-                (err) => Effect91.sync(() => console.error(`[sync] Sync failed:`, err))
-              )
-            ),
-            sync.syncMessagePlugins(portalId).pipe(
-              Effect91.tap(
-                () => Effect91.sync(() => console.error(`[sync] Message plugins synced independently for portal ${portalId}`))
-              ),
-              Effect91.catchAll(
-                (err) => Effect91.sync(() => console.error(`[sync] Message plugin sync failed:`, err))
-              )
-            )
-          ], { concurrency: 2 })
-        ),
-        Effect91.catchAll(() => Effect91.void),
-        Effect91.provide(syncLayer),
-        Effect91.runFork
-      );
+      schedulePortalFollowUpAfterDrain(portalId, "sync:full");
     },
     onNewArtifacts: (portalId, artifacts) => {
       console.error(`[sync:new-artifacts] Discovered ${artifacts.length} new artifact(s) for portal ${portalId}: ${artifacts.map((a) => a.object_type).join(", ")}`);
       const newWithStatus = artifacts.map((a) => ({ ...a, status: "NOT_STARTED" }));
       const objectTypesToSync = newWithStatus.map((a) => a.object_type);
-      const merged = pipe77(
+      const merged = pipe78(
         portalState.mergeArtifacts(portalId, newWithStatus),
-        Effect91.tap((m) => ws.setSyncedArtifacts(m)),
-        Effect91.catchAll(() => Effect91.succeed(null)),
-        Effect91.runSync
+        Effect93.catchAll(() => Effect93.succeed(null)),
+        Effect93.runSync
       );
       if (!merged) return;
-      const dbLayer = makeDatabaseLive(portalId, getEncryptionKey());
-      const wsLayer = Layer6.succeed(WebSocketService, ws);
-      const configLayer = Layer6.succeed(ConfigService, config);
-      const portalStateLayer = Layer6.succeed(PortalStateService, portalState);
-      const syncLayer = SyncLive.pipe(
-        Layer6.provide(Layer6.mergeAll(wsLayer, dbLayer, configLayer, portalStateLayer))
-      );
-      pipe77(
-        SyncService,
-        Effect91.flatMap((sync) => sync.syncArtifacts(portalId, merged.artifacts, objectTypesToSync)),
-        Effect91.tap(
-          (progress) => Effect91.sync(() => {
-            console.error(`[sync:new-artifacts] Download complete: ${progress.completedArtifacts}/${progress.totalArtifacts} new artifacts synced`);
-            console.error(`[sync:new-artifacts] Triggering diff for new types on portal ${portalId}`);
-            triggerDiffThenSubscribe(portalId);
-          })
-        ),
-        Effect91.catchAll(
-          (err) => Effect91.sync(() => console.error(`[sync:new-artifacts] Sync failed:`, err))
-        ),
-        Effect91.provide(syncLayer),
-        Effect91.runFork
-      );
+      const toSync = filterUnsyncedArtifacts(merged.artifacts, new Set(objectTypesToSync));
+      if (toSync.length === 0) {
+        console.error(
+          `[artifact-queue] All ${artifacts.length} new artifacts already SYNCED for portal ${portalId} \u2014 no enqueue needed`
+        );
+      } else {
+        console.error(
+          `[artifact-queue] Enqueueing ${toSync.length}/${artifacts.length} new artifact(s) for portal ${portalId}`
+        );
+        enqueueArtifacts(portalId, toSync);
+      }
+      schedulePortalFollowUpAfterDrain(portalId, "sync:new-artifacts");
     },
     onDiffBatch: (portalId, batch) => {
       const plugin = findArtifactPlugin(batch.object_type);
@@ -11413,54 +12216,82 @@ var mainProgram = Effect91.gen(function* () {
         return;
       }
       const dbLayer = makeDatabaseLive(portalId, getEncryptionKey());
-      pipe77(
+      pipe78(
         DatabaseService,
-        Effect91.flatMap((db) => {
+        Effect93.flatMap((db) => {
           const ctx = { db, ws, portalState, portalId };
           return plugin.processDiffBatch(ctx, batch);
         }),
-        Effect91.catchAll(
-          (err) => Effect91.sync(() => console.error(`[diff-sync] Error processing batch:`, err))
+        Effect93.catchAll(
+          (err) => Effect93.sync(() => console.error(`[diff-sync] Error processing batch:`, err))
         ),
-        Effect91.provide(dbLayer),
-        Effect91.runFork
+        Effect93.provide(dbLayer),
+        Effect93.runFork
       );
     },
     onDiffComplete: (portalId, payload) => {
-      console.error(`[live-sync] Catch-up diff complete for portal ${portalId} \u2014 ${payload.object_types_processed.length} types, ${payload.total_records} records, ${payload.total_associations} associations \u2014 subscribing for real-time updates`);
-      Effect91.runFork(pipe77(ws.sendSyncSubscribe(portalId), Effect91.catchAll(() => Effect91.void)));
+      if (!payload.success) {
+        console.error(`[live-sync] Catch-up diff failed for portal ${portalId}: ${payload.error ?? "unknown"}`);
+        return;
+      }
+      Effect93.runFork(pipe78(portalState.touchSyncedAt(portalId), Effect93.catchAll(() => Effect93.void)));
+      const selectedPortalId2 = getSelectedPortalId(config);
+      const shouldSubscribe = shouldSubscribeAfterDiffComplete(portalId, selectedPortalId2, payload.success);
+      if (!shouldSubscribe) {
+        console.error(
+          `[live-sync] Catch-up diff complete for portal ${portalId} \u2014 ${payload.object_types_processed.length} types, ${payload.total_records} records, ${payload.total_associations} associations \u2014 not subscribing (selected portal: ${selectedPortalId2 ?? "none"})`
+        );
+        return;
+      }
+      console.error(
+        `[live-sync] Catch-up diff complete for portal ${portalId} \u2014 ${payload.object_types_processed.length} types, ${payload.total_records} records, ${payload.total_associations} associations \u2014 subscribing for real-time updates`
+      );
+      Effect93.runFork(pipe78(ws.sendSyncSubscribe(portalId), Effect93.catchAll(() => Effect93.void)));
     },
     onSubscribeAck: (_payload) => {
     },
-    autoSelectSinglePortal: (portals) => autoSelectSinglePortal(config, portals),
+    autoSelectSinglePortal: (portals) => {
+      const autoSelected = autoSelectSinglePortal(config, portals);
+      if (autoSelected !== null) {
+        setSelectedPortal(autoSelected);
+      }
+      return autoSelected;
+    },
     onRegisterSuccess: (portals) => {
-      if (state.selectedPortalId === null) return;
-      const portalId = state.selectedPortalId;
-      const match = portals.find((p) => p.target_portal === portalId);
-      if (!match) {
-        console.error(`[live-sync] Previously selected portal ${portalId} not in portal list, skipping diff`);
-        return;
+      const selectedPortalId2 = getSelectedPortalId(config);
+      setSelectedPortal(selectedPortalId2);
+      const warmupPortalIds = orderPortalWarmupIds(portals, selectedPortalId2);
+      if (selectedPortalId2 !== null && !warmupPortalIds.includes(selectedPortalId2)) {
+        console.error(`[live-sync] Previously selected portal ${selectedPortalId2} not in portal list; warming available portals only`);
+      }
+      console.error(`[live-sync] Registration complete \u2014 warming ${warmupPortalIds.length} portal(s): ${warmupPortalIds.join(", ")}`);
+      for (const portalId of warmupPortalIds) {
+        Effect93.runFork(pipe78(ws.sendSyncFull(portalId), Effect93.catchAll(() => Effect93.void)));
       }
-      console.error(`[live-sync] Portal ${portalId} reconnected \u2014 sending sync:full to refresh artifacts`);
-      Effect91.runFork(pipe77(ws.sendSyncFull(portalId), Effect91.catchAll(() => Effect91.void)));
     },
     onSyncDiffNeeded: (portalId) => {
-      console.error(`[live-sync] onSyncDiffNeeded called for portal ${portalId}`);
-      triggerDiffThenSubscribe(portalId);
+      const selectedPortalId2 = getSelectedPortalId(config);
+      const flow = resolveDiffFlow(portalId, selectedPortalId2);
+      console.error(`[live-sync] onSyncDiffNeeded called for portal ${portalId} \u2014 running ${flow}`);
+      if (flow === "diff_then_subscribe") {
+        triggerDiffThenSubscribe(portalId);
+        return;
+      }
+      triggerDiff(portalId);
     }
   });
   yield* ws.connect().pipe(
-    Effect91.catchAll((e) => Effect91.sync(() => console.error("WebSocket error:", e)))
+    Effect93.catchAll((e) => Effect93.sync(() => console.error("WebSocket error:", e)))
   );
   const transport = new StdioServerTransport();
-  yield* Effect91.promise(() => server.connect(transport));
-  yield* Effect91.sync(() => console.error("MCP Pro Client server started"));
-  yield* Effect91.never;
+  yield* Effect93.promise(() => server.connect(transport));
+  yield* Effect93.sync(() => console.error("MCP Pro Client server started"));
+  yield* Effect93.never;
 });
-pipe77(
+pipe78(
   mainProgram,
-  Effect91.provide(Layer6.mergeAll(WebSocketLive, ConfigLive, PortalStateLive)),
-  Effect91.runPromise
+  Effect93.provide(Layer6.mergeAll(WebSocketLive, ConfigLive, PortalStateLive)),
+  Effect93.runPromise
 ).catch((error) => {
   console.error("Fatal error:", error);
   process.exit(1);