@vellumai/assistant 0.10.2-dev.202606250318.5e7cfb0 → 0.10.2

package/src/runtime/confirmation-request-guardian-bridge.ts

@@ -70,9 +70,9 @@ export type BridgeConfirmationRequestResult =
  *
  * Fire-and-forget safe: notification emission errors are logged but not propagated.
  */
-export async function bridgeConfirmationRequestToGuardian(
+export function bridgeConfirmationRequestToGuardian(
   params: BridgeConfirmationRequestParams,
-): Promise<BridgeConfirmationRequestResult> {
+): BridgeConfirmationRequestResult {
   const {
     canonicalRequest,
     trustContext,
@@ -100,7 +100,7 @@ export async function bridgeConfirmationRequestToGuardian(
   }
 
   const sourceChannel = trustContext.sourceChannel;
-  const binding = await getGuardianBinding(assistantId, sourceChannel);
+  const binding = getGuardianBinding(assistantId, sourceChannel);
   if (!binding) {
     log.debug(
       { sourceChannel, assistantId },

package/src/runtime/guardian-vellum-migration.ts

@@ -7,22 +7,11 @@
  * assistant-side since it reacts to incoming JWT principals.
  */
 
-import type { ChannelId } from "../channels/types.js";
 import {
   findGuardianForChannel,
   updateContactPrincipalAndChannel,
 } from "../contacts/contact-store.js";
-import {
-  getGuardianDelivery,
-  guardianForChannel,
-} from "../contacts/guardian-delivery-reader.js";
-import type { TrustContext } from "../daemon/trust-context.js";
 import { getLogger } from "../util/logger.js";
-import { DAEMON_INTERNAL_ASSISTANT_ID } from "./assistant-scope.js";
-import {
-  resolveTrustContext,
-  withSourceChannel,
-} from "./trust-context-resolver.js";
 
 const log = getLogger("guardian-vellum-migration");
 
@@ -42,37 +31,18 @@ const log = getLogger("guardian-vellum-migration");
  * minted by this daemon's signing key.
  *
  * Returns true if healing occurred, false otherwise.
- *
- * The gateway binding supplies the authoritative principal; the local
- * assistant-mirror row is repaired whenever it diverges from the JWT
- * principal — even when the gateway binding already matches — because the
- * /v1/messages trust path still resolves against the local mirror in this
- * plan. A stale mirror must be repaired or valid guardians stay `unknown`.
  */
-export async function healGuardianBindingDrift(
-  incomingPrincipalId: string,
-): Promise<boolean> {
+export function healGuardianBindingDrift(incomingPrincipalId: string): boolean {
   if (!incomingPrincipalId.startsWith("vellum-principal-")) {
     return false;
   }
 
-  const guardians = await getGuardianDelivery({ channelTypes: ["vellum"] });
-  if (!guardians) return false;
-  const guardian = guardianForChannel(guardians, "vellum");
-  if (!guardian) return false;
-
-  const currentPrincipalId = guardian.principalId;
-  if (!currentPrincipalId?.startsWith("vellum-principal-")) return false;
-
-  // Resolve the assistant-mirror row whose principal drives local trust.
   const guardianResult = findGuardianForChannel("vellum");
   if (!guardianResult) return false;
 
-  const localPrincipalId = guardianResult.contact.principalId;
-  // Only repair auto-generated local principals — never overwrite a real one.
-  if (!localPrincipalId?.startsWith("vellum-principal-")) return false;
-  // No-op when the local mirror already matches the JWT principal.
-  if (localPrincipalId === incomingPrincipalId) return false;
+  const currentPrincipalId = guardianResult.contact.principalId;
+  if (!currentPrincipalId?.startsWith("vellum-principal-")) return false;
+  if (currentPrincipalId === incomingPrincipalId) return false;
 
   const updated = updateContactPrincipalAndChannel(
     guardianResult.contact.id,
@@ -83,7 +53,7 @@ export async function healGuardianBindingDrift(
   if (!updated) {
     log.warn(
       {
-        oldPrincipalId: localPrincipalId,
+        oldPrincipalId: currentPrincipalId,
         newPrincipalId: incomingPrincipalId,
       },
       "Skipped guardian binding drift heal — address collision on contact_channels",
@@ -93,40 +63,11 @@ export async function healGuardianBindingDrift(
 
   log.info(
     {
-      oldPrincipalId: localPrincipalId,
+      oldPrincipalId: currentPrincipalId,
       newPrincipalId: incomingPrincipalId,
     },
-    "Healed vellum guardian binding drift — updated local mirror principalId to match JWT actor",
+    "Healed vellum guardian binding drift — updated principalId to match JWT actor",
   );
 
   return true;
 }
-
-/**
- * Re-resolve trust from the local mirror only for the narrow vellum-principal
- * reset-drift case; null when it isn't drift (caller keeps the gateway verdict).
- */
-export async function reResolveTrustOnResetDrift(
-  incomingPrincipalId: string,
-  sourceChannel: ChannelId,
-): Promise<TrustContext | null> {
-  const guardians = await getGuardianDelivery({ channelTypes: ["vellum"] });
-  const gatewayPrincipal = guardians
-    ? guardianForChannel(guardians, "vellum")?.principalId
-    : undefined;
-  const isResetDrift =
-    incomingPrincipalId.startsWith("vellum-principal-") &&
-    !!gatewayPrincipal?.startsWith("vellum-principal-") &&
-    gatewayPrincipal !== incomingPrincipalId;
-  if (!isResetDrift) return null;
-  await healGuardianBindingDrift(incomingPrincipalId);
-  return withSourceChannel(
-    sourceChannel,
-    resolveTrustContext({
-      assistantId: DAEMON_INTERNAL_ASSISTANT_ID,
-      sourceChannel: "vellum",
-      conversationExternalId: "local",
-      actorExternalId: incomingPrincipalId,
-    }),
-  );
-}