@vellumai/assistant 0.10.4 → 0.10.5-dev.202607022329.d89bf2f

package/src/daemon/external-plugins-bootstrap.ts

@@ -12,29 +12,22 @@
  *    {@link registerDefaultPlugins}. Registration is idempotent so repeat
  *    calls (e.g. during integration tests) do not throw.
  * 2. Walks {@link getRegisteredPlugins} in registration order.
- * 3. For each plugin, consults `manifest.requiresFlag` against
- *    {@link isAssistantFeatureFlagEnabled}. If any listed flag is disabled,
- *    the plugin is skipped wholesale — no `init()`, no tool/route
- *    contributions, no entry in the shutdown hook, and the plugin is also
- *    dropped from the hook registry via {@link unregisterPlugin} so none of its
- *    hooks participate in the turn lifecycle. This is the primary mechanism for
- *    shipping experimental plugins behind a feature flag.
- * 4. Validates the config block under `plugins.<name>` against
+ * 3. Validates the config block under `plugins.<name>` against
  *    `manifest.config` if the manifest supplies a parser-like validator
  *    (Zod schemas with `.parse()` are supported; anything else is passed
  *    through untouched).
- * 5. Creates a per-plugin writable data directory on demand and exposes it via
+ * 4. Creates a per-plugin writable data directory on demand and exposes it via
  *    {@link InitContext.pluginStorageDir}. For user plugins this is
  *    `<pluginDir>/data/`; for default plugins it is
  *    `<workspaceDir>/plugins-data/<plugin>/`.
- * 6. For each surviving plugin, registers its contributed tools and routes
+ * 5. For each surviving plugin, registers its contributed tools and routes
  *    into their global registries via {@link registerPluginTools} and
  *    {@link registerSkillRoute}. Contributions land BEFORE `init()` so
  *    the plugin's hook can observe a registry where its own model-visible
  *    surface is already wired — useful for plugins that want to attach
  *    metadata, warm caches, or otherwise interact with their own
  *    contributions during initialization.
- * 7. Awaits `plugin.init(ctx)` sequentially. An init failure is contained to
+ * 6. Awaits `plugin.init(ctx)` sequentially. An init failure is contained to
  *    the offending plugin: its already-registered tools and routes are rolled
  *    back, it is dropped from the registry, the failure is logged, and
  *    bootstrap continues with the remaining plugins. A single plugin's failure
@@ -43,28 +36,24 @@
  *    history repair, title generation) — so the daemon comes up with the
  *    failing plugin absent rather than blacking out the whole plugin layer.
  *
- * A single shutdown hook is registered via
- * {@link registerShutdownHook} that walks the plugin list in **reverse
- * registration order**. Only plugins that actually initialized (i.e. were
- * not skipped by the feature-flag gate) appear in that walk. For each such
- * plugin it first unregisters the contributed tools (so `onShutdown()`
- * observes a clean model-visible surface) and then awaits the optional
- * `onShutdown()`. Per-plugin shutdown failures are logged and swallowed —
- * the hook registry already swallows hook-level throws, but we log at the
- * plugin level so the plugin name is attributed.
+ * Plugin `shutdown` hooks fire through the unified `runHook(HOOKS.SHUTDOWN, …)`
+ * pipeline that the daemon shutdown handler runs — the same path every other
+ * lifecycle hook uses; this module does not register a shutdown hook of its own.
+ * Surfaces (tools/routes/injectors) are not unregistered at daemon shutdown:
+ * the process is exiting, so that in-memory registry state is discarded anyway.
+ * Surfaces are only torn down when a single plugin is rolled back after a failed
+ * bring-up, via {@link teardownPlugin}.
  */
 
 import { existsSync, mkdirSync } from "node:fs";
 import { join } from "node:path";
 
-import { isAssistantFeatureFlagEnabled } from "../config/assistant-feature-flags.js";
 import { getConfig } from "../config/loader.js";
 import type { AssistantConfig } from "../config/schema.js";
 import { HOOKS } from "../plugin-api/constants.js";
 import {
   getAllDefaultPlugins,
   registerDefaultPluginInjectors,
-  registerDefaultPluginJobHandlers,
   registerDefaultPluginPersistenceHooks,
   registerDefaultPlugins,
 } from "../plugins/defaults/index.js";
@@ -72,10 +61,6 @@ import {
   registerPluginInjectors,
   unregisterPluginInjectors,
 } from "../plugins/injector-registry.js";
-import {
-  registerPluginJobHandlers,
-  unregisterPluginJobHandlers,
-} from "../plugins/job-handler-registry.js";
 import { getRegisteredPlugins, unregisterPlugin } from "../plugins/registry.js";
 import {
   type Plugin,
@@ -95,7 +80,6 @@ import {
 import { getLogger } from "../util/logger.js";
 import { getWorkspaceDir, getWorkspacePluginsDir } from "../util/platform.js";
 import { APP_VERSION } from "../version.js";
-import { registerShutdownHook } from "./shutdown-registry.js";
 
 const log = getLogger("plugins-bootstrap");
 
@@ -152,16 +136,6 @@ function ensurePluginStorageDir(pluginName: string): string {
   return dir;
 }
 
-function getDisabledPluginFlag(
-  plugin: Plugin,
-  config: AssistantConfig,
-): string | undefined {
-  for (const flagKey of plugin.manifest.requiresFlag ?? []) {
-    if (!isAssistantFeatureFlagEnabled(flagKey, config)) return flagKey;
-  }
-  return undefined;
-}
-
 /**
  * Bring the plugin layer up during daemon startup. Runs the full sequence in
  * the one order the rest of the system depends on:
@@ -190,8 +164,8 @@ export async function initializePlugins(): Promise<void> {
 }
 
 /**
- * Run every registered plugin's `init()` hook sequentially and install a
- * reverse-order shutdown hook. See the module docstring for full semantics.
+ * Run every registered plugin's `init()` hook sequentially. See the module
+ * docstring for full lifecycle semantics (including how `shutdown` hooks fire).
  *
  * Returns once every plugin has been processed. A plugin whose `init()` throws
  * is rolled back, dropped from the registry, and logged; bootstrap continues
@@ -222,17 +196,13 @@ export async function bootstrapPlugins(): Promise<void> {
   // register while disabled.
   registerDefaultPluginInjectors();
 
-  // Register the default plugins' background-job handlers up front, the
-  // job-handler analog of the injector registration above. The general job
-  // worker's `registerMemoryJobHandlers` forwards the registry union into the
-  // worker dispatch table; pre-registering here keeps the daemon path symmetric
-  // with tools/routes/injectors (the standalone worker self-registers instead).
-  registerDefaultPluginJobHandlers();
-
   // Install the memory feature's persistence-lifecycle handlers into the
   // persistence seam up front, so the layer below memory can drive memory
   // side effects (message indexing) without importing memory internals.
-  // Symmetric with the injector/job-handler registration above.
+  // Symmetric with the injector registration above. (Background-job handlers
+  // are not registered here: the memory plugin registers its own directly in
+  // its `init` hook, and the daemon registers the host's non-plugin handlers in
+  // `lifecycle.ts`.)
   registerDefaultPluginPersistenceHooks();
 
   // Combine the canonical default plugins with any plugins registered via
@@ -253,36 +223,8 @@ export async function bootstrapPlugins(): Promise<void> {
 
   const assistantConfig = getConfig();
 
-  // Plugins that passed `requiresFlag` gating and therefore need the full
-  // init → contribute → shutdown lifecycle. Plugins skipped by the flag gate
-  // are omitted from this list so the shutdown hook below never tears down
-  // capabilities that were never wired up in the first place. Each entry
-  // carries the opaque route handles returned by `registerSkillRoute` so
-  // teardown can key on identity rather than regex-pattern text — two plugins
-  // registering the same pattern would otherwise step on each other's routes
-  // during shutdown, violating the "no traffic hits a plugin handler during
-  // onShutdown" invariant.
-  const activePlugins: ActivePlugin[] = [];
-
-  // Shutdown context is identical for every plugin in this boot — construct
-  // once and reuse across the per-plugin teardown and the normal shutdown
-  // hook below. Only `assistantVersion` is exposed today; future additions
-  // live on {@link ShutdownContext}.
-  const shutdownContext: ShutdownContext = {
-    assistantVersion: APP_VERSION,
-  };
-
   for (const plugin of plugins) {
     const name = plugin.manifest.name;
-    const disabledFlag = getDisabledPluginFlag(plugin, assistantConfig);
-    if (disabledFlag !== undefined) {
-      log.info(
-        { plugin: name, flag: disabledFlag },
-        `skipping plugin ${name}: feature flag ${disabledFlag} is disabled`,
-      );
-      unregisterPlugin(name);
-      continue;
-    }
 
     // Check for the .disabled sentinel. Both default and user plugins
     // can be disabled by creating a `.disabled` file at
@@ -294,12 +236,12 @@ export async function bootstrapPlugins(): Promise<void> {
     // and drops a `.disabled` file inside it. Runs before init so no
     // tools or routes from the disabled plugin are ever wired.
     //
-    // Unlike the feature-flag path above, we do NOT call
-    // `unregisterPlugin(name)` here. The plugin's hooks stay in the hook
-    // registry and are filtered at read time by `isPluginDisabled` in
-    // `getHooksFor`. This means `assistant plugins enable <name>` takes
-    // effect on the next turn without a restart — the hooks are already
-    // registered, they just need the sentinel removed to be included.
+    // We do NOT call `unregisterPlugin(name)` here. The plugin's hooks
+    // stay in the hook registry and are filtered at read time by
+    // `isPluginDisabled` in `getHooksFor`. This means `assistant plugins
+    // enable <name>` takes effect on the next turn without a restart —
+    // the hooks are already registered, they just need the sentinel
+    // removed to be included.
     const disabledSentinelPath = join(
       getWorkspacePluginsDir(),
       name,
@@ -314,7 +256,7 @@ export async function bootstrapPlugins(): Promise<void> {
     }
 
     try {
-      activePlugins.push(await initializePlugin(plugin, assistantConfig));
+      await initializePlugin(plugin, assistantConfig);
     } catch (err) {
       // Contain the failure to this plugin. `initializePlugin` already rolled
       // back its own partial tool/route contributions, so we just drop
@@ -330,27 +272,6 @@ export async function bootstrapPlugins(): Promise<void> {
       );
     }
   }
-
-  // Shutdown hook — walks plugins in REVERSE registration order. We snapshot
-  // only the plugins that actually initialized so later registrations (if
-  // any) don't end up being torn down by this hook, and plugins skipped by
-  // `requiresFlag` gating do not appear in the tear-down list. Subsequent
-  // bootstraps (hot-reload) would register their own hook.
-  //
-  // For each plugin we:
-  //   1. Unregister contributed HTTP routes so incoming requests stop hitting
-  //      the plugin's handlers before its state is torn down.
-  //   2. Unregister contributed tools so the model-visible tool surface is
-  //      cleared before `onShutdown()` runs.
-  //   3. Call `onShutdown()` (if defined) so the plugin can release resources
-  //      (background tasks, timers, connections) with its tools and routes
-  //      already removed.
-  const shutdownSnapshot: ActivePlugin[] = [...activePlugins];
-  registerShutdownHook("plugins", async (reason) => {
-    for (let i = shutdownSnapshot.length - 1; i >= 0; i--) {
-      await teardownPlugin(shutdownSnapshot[i]!, reason, shutdownContext);
-    }
-  });
 }
 
 /**
@@ -422,14 +343,6 @@ async function initializePlugin(
       );
     }
 
-    if (plugin.jobHandlers && plugin.jobHandlers.length > 0) {
-      registerPluginJobHandlers(name, plugin.jobHandlers);
-      log.info(
-        { plugin: name, count: plugin.jobHandlers.length },
-        "plugin job handlers registered",
-      );
-    }
-
     if (plugin.hooks?.[HOOKS.INIT]) {
       try {
         await plugin.hooks[HOOKS.INIT](initContext);
@@ -449,45 +362,50 @@ async function initializePlugin(
     return { plugin, routeHandles };
   } catch (err) {
     if (initCompleted) {
-      await teardownPlugin({ plugin, routeHandles }, "bootstrap-failed", {
-        assistantVersion: APP_VERSION,
-      });
+      await teardownPlugin(
+        { plugin, routeHandles },
+        { assistantVersion: APP_VERSION, reason: "disable" },
+      );
     } else {
       for (const handle of routeHandles) {
         unregisterSkillRoute(handle);
       }
       unregisterPluginTools(name);
       unregisterPluginInjectors(name);
-      unregisterPluginJobHandlers(name);
     }
     throw err;
   }
 }
 
 /**
- * Tear down a single fully-initialized plugin: unregister routes, unregister
- * tools, then invoke `onShutdown()` if present. Every step swallows errors and
- * logs with plugin attribution so one bad plugin can't block teardown of the
- * rest.
+ * Unregister every initialized plugin's contributed routes and tools in reverse
+ * registration order, clearing the model-visible surface before the shutdown
+ * handler dispatches `shutdown` hooks via `runHook(HOOKS.SHUTDOWN, …)`. Reads
+ * the snapshot captured by the most recent {@link bootstrapPlugins} run; a
+ * no-op when no plugins initialized. Called by the daemon shutdown handler.
+ */
+/**
+ * Tear down a single fully-initialized plugin: unregister its model-visible
+ * surfaces (contributed HTTP routes — keyed by the opaque handles retained at
+ * registration time, since pattern text is not a stable key when two owners
+ * register the same regex — plus its tools and runtime injectors), then invoke
+ * its optional `shutdown` hook with the tools/routes already gone. Every step
+ * swallows errors and logs with plugin attribution so one bad plugin can't
+ * block teardown.
  *
- * Shared between the normal shutdown hook and the bootstrap error path; both
- * consume plugins that already cleared every contribution step.
+ * Used by the bootstrap-failure rollback path. The normal daemon shutdown path
+ * does not unregister surfaces (the process is exiting, so that in-memory state
+ * is discarded anyway); it only fires `shutdown` hooks through the unified
+ * `runHook(HOOKS.SHUTDOWN, …)` pipeline.
  */
 async function teardownPlugin(
   active: ActivePlugin,
-  reason: string,
   shutdownContext: ShutdownContext,
 ): Promise<void> {
   const { plugin, routeHandles } = active;
   const name = plugin.manifest.name;
+  const { reason } = shutdownContext;
 
-  // Unregister model-visible surfaces before invoking `onShutdown()` so the
-  // plugin's onShutdown hook observes a registry state where its tools and
-  // routes are already gone. `unregisterPluginTools` is a no-op when the
-  // plugin never contributed tools, so we don't need to guard on
-  // `plugin.tools` here. Route unregistration keys on the opaque handles
-  // retained at registration time — pattern text is not a stable key because
-  // two owners can legitimately register the same regex.
   for (const handle of routeHandles) {
     try {
       unregisterSkillRoute(handle);
@@ -509,16 +427,11 @@ async function teardownPlugin(
   }
 
   unregisterPluginInjectors(name);
-  unregisterPluginJobHandlers(name);
 
   if (plugin.hooks?.[HOOKS.SHUTDOWN]) {
     try {
       await plugin.hooks[HOOKS.SHUTDOWN](shutdownContext);
     } catch (err) {
-      // Swallow — we want every plugin's shutdown to get a chance to run
-      // even when an earlier one throws. The outer runShutdownHooks already
-      // logs at hook level, but the plugin-name attribution here is what
-      // operators read first.
       log.warn(
         { err, plugin: name, reason },
         "plugin shutdown hook failed (continuing with remaining plugins)",

package/src/daemon/handlers/__tests__/config-a2a-accept.test.ts

@@ -38,7 +38,7 @@ await initializeDb();
 
 function resetTables(): void {
   const sqlite = getSqlite();
-  sqlite.run("DELETE FROM assistant_ingress_invites");
+  sqlite.run("DELETE FROM a2a_invites");
   sqlite.run("DELETE FROM assistant_contact_metadata");
   sqlite.run("DELETE FROM contact_channels");
   sqlite.run("DELETE FROM contacts");

package/src/daemon/handlers/__tests__/config-a2a-complete.test.ts

@@ -26,19 +26,31 @@ import {
 } from "../../../contacts/contact-store.js";
 import { getSqlite } from "../../../persistence/db-connection.js";
 import { initializeDb } from "../../../persistence/db-init.js";
-import { findById } from "../../../persistence/invite-store.js";
 import { completeA2AInvite, createA2AInvite } from "../config-a2a.js";
 
 await initializeDb();
 
 function resetTables(): void {
   const sqlite = getSqlite();
-  sqlite.run("DELETE FROM assistant_ingress_invites");
+  sqlite.run("DELETE FROM a2a_invites");
   sqlite.run("DELETE FROM assistant_contact_metadata");
   sqlite.run("DELETE FROM contact_channels");
   sqlite.run("DELETE FROM contacts");
 }
 
+interface A2aInviteRow {
+  id: string;
+  contact_id: string;
+  status: string;
+  use_count: number;
+}
+
+function getInviteRow(id: string): A2aInviteRow | null {
+  return getSqlite()
+    .prepare("SELECT * FROM a2a_invites WHERE id = ?")
+    .get(id) as A2aInviteRow | null;
+}
+
 function setConfig(opts: {
   a2aEnabled?: boolean;
   publicBaseUrl?: string;
@@ -92,10 +104,10 @@ describe("completeA2AInvite", () => {
     expect(result.error).toBeUndefined();
 
     // Verify the placeholder contact was promoted
-    const invite = findById(created.inviteId!);
+    const invite = getInviteRow(created.inviteId!);
     expect(invite).not.toBeNull();
 
-    const contact = getContact(invite!.contactId);
+    const contact = getContact(invite!.contact_id);
     expect(contact).not.toBeNull();
     expect(contact!.displayName).toBe("Acceptor Bot");
     expect(contact!.channels).toHaveLength(1);
@@ -116,8 +128,8 @@ describe("completeA2AInvite", () => {
     });
     expect(result.success).toBe(true);
 
-    const invite = findById(created.inviteId!);
-    const contact = getContact(invite!.contactId);
+    const invite = getInviteRow(created.inviteId!);
+    const contact = getContact(invite!.contact_id);
     expect(contact!.channels[0]!.address).toBe("upper-case-id-123");
   });
 
@@ -130,8 +142,8 @@ describe("completeA2AInvite", () => {
     });
     expect(result.success).toBe(true);
 
-    const invite = findById(created.inviteId!);
-    const metadata = getAssistantContactMetadata(invite!.contactId);
+    const invite = getInviteRow(created.inviteId!);
+    const metadata = getAssistantContactMetadata(invite!.contact_id);
     expect(metadata).not.toBeNull();
     expect(metadata!.species).toBe("vellum");
     expect(metadata!.metadata).toEqual({
@@ -159,10 +171,10 @@ describe("completeA2AInvite", () => {
     // The invite was just created with 0 hours expiry, so expiresAt ~= now
     // Manually expire it by updating the DB
     const sqlite = getSqlite();
-    sqlite.run(
-      "UPDATE assistant_ingress_invites SET expires_at = ? WHERE id = ?",
-      [Date.now() - 1000, created.inviteId!],
-    );
+    sqlite.run("UPDATE a2a_invites SET expires_at = ? WHERE id = ?", [
+      Date.now() - 1000,
+      created.inviteId!,
+    ]);
 
     const result = completeA2AInvite({
       token: created.token!,
@@ -238,8 +250,8 @@ describe("completeA2AInvite", () => {
     expect(result.error).toContain("public base URL");
 
     // Verify the invite was NOT consumed
-    const invite = findById(created.inviteId!);
+    const invite = getInviteRow(created.inviteId!);
     expect(invite!.status).toBe("active");
-    expect(invite!.useCount).toBe(0);
+    expect(invite!.use_count).toBe(0);
   });
 });

package/src/daemon/handlers/__tests__/config-a2a-invite.test.ts

@@ -23,19 +23,33 @@ import {
 import { getContact } from "../../../contacts/contact-store.js";
 import { getSqlite } from "../../../persistence/db-connection.js";
 import { initializeDb } from "../../../persistence/db-init.js";
-import { findById } from "../../../persistence/invite-store.js";
 import { createA2AInvite, getA2AConfig } from "../config-a2a.js";
 
 await initializeDb();
 
 function resetTables(): void {
   const sqlite = getSqlite();
-  sqlite.run("DELETE FROM assistant_ingress_invites");
+  sqlite.run("DELETE FROM a2a_invites");
   sqlite.run("DELETE FROM assistant_contact_metadata");
   sqlite.run("DELETE FROM contact_channels");
   sqlite.run("DELETE FROM contacts");
 }
 
+interface A2aInviteRow {
+  id: string;
+  contact_id: string;
+  status: string;
+  max_uses: number;
+  use_count: number;
+  expires_at: number;
+}
+
+function getInviteRow(id: string): A2aInviteRow | null {
+  return getSqlite()
+    .prepare("SELECT * FROM a2a_invites WHERE id = ?")
+    .get(id) as A2aInviteRow | null;
+}
+
 function setConfig(opts: {
   a2aEnabled?: boolean;
   publicBaseUrl?: string;
@@ -75,15 +89,14 @@ describe("createA2AInvite", () => {
     expect(result.error).toBeUndefined();
   });
 
-  test("creates invite in DB with source_channel=a2a, status=active, max_uses=1", () => {
+  test("creates invite in a2a_invites with status=active, max_uses=1", () => {
     const result = createA2AInvite({});
     expect(result.inviteId).toBeDefined();
 
-    const invite = findById(result.inviteId!);
+    const invite = getInviteRow(result.inviteId!);
     expect(invite).not.toBeNull();
-    expect(invite!.sourceChannel).toBe("a2a");
     expect(invite!.status).toBe("active");
-    expect(invite!.maxUses).toBe(1);
+    expect(invite!.max_uses).toBe(1);
   });
 
   test("auto-enables A2A if not already on", () => {
@@ -101,10 +114,10 @@ describe("createA2AInvite", () => {
     const result = createA2AInvite({});
     expect(result.inviteId).toBeDefined();
 
-    const invite = findById(result.inviteId!);
+    const invite = getInviteRow(result.inviteId!);
     expect(invite).not.toBeNull();
 
-    const contact = getContact(invite!.contactId);
+    const contact = getContact(invite!.contact_id);
     expect(contact).not.toBeNull();
     expect(contact!.displayName).toBe("Pending A2A invite");
     expect(contact!.channels).toHaveLength(0);
@@ -128,13 +141,13 @@ describe("createA2AInvite", () => {
     const after = Date.now();
     expect(result.success).toBe(true);
 
-    const invite = findById(result.inviteId!);
+    const invite = getInviteRow(result.inviteId!);
     expect(invite).not.toBeNull();
 
     const expectedMinMs = before + 24 * 60 * 60 * 1000;
     const expectedMaxMs = after + 24 * 60 * 60 * 1000;
-    expect(invite!.expiresAt).toBeGreaterThanOrEqual(expectedMinMs);
-    expect(invite!.expiresAt).toBeLessThanOrEqual(expectedMaxMs);
+    expect(invite!.expires_at).toBeGreaterThanOrEqual(expectedMinMs);
+    expect(invite!.expires_at).toBeLessThanOrEqual(expectedMaxMs);
   });
 
   test("default expiry is 72 hours", () => {
@@ -143,12 +156,12 @@ describe("createA2AInvite", () => {
     const after = Date.now();
     expect(result.success).toBe(true);
 
-    const invite = findById(result.inviteId!);
+    const invite = getInviteRow(result.inviteId!);
     expect(invite).not.toBeNull();
 
     const expectedMinMs = before + 72 * 60 * 60 * 1000;
     const expectedMaxMs = after + 72 * 60 * 60 * 1000;
-    expect(invite!.expiresAt).toBeGreaterThanOrEqual(expectedMinMs);
-    expect(invite!.expiresAt).toBeLessThanOrEqual(expectedMaxMs);
+    expect(invite!.expires_at).toBeGreaterThanOrEqual(expectedMinMs);
+    expect(invite!.expires_at).toBeLessThanOrEqual(expectedMaxMs);
   });
 });

package/src/daemon/handlers/__tests__/config-channels.test.ts

@@ -92,7 +92,6 @@ mock.module("../../../ipc/gateway-client.js", () => ({
 
 mock.module("../../../runtime/channel-verification-service.js", () => ({
   getGuardianBinding: () => mockBinding,
-  revokeBinding: () => true,
   revokePendingSessions: () => {},
   createOutboundSession: () => ({
     sessionId: "sess",
@@ -129,10 +128,6 @@ function channel(overrides: Partial<ContactChannel> = {}): ContactChannel {
     address: "user-123",
     isPrimary: true,
     externalChatId: "chat-123",
-    inviteId: null,
-    lastSeenAt: null,
-    interactionCount: 0,
-    lastInteraction: null,
     updatedAt: null,
     createdAt: 0,
     ...overrides,

package/src/daemon/handlers/config-a2a.ts

@@ -26,12 +26,11 @@ import {
 } from "../../contacts/contact-store.js";
 import type { VellumAssistantMetadata } from "../../contacts/types.js";
 import { getPublicBaseUrl } from "../../inbound/public-ingress-urls.js";
-import { getDb } from "../../persistence/db-connection.js";
 import {
-  claimA2AInvite,
-  createInvite,
-  hashToken,
-} from "../../persistence/invite-store.js";
+  claimA2aInvite,
+  createA2aInvite,
+} from "../../persistence/a2a-invite-store.js";
+import { getDb } from "../../persistence/db-connection.js";
 import { assistantContactMetadata } from "../../persistence/schema/index.js";
 import type { HttpErrorResponse } from "../../runtime/http-errors.js";
 import { getLogger } from "../../util/logger.js";
@@ -157,8 +156,7 @@ export function createA2AInvite(params: {
 
   // 4. Create the invite
   const expiresInMs = (params.expiresInHours ?? 72) * 60 * 60 * 1000;
-  const { invite, rawToken } = createInvite({
-    sourceChannel: "a2a",
+  const { invite, rawToken } = createA2aInvite({
     contactId: contact.id,
     maxUses: 1,
     expiresInMs,
@@ -197,9 +195,8 @@ export function completeA2AInvite(params: {
     };
   }
 
-  const tokenHash = hashToken(params.token);
-  const claimResult = claimA2AInvite({
-    tokenHash,
+  const claimResult = claimA2aInvite({
+    token: params.token,
     redeemedByExternalUserId: params.acceptor.assistantId,
   });
 
@@ -219,8 +216,6 @@ export function completeA2AInvite(params: {
       {
         type: "a2a",
         address: params.acceptor.assistantId.toLowerCase(),
-        status: "active",
-        policy: "allow",
       },
     ],
   });
@@ -283,8 +278,6 @@ export function redeemA2AInvite(params: {
       {
         type: "a2a",
         address: params.sender.assistantId.toLowerCase(),
-        status: "active",
-        policy: "allow",
       },
     ],
   });

package/src/daemon/handlers/config-channels.ts

@@ -34,7 +34,6 @@ import {
   getGuardianBinding,
   getPendingSession,
   isGuardianBoundForChannel,
-  revokeBinding,
   revokePendingSessions,
   updateSessionDelivery,
 } from "../../runtime/channel-verification-service.js";
@@ -263,19 +262,12 @@ export async function revokeVerificationForChannel(
       if (!parsed.ok) {
         throw new Error("mark_channel_revoked relay returned ok: false");
       }
-      // The gateway dual-write already set the assistant channel to "revoked",
-      // so the later revokeGuardianBinding lookup (active-only) finds nothing
-      // and won't fire the invalidation. Emit it here so open client views
-      // stop showing the channel as active.
+      // Emit the invalidation so open client views stop showing the channel
+      // as active after the gateway dual-writes it to "revoked".
       notifyContactsChanged();
     }
   }
 
-  // The guardian binding is assistant-owned state the gateway relay does not
-  // manage; tear it down here. The contact-change invalidation is emitted
-  // explicitly above on relay success.
-  revokeBinding(assistantId, resolvedChannel);
-
   return {
     success: true,
     bound: false,

package/src/daemon/handlers/conversation-history.ts

@@ -16,7 +16,9 @@ export interface ConversationSearchParams {
 }
 
 /** Search conversations and return results (no transport dependency). */
-export function performConversationSearch(params: ConversationSearchParams) {
+export async function performConversationSearch(
+  params: ConversationSearchParams,
+) {
   // Treat "*" as a list-all wildcard — FTS treats it as a literal character.
   if (params.query.trim() === "*") {
     const rows = listConversations(params.limit);