@vellumai/assistant 0.10.3-dev.202606291517.f0c68f7 → 0.10.3-dev.202606291709.2b4d83d

package/ARCHITECTURE.md

@@ -99,7 +99,7 @@ All HTTP API requests use a single `Authorization: Bearer <jwt>` header for auth
 | `src/runtime/routes/guardian-bootstrap-routes.ts` | `POST /v1/guardian/init` (initial JWT issuance)                                               |
 | `src/runtime/routes/guardian-refresh-routes.ts`   | `POST /v1/guardian/refresh` (token rotation)                                                  |
 | `src/runtime/local-actor-identity.ts`             | `resolveLocalGuardianContext` — deterministic local identity                                  |
-| `src/memory/channel-verification-sessions.ts`     | Guardian binding types, verification session management                                       |
+| `src/channels/channel-verification-sessions.ts`   | Guardian binding types, verification session management                                       |
 
 ### Channel-Agnostic Scoped Approval Grants
 
@@ -178,7 +178,7 @@ The canonical guardian request system provides a channel-agnostic, unified domai
 
 **Architecture layers:**
 
-1. **Canonical domain (single source of truth):** All guardian requests — tool approvals, pending questions, access requests — are persisted in the `canonical_guardian_requests` table (`src/memory/canonical-guardian-store.js`). Each request has a unique ID, a short human-readable request code, and a status that follows a CAS (compare-and-swap) lifecycle: `pending` -> `approved` | `denied` | `expired` | `cancelled`. Deliveries (notifications sent to guardians) are tracked in `canonical_guardian_deliveries`.
+1. **Canonical domain (single source of truth):** All guardian requests — tool approvals, pending questions, access requests — are persisted in the `canonical_guardian_requests` table (`src/contacts/canonical-guardian-store.js`). Each request has a unique ID, a short human-readable request code, and a status that follows a CAS (compare-and-swap) lifecycle: `pending` -> `approved` | `denied` | `expired` | `cancelled`. Deliveries (notifications sent to guardians) are tracked in `canonical_guardian_deliveries`.
 
 2. **Unified apply primitive (single write path):** `applyCanonicalGuardianDecision()` in `src/approvals/guardian-decision-primitive.ts` is the single write path for all guardian decisions. It enforces identity validation, expiry checks, CAS resolution, `approve_always` downgrade (guardian-on-behalf invariant), kind-specific resolver dispatch via the resolver registry, and scoped grant minting. All callers — HTTP API, inbound channel router, desktop session — route decisions through this function.
 
@@ -200,7 +200,7 @@ The canonical guardian request system provides a channel-agnostic, unified domai
 
 | File                                                    | Purpose                                                                               |
 | ------------------------------------------------------- | ------------------------------------------------------------------------------------- |
-| `src/memory/canonical-guardian-store.ts`                | Canonical request and delivery persistence (CRUD, CAS resolve, list with filters)     |
+| `src/contacts/canonical-guardian-store.ts`              | Canonical request and delivery persistence (CRUD, CAS resolve, list with filters)     |
 | `src/approvals/guardian-decision-primitive.ts`          | Canonical decision primitive: `applyCanonicalGuardianDecision` + scoped grant minting |
 | `src/approvals/guardian-request-resolvers.ts`           | Resolver registry: kind-specific side-effect dispatch after CAS resolution            |
 | `src/runtime/guardian-reply-router.ts`                  | Shared inbound router: callback -> code -> NL classification pipeline                 |
@@ -434,7 +434,7 @@ External users who are not the guardian can gain access to the assistant through
 | `src/runtime/invite-service.ts`                        | Business logic for invite operations                                          |
 | `src/contacts/contact-store.ts`                        | Contact read queries — lookup, search, list, and channel operations           |
 | `src/memory/guardian-approvals.ts`                     | Approval request persistence                                                  |
-| `src/memory/channel-verification-sessions.ts`          | Verification challenge persistence                                            |
+| `src/channels/channel-verification-sessions.ts`        | Verification challenge persistence                                            |
 | `src/config/bundled-skills/contacts/SKILL.md`          | Unified skill for contact management, access control, and invite links        |
 
 ### Guardian-Initiated Invite Links
@@ -594,7 +594,7 @@ All guardian decisions for voice access requests flow through:
 | `src/approvals/guardian-decision-primitive.ts` | `applyCanonicalGuardianDecision` — unified decision primitive                          |
 | `src/approvals/guardian-request-resolvers.ts`  | `access_request` resolver — voice direct activation, text-channel verification session |
 | `src/runtime/actor-trust-resolver.ts`          | `resolveActorTrust` — caller trust classification                                      |
-| `src/memory/canonical-guardian-store.ts`       | Canonical request persistence and CAS resolution                                       |
+| `src/contacts/canonical-guardian-store.ts`     | Canonical request persistence and CAS resolution                                       |
 
 ### Speech-to-Text (STT) Boundaries
 
@@ -2152,7 +2152,7 @@ The guardian trust system uses a three-valued `TrustClass` — `'guardian'`, `'t
 
 **Explicit trust gates:** `trustClass` is a **required** field in `ToolContext` (in `src/tools/types.ts`). Every tool execution must carry a trust classification — the field is not optional. This ensures trust-gated tool policies (guardian control-plane restrictions, host-tool blocking for untrusted actors) cannot be bypassed by omitting the classification.
 
-**Guardian bindings** (in `src/memory/channel-verification-sessions.ts`) always carry `guardianPrincipalId: string` as a required, non-null field. A binding without a principal ID is invalid and cannot be created.
+**Guardian bindings** (in `src/channels/channel-verification-sessions.ts`) always carry `guardianPrincipalId: string` as a required, non-null field. A binding without a principal ID is invalid and cannot be created.
 
 **Strict retry sweep parsing:** The channel retry sweep (`src/runtime/channel-retry-sweep.ts`) uses `parseTrustRuntimeContext()` which validates `trustClass` against the canonical three-value set. There is no fallback to a legacy `actorRole` field — stored payloads that lack a valid `trustClass` are rejected deterministically to prevent silent privilege escalation. When `trustCtx` is entirely absent from a stored payload (pre-guardian events), the sweep synthesizes an explicit `trustClass: 'unknown'` context so that replay never proceeds without a trust classification.
 
@@ -2160,13 +2160,13 @@ The guardian trust system uses a three-valued `TrustClass` — `'guardian'`, `'t
 
 **Key files:**
 
-| File                                          | Purpose                                               |
-| --------------------------------------------- | ----------------------------------------------------- |
-| `src/daemon/conversation-runtime-assembly.ts` | `TrustContext` type definition                        |
-| `src/tools/types.ts`                          | `ToolContext.trustClass` (required trust gate)        |
-| `src/runtime/channel-retry-sweep.ts`          | Strict `trustClass` parser for retry sweep            |
-| `src/memory/channel-verification-sessions.ts` | `GuardianBinding` with required `guardianPrincipalId` |
-| `src/__tests__/trust-context-guards.test.ts`  | Guard tests enforcing trust-context type invariants   |
+| File                                            | Purpose                                               |
+| ----------------------------------------------- | ----------------------------------------------------- |
+| `src/daemon/conversation-runtime-assembly.ts`   | `TrustContext` type definition                        |
+| `src/tools/types.ts`                            | `ToolContext.trustClass` (required trust gate)        |
+| `src/runtime/channel-retry-sweep.ts`            | Strict `trustClass` parser for retry sweep            |
+| `src/channels/channel-verification-sessions.ts` | `GuardianBinding` with required `guardianPrincipalId` |
+| `src/__tests__/trust-context-guards.test.ts`    | Guard tests enforcing trust-context type invariants   |
 
 ### TTS Provider Abstraction (`services.tts`)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vellumai/assistant",
-  "version": "0.10.3-dev.202606291517.f0c68f7",
+  "version": "0.10.3-dev.202606291709.2b4d83d",
   "license": "MIT",
   "type": "module",
   "exports": {

package/src/__tests__/app-builder-tool-scripts.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, mock, test } from "bun:test";
 
-import type { AppDefinition } from "../memory/app-store.js";
+import type { AppDefinition } from "../apps/app-store.js";
 import type { AppStore } from "../tools/apps/executors.js";
 import type { ToolContext } from "../tools/types.js";
 
@@ -53,7 +53,7 @@ function makeContext(overrides: Partial<ToolContext> = {}): ToolContext {
 
 const mockStore = makeMockStore();
 
-mock.module("../memory/app-store.js", () => ({
+mock.module("../apps/app-store.js", () => ({
   ...mockStore,
   getAppsDir: () => "/tmp/test-apps",
   getAppDirPath: (appId: string) => `/tmp/test-apps/${appId}`,

package/src/__tests__/app-bundler.test.ts

@@ -25,7 +25,7 @@ const testAppsDir = join(tmpdir(), `app-bundler-test-${Date.now()}`);
 
 // Mock app-store so packageApp can find our test apps
 const mockApps = new Map<string, Record<string, unknown>>();
-mock.module("../memory/app-store.js", () => ({
+mock.module("../apps/app-store.js", () => ({
   getApp: (id: string) => mockApps.get(id) ?? null,
   getAppsDir: () => testAppsDir,
   getAppDirPath: (id: string) => join(testAppsDir, id),

package/src/__tests__/app-conversation-ids-backfill.test.ts

@@ -15,10 +15,10 @@ import {
   backfillAppConversationIds,
   createApp,
   getApp,
-} from "../memory/app-store.js";
-import { rawRun } from "../memory/raw-query.js";
+} from "../apps/app-store.js";
 import { getDb } from "../persistence/db-connection.js";
 import { initializeDb } from "../persistence/db-init.js";
+import { rawRun } from "../persistence/raw-query.js";
 
 // Initialize db once for all tests
 await initializeDb();

package/src/__tests__/app-conversation-ids.test.ts

@@ -8,7 +8,7 @@ import {
   createApp,
   getApp,
   listAppsByConversation,
-} from "../memory/app-store.js";
+} from "../apps/app-store.js";
 
 // ---------------------------------------------------------------------------
 // Helpers

package/src/__tests__/app-dir-path-guard.test.ts

@@ -16,8 +16,8 @@ import { describe, expect, test } from "bun:test";
 
 /** Files that are permitted to import getAppsDir. */
 const ALLOWLIST = new Set([
-  "assistant/src/memory/app-store.ts", // defines getAppsDir
-  "assistant/src/memory/app-git-service.ts", // uses getAppsDir for git repo root, not per-app paths
+  "assistant/src/apps/app-store.ts", // defines getAppsDir
+  "assistant/src/apps/app-git-service.ts", // uses getAppsDir for git repo root, not per-app paths
   "assistant/src/daemon/app-source-watcher.ts", // uses getAppsDir for recursive fs.watch root, not per-app paths
   "assistant/src/tools/filesystem/write.ts", // uses getAppsDir as an exemption root for the artifact-HTML guard, not per-app paths
 ]);

package/src/__tests__/app-executors.test.ts

@@ -27,7 +27,7 @@ beforeEach(() => {
   };
 });
 
-import type { AppDefinition } from "../memory/app-store.js";
+import type { AppDefinition } from "../apps/app-store.js";
 import type { AppStore } from "../tools/apps/executors.js";
 import {
   executeAppCreate,

package/src/__tests__/app-git-history.test.ts

@@ -13,8 +13,8 @@ import {
   getAppFileAtVersion,
   getAppHistory,
   restoreAppVersion,
-} from "../memory/app-git-service.js";
-import { createApp, getAppDirPath, updateApp } from "../memory/app-store.js";
+} from "../apps/app-git-service.js";
+import { createApp, getAppDirPath, updateApp } from "../apps/app-store.js";
 
 describe("App Git History", () => {
   beforeEach(() => {

package/src/__tests__/app-git-service.test.ts

@@ -4,7 +4,7 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { afterEach, beforeEach, describe, expect, test } from "bun:test";
 
-import { commitAppTurnChanges } from "../memory/app-git-service.js";
+import { commitAppTurnChanges } from "../apps/app-git-service.js";
 import {
   createApp,
   deleteApp,
@@ -12,7 +12,7 @@ import {
   getAppsDir,
   updateApp,
   writeAppFile,
-} from "../memory/app-store.js";
+} from "../apps/app-store.js";
 import { _resetGitServiceRegistry } from "../workspace/git-service.js";
 
 let testDataDir: string;

package/src/__tests__/app-routes-csp.test.ts

@@ -34,7 +34,7 @@ const apps = new Map<string, typeof legacyApp | typeof multifileApp>([
   ["multi-1", multifileApp],
 ]);
 
-mock.module("../memory/app-store.js", () => ({
+mock.module("../apps/app-store.js", () => ({
   getApp: (id: string) => apps.get(id) ?? null,
   getAppsDir: () => "/fake/apps",
   getAppDirPath: (appId: string) => `/fake/apps/${appId}`,
@@ -42,7 +42,7 @@ mock.module("../memory/app-store.js", () => ({
 }));
 
 // Mock shared-app-links-store (imported by app-routes but unused here)
-mock.module("../memory/shared-app-links-store.js", () => ({
+mock.module("../apps/shared-app-links-store.js", () => ({
   createSharedAppLink: () => ({ shareToken: "tok" }),
   getSharedAppLink: () => null,
   incrementDownloadCount: () => {},

package/src/__tests__/app-source-watcher.test.ts

@@ -44,7 +44,7 @@ mock.module("node:fs", () => {
   };
 });
 
-mock.module("../memory/app-store.js", () => ({
+mock.module("../apps/app-store.js", () => ({
   getAppsDir: mock(() => TEST_APPS_DIR),
   resolveAppIdByDirName: mock(
     (dirName: string) => testDirNameMap.get(dirName) ?? null,

package/src/__tests__/app-store-dir-names.test.ts

@@ -22,7 +22,7 @@ import {
   slugify,
   updateApp,
   validateDirName,
-} from "../memory/app-store.js";
+} from "../apps/app-store.js";
 
 // ---------------------------------------------------------------------------
 // Helpers

package/src/__tests__/approval-cascade.test.ts

@@ -222,7 +222,7 @@ mock.module("../agent/loop.js", () => ({
   },
 }));
 
-mock.module("../memory/canonical-guardian-store.js", () => ({
+mock.module("../contacts/canonical-guardian-store.js", () => ({
   listPendingCanonicalGuardianRequestsByDestinationConversation: () => [],
   listCanonicalGuardianRequests: () => [],
   listPendingRequestsByConversationScope: () => [],

package/src/__tests__/attachments-store.test.ts

@@ -20,8 +20,6 @@ mock.module("../config/loader.js", () => ({
   }),
 }));
 
-import { getConversationDirPath } from "../memory/conversation-disk-view.js";
-import { rawGet, rawRun } from "../memory/raw-query.js";
 import {
   AttachmentUploadError,
   deleteAttachment,
@@ -41,8 +39,10 @@ import {
   addMessage,
   createConversation,
 } from "../persistence/conversation-crud.js";
+import { getConversationDirPath } from "../persistence/conversation-disk-view.js";
 import { getDb } from "../persistence/db-connection.js";
 import { initializeDb } from "../persistence/db-init.js";
+import { rawGet, rawRun } from "../persistence/raw-query.js";
 import { getConversationsDir } from "../util/platform.js";
 
 await initializeDb();

package/src/__tests__/audit-log-rotation.test.ts

@@ -12,12 +12,12 @@ mock.module("../util/logger.js", () => ({
     }),
 }));
 
+import { getSqlite } from "../persistence/db-connection.js";
+import { initializeDb } from "../persistence/db-init.js";
 import {
   getRecentInvocations,
   rotateToolInvocations,
-} from "../memory/tool-usage-store.js";
-import { getSqlite } from "../persistence/db-connection.js";
-import { initializeDb } from "../persistence/db-init.js";
+} from "../telemetry/tool-usage-store.js";
 import { resetDbForTesting } from "./db-test-helpers.js";
 
 // ---------------------------------------------------------------------------

package/src/__tests__/auth-fallback-events-store.test.ts

@@ -13,14 +13,14 @@ mock.module("../platform/consent-cache.js", () => ({
   getCachedShareAnalytics: () => shareAnalytics,
 }));
 
+import { getDb } from "../persistence/db-connection.js";
+import { initializeDb } from "../persistence/db-init.js";
+import { authFallbackEvents } from "../persistence/schema/index.js";
 import {
   type AuthFallbackCount,
   queryUnreportedAuthFallbackEvents,
   recordAuthFallbackCounts,
-} from "../memory/auth-fallback-events-store.js";
-import { getDb } from "../persistence/db-connection.js";
-import { initializeDb } from "../persistence/db-init.js";
-import { authFallbackEvents } from "../persistence/schema/index.js";
+} from "../security/auth-fallback-events-store.js";
 
 await initializeDb();
 

package/src/__tests__/auto-analysis-end-to-end.test.ts

@@ -130,7 +130,6 @@ mock.module("../runtime/services/analyze-conversation.js", () => ({
 
 // ── Real imports ──────────────────────────────────────────────────
 
-import { conversationAnalyzeJob } from "../memory/conversation-analyze-job.js";
 import { indexMessageNow } from "../memory/indexer.js";
 import { createConversation } from "../persistence/conversation-crud.js";
 import { getDb, getMemoryDb } from "../persistence/db-connection.js";
@@ -141,6 +140,7 @@ import {
   memoryJobs,
   messages,
 } from "../persistence/schema/index.js";
+import { conversationAnalyzeJob } from "../runtime/services/conversation-analyze-job.js";
 import { setOverridesForTesting } from "./feature-flag-test-helpers.js";
 
 // ── Helpers ───────────────────────────────────────────────────────

package/src/__tests__/background-workers-disk-pressure.test.ts

@@ -165,7 +165,7 @@ mock.module("../persistence/conversation-crud.js", () => ({
   extractImageSourcePaths: () => undefined,
 }));
 
-mock.module("../memory/conversation-title-service.js", () => ({
+mock.module("../persistence/conversation-title-service.js", () => ({
   GENERATING_TITLE: "Generating title...",
   AUTO_TITLE_DETERMINISTIC: 2,
   deriveDeterministicTitle: (context: { systemHint?: string }) =>
@@ -207,7 +207,7 @@ mock.module("../persistence/db-maintenance.js", () => ({
   maybeRunDbMaintenance: mockMaybeRunDbMaintenance,
 }));
 
-mock.module("../memory/cleanup-schedule-state.js", () => ({
+mock.module("../persistence/cleanup-schedule-state.js", () => ({
   getLastScheduledCleanupEnqueueMs: () => 0,
   markScheduledCleanupEnqueued: mock(() => {}),
 }));

package/src/__tests__/btw-routes.test.ts

@@ -31,7 +31,7 @@ const mockGetConversationByKey = mock(
   }),
 );
 
-mock.module("../memory/conversation-key-store.js", () => ({
+mock.module("../persistence/conversation-key-store.js", () => ({
   getConversationByKey: mockGetConversationByKey,
   getOrCreateConversation: () => {
     throw new Error(

package/src/__tests__/call-controller.test.ts

@@ -269,11 +269,11 @@ import { loadConfig } from "../config/loader.js";
 import {
   getCanonicalGuardianRequest,
   getPendingCanonicalRequestByCallSessionId,
-} from "../memory/canonical-guardian-store.js";
-import { resetTestTables } from "../memory/raw-query.js";
+} from "../contacts/canonical-guardian-store.js";
 import { getMessages } from "../persistence/conversation-crud.js";
 import { getDb } from "../persistence/db-connection.js";
 import { initializeDb } from "../persistence/db-init.js";
+import { resetTestTables } from "../persistence/raw-query.js";
 import { conversations } from "../persistence/schema/index.js";
 import { resetDbForTesting } from "./db-test-helpers.js";
 import { createGuardianBinding } from "./helpers/create-guardian-binding.js";

package/src/__tests__/call-domain.test.ts

@@ -95,7 +95,7 @@ mock.module("../inbound/public-ingress-urls.js", () => ({
     "https://test.example.com/webhooks/twilio/status",
 }));
 
-mock.module("../memory/conversation-title-service.js", () => ({
+mock.module("../persistence/conversation-title-service.js", () => ({
   queueGenerateConversationTitle: () => {},
 }));
 

package/src/__tests__/cancel-resolves-conversation-key.test.ts

@@ -54,7 +54,7 @@ mock.module("../daemon/handlers/conversations.js", () => ({
   regenerateResponse: async () => null,
 }));
 
-import { getOrCreateConversation } from "../memory/conversation-key-store.js";
+import { getOrCreateConversation } from "../persistence/conversation-key-store.js";
 import { initializeDb } from "../persistence/db-init.js";
 import { ROUTES } from "../runtime/routes/conversation-management-routes.js";
 import { routeDefinitionsToHTTPRoutes } from "../runtime/routes/http-adapter.js";

package/src/__tests__/canonical-guardian-store.test.ts

@@ -21,7 +21,7 @@ import {
   resolveCanonicalGuardianRequest,
   updateCanonicalGuardianDelivery,
   updateCanonicalGuardianRequest,
-} from "../memory/canonical-guardian-store.js";
+} from "../contacts/canonical-guardian-store.js";
 import { getDb } from "../persistence/db-connection.js";
 import { initializeDb } from "../persistence/db-init.js";
 await initializeDb();

package/src/__tests__/channel-approval-routes.test.ts

@@ -69,16 +69,16 @@ mock.module("../daemon/approval-generators.js", () => ({
   createApprovalConversationGenerator: () => _testApprovalConversationGenerator,
 }));
 
-import type { Conversation } from "../daemon/conversation.js";
 import {
   createCanonicalGuardianDelivery,
   createCanonicalGuardianRequest,
   getCanonicalGuardianRequest,
-} from "../memory/canonical-guardian-store.js";
-import { resetTestTables } from "../memory/raw-query.js";
+} from "../contacts/canonical-guardian-store.js";
+import type { Conversation } from "../daemon/conversation.js";
 import { getDb } from "../persistence/db-connection.js";
 import { initializeDb } from "../persistence/db-init.js";
 import * as deliveryChannels from "../persistence/delivery-channels.js";
+import { resetTestTables } from "../persistence/raw-query.js";
 import { conversations } from "../persistence/schema/index.js";
 import { initAuthSigningKey } from "../runtime/auth/token-service.js";
 import * as gatewayClient from "../runtime/gateway-client.js";

package/src/__tests__/channel-delivery-store.test.ts

@@ -21,7 +21,7 @@ import { eq } from "drizzle-orm";
 import {
   getConversationByKey,
   setConversationKey,
-} from "../memory/conversation-key-store.js";
+} from "../persistence/conversation-key-store.js";
 import { getDb } from "../persistence/db-connection.js";
 import { initializeDb } from "../persistence/db-init.js";
 import {

package/src/__tests__/channel-guardian.test.ts

@@ -112,11 +112,6 @@ mock.module("../contacts/guardian-delivery-reader.js", () => ({
   ) => list.find((g) => g.channelType === channelType && g.status === "active"),
 }));
 
-import { handleChannelVerificationSession } from "../daemon/handlers/config-channels.js";
-import type {
-  ChannelVerificationSessionRequest,
-  ChannelVerificationSessionResponse,
-} from "../daemon/message-protocol.js";
 import {
   bindSessionIdentity as _storeBindSessionIdentity,
   consumeSession,
@@ -129,12 +124,17 @@ import {
   findSessionByIdentity as _storeFindSessionByIdentity,
   updateSessionDelivery as storeUpdateSessionDelivery,
   updateSessionStatus as _storeUpdateSessionStatus,
-} from "../memory/channel-verification-sessions.js";
+} from "../channels/channel-verification-sessions.js";
 import {
   getRateLimit,
   recordInvalidAttempt,
   resetRateLimit,
-} from "../memory/guardian-rate-limits.js";
+} from "../contacts/guardian-rate-limits.js";
+import { handleChannelVerificationSession } from "../daemon/handlers/config-channels.js";
+import type {
+  ChannelVerificationSessionRequest,
+  ChannelVerificationSessionResponse,
+} from "../daemon/message-protocol.js";
 import { getDb } from "../persistence/db-connection.js";
 import { initializeDb } from "../persistence/db-init.js";
 import { upsertBinding as upsertExternalBinding } from "../persistence/external-conversation-store.js";

package/src/__tests__/channel-retry-sweep.test.ts

@@ -251,6 +251,51 @@ describe("channel-retry-sweep", () => {
     }
   });
 
+  test("restores member-grounding + timezone trust fields on replay", async () => {
+    const eventId = seedFailedEventWithTrustClass("trusted_contact", {
+      requesterContactId: "contact-77",
+      memberStatus: "active",
+      memberPolicy: "allow",
+      requesterTimezone: "America/New_York",
+      requesterTimezoneLabel: "EST",
+      requesterTimezoneOffsetSeconds: -18000,
+    });
+
+    let capturedTrust: Record<string, unknown> | undefined;
+    await sweepFailedEvents(async (conversationId, _content, options) => {
+      capturedTrust = (options as { trustContext?: Record<string, unknown> })
+        .trustContext;
+      const messageId = "message-grounding";
+      getDb()
+        .insert(messages)
+        .values({
+          id: messageId,
+          conversationId,
+          role: "user",
+          content: JSON.stringify([{ type: "text", text: "retry me" }]),
+          createdAt: Date.now(),
+        })
+        .run();
+      return { messageId };
+    });
+
+    // Member-grounding + timezone fields survive the store→replay round-trip,
+    // so the replayed turn keeps its member grounding.
+    expect(capturedTrust?.requesterContactId).toBe("contact-77");
+    expect(capturedTrust?.memberStatus).toBe("active");
+    expect(capturedTrust?.memberPolicy).toBe("allow");
+    expect(capturedTrust?.requesterTimezone).toBe("America/New_York");
+    expect(capturedTrust?.requesterTimezoneLabel).toBe("EST");
+    expect(capturedTrust?.requesterTimezoneOffsetSeconds).toBe(-18000);
+
+    const eventRow = getDb()
+      .select()
+      .from(channelInboundEvents)
+      .where(eq(channelInboundEvents.id, eventId))
+      .get();
+    expect(eventRow?.processingStatus).toBe("processed");
+  });
+
   test("marks legacy payloads with only actorRole (no trustClass) as failed", async () => {
     const actorRoles: Array<
       "guardian" | "non-guardian" | "unverified_channel"

package/src/__tests__/compaction-events.test.ts

@@ -229,7 +229,7 @@ mock.module("../persistence/llm-usage-store.js", () => ({
   listUsageEvents: () => [],
 }));
 
-mock.module("../memory/auto-analysis-enqueue.js", () => ({
+mock.module("../runtime/services/auto-analysis-enqueue.js", () => ({
   enqueueAutoAnalysisOnCompaction: () => {},
 }));
 
@@ -255,7 +255,7 @@ mock.module("../agent/loop.js", () => ({
   },
 }));
 
-mock.module("../memory/canonical-guardian-store.js", () => ({
+mock.module("../contacts/canonical-guardian-store.js", () => ({
   listPendingCanonicalGuardianRequestsByDestinationConversation: () => [],
   listCanonicalGuardianRequests: () => [],
   listPendingRequestsByConversationScope: () => [],

package/src/__tests__/config-watcher-cleanup-throttle.test.ts

@@ -7,7 +7,7 @@
  * maybeEnqueueScheduledCleanupJobs (in jobs-worker) early-returns while
  * the throttle is still within its window.
  *
- * The shared throttle state lives in memory/cleanup-schedule-state.ts so
+ * The shared throttle state lives in persistence/cleanup-schedule-state.ts so
  * that config-watcher can reset it without pulling jobs-worker's large
  * transitive import graph into test modules. This test stubs the
  * schedule-state module so calls from config-watcher can be counted
@@ -113,7 +113,7 @@ describe("cleanupSettingsChanged", () => {
 // Track calls from config-watcher into the (mocked) cleanup-schedule-state.
 let resetCleanupScheduleThrottleCalls = 0;
 
-mock.module("../memory/cleanup-schedule-state.js", () => ({
+mock.module("../persistence/cleanup-schedule-state.js", () => ({
   resetCleanupScheduleThrottle: () => {
     resetCleanupScheduleThrottleCalls++;
   },

package/src/__tests__/config-watcher-skill-reseed.test.ts

@@ -87,7 +87,7 @@ mock.module("../persistence/embeddings/embedding-backend.js", () => ({
   clearEmbeddingBackendCache: () => {},
 }));
 
-mock.module("../memory/cleanup-schedule-state.js", () => ({
+mock.module("../persistence/cleanup-schedule-state.js", () => ({
   resetCleanupScheduleThrottle: () => {},
 }));
 

package/src/__tests__/confirmation-request-guardian-bridge.test.ts

@@ -69,12 +69,12 @@ mock.module("../runtime/channel-verification-service.js", () => ({
   },
 }));
 
-import type { TrustContext } from "../daemon/trust-context.js";
 import {
   createCanonicalGuardianRequest,
   generateCanonicalRequestCode,
   listCanonicalGuardianDeliveries,
-} from "../memory/canonical-guardian-store.js";
+} from "../contacts/canonical-guardian-store.js";
+import type { TrustContext } from "../daemon/trust-context.js";
 import { getDb } from "../persistence/db-connection.js";
 import { initializeDb } from "../persistence/db-init.js";
 import { bridgeConfirmationRequestToGuardian } from "../runtime/confirmation-request-guardian-bridge.js";

package/src/__tests__/context-search-conversations-source.test.ts

@@ -2,10 +2,10 @@ import { beforeEach, describe, expect, test } from "bun:test";
 
 import { searchConversationSource } from "../memory/context-search/sources/conversations.js";
 import type { RecallSearchContext } from "../memory/context-search/types.js";
-import { rawRun } from "../memory/raw-query.js";
 import { writeSlackMetadata } from "../messaging/providers/slack/message-metadata.js";
 import { getDb } from "../persistence/db-connection.js";
 import { initializeDb } from "../persistence/db-init.js";
+import { rawRun } from "../persistence/raw-query.js";
 await initializeDb();
 
 let seedId = 0;

package/src/__tests__/conversation-abort-tool-results.test.ts

@@ -282,7 +282,7 @@ mock.module("../agent/loop.js", () => ({
     }
   },
 }));
-mock.module("../memory/canonical-guardian-store.js", () => ({
+mock.module("../contacts/canonical-guardian-store.js", () => ({
   listPendingCanonicalGuardianRequestsByDestinationConversation: () => [],
   listCanonicalGuardianRequests: () => [],
   listPendingRequestsByConversationScope: () => [],