@runfusion/fusion 0.76.0-beta.1 → 0.76.0-beta.2

package/dist/extension.js

@@ -21639,9 +21639,14 @@ var init_project = __esm({
       // now keyed per-project on `project_id` (the effective PK). `id` is retained
       // for column-shape parity (always 1) but is no longer the PK and no longer
       // CHECK-constrained. Single-project / SQLite-parity callers leave project_id
-      // at its '' default (one row), preserving the pre-isolation behavior.
+      // through the database ownership trigger, preserving the pre-isolation behavior.
+      /*
+      FNXC:MultiProjectIsolation 2026-08-12-15:43:
+      Migration 0006 owns config's project_id default and leaves its catalog PK as (project_id).
+      Drizzle emits DEFAULT while the database GUC/trigger selects the effective ownership partition.
+      */
       id: integer("id").default(1),
-      projectId: text("project_id").notNull().default("").primaryKey(),
+      projectId: text("project_id").notNull().default(sql`current_setting('fusion.project_id', true)`).primaryKey(),
       nextId: integer("next_id").default(1),
       nextWorkflowStepId: integer("next_workflow_step_id").default(1),
       // FNXC:SqliteFinalRemoval 2026-06-28:
@@ -22035,9 +22040,13 @@ var init_project = __esm({
     automations = projectSchema.table("automations", {
       /*
        * FNXC:AutomationIsolation 2026-07-13-22:37:
-       * Automations are partitioned by the AsyncDataLayer's project ID because embedded PostgreSQL consolidates the per-project SQLite files into one table. The composite key deliberately permits the same automation ID in two projects without allowing either project's CRUD or cron-claim path to address the other row. The empty default preserves an explicit partition for legacy and project-agnostic callers until startup stamps migrated rows.
+       * Automations are partitioned by the AsyncDataLayer's project ID because embedded PostgreSQL consolidates the per-project SQLite files into one table. The composite key deliberately permits the same automation ID in two projects without allowing either project's CRUD or cron-claim path to address the other row.
+       *
+       * FNXC:MultiProjectIsolation 2026-08-12-15:43:
+       * Migration 0006 owns the default through the database GUC/trigger; Drizzle emits DEFAULT
+       * without replacing the physical legacy fallback or the fail-closed bound writer contract.
        */
-      projectId: text("project_id").notNull().default(""),
+      projectId: text("project_id").notNull().default(sql`current_setting('fusion.project_id', true)`),
       id: text("id").notNull(),
       name: text("name").notNull(),
       description: text("description"),
@@ -22336,7 +22345,8 @@ var init_project = __esm({
       index("idxTaskDocumentsTaskId").on(t.taskId)
     ]);
     artifacts = projectSchema.table("artifacts", {
-      id: text("id").primaryKey(),
+      projectId: text("project_id").notNull().default(sql`current_setting('fusion.project_id', true)`),
+      id: text("id").notNull(),
       type: text("type").notNull(),
       title: text("title").notNull(),
       description: text("description"),
@@ -22351,7 +22361,8 @@ var init_project = __esm({
       createdAt: text("created_at").notNull(),
       updatedAt: text("updated_at").notNull()
     }, (t) => [
-      foreignKey({ columns: [t.taskId], foreignColumns: [tasks.id] }).onDelete("cascade"),
+      primaryKey({ columns: [t.projectId, t.id] }),
+      foreignKey({ name: "artifacts_task_id_fkey", columns: [t.projectId, t.taskId], foreignColumns: [tasks.projectId, tasks.id] }).onDelete("cascade"),
       index("idxArtifactsTaskId").on(t.taskId),
       index("idxArtifactsAuthorId").on(t.authorId),
       index("idxArtifactsType").on(t.type),
@@ -22541,7 +22552,8 @@ var init_project = __esm({
       index("idxEvalRunEventsRunIdSeq").on(t.runId, t.seq)
     ]);
     secrets = projectSchema.table("secrets", {
-      id: text("id").primaryKey(),
+      projectId: text("project_id").notNull().default(sql`current_setting('fusion.project_id', true)`),
+      id: text("id").notNull(),
       key: text("key").notNull(),
       valueCiphertext: bytea("value_ciphertext").notNull(),
       nonce: bytea("nonce").notNull(),
@@ -22554,7 +22566,8 @@ var init_project = __esm({
       lastReadAt: text("last_read_at"),
       lastReadBy: text("last_read_by")
     }, (t) => [
-      unique("secrets_key_unique").on(t.key),
+      primaryKey({ columns: [t.projectId, t.id] }),
+      unique("secrets_key_unique").on(t.projectId, t.key),
       check("secrets_access_policy_check", sql`${t.accessPolicy} IN ('auto', 'prompt', 'deny')`),
       check("secrets_env_exportable_check", sql`${t.envExportable} IN (0, 1)`)
     ]);
@@ -22596,10 +22609,11 @@ var init_project = __esm({
       updatedAt: text("updated_at").notNull()
     }, (t) => [primaryKey({ columns: [t.projectId, t.id] })]);
     branchGroups = projectSchema.table("branch_groups", {
-      id: text("id").primaryKey(),
+      projectId: text("project_id").notNull().default(sql`current_setting('fusion.project_id', true)`),
+      id: text("id").notNull(),
       sourceType: text("source_type").notNull(),
       sourceId: text("source_id").notNull(),
-      branchName: text("branch_name").notNull().unique(),
+      branchName: text("branch_name").notNull(),
       worktreePath: text("worktree_path"),
       autoMerge: integer("auto_merge").notNull().default(0),
       prState: text("pr_state").notNull().default("none"),
@@ -22615,6 +22629,8 @@ var init_project = __esm({
       updatedAt: bigint("updated_at", { mode: "number" }).notNull(),
       closedAt: bigint("closed_at", { mode: "number" })
     }, (t) => [
+      primaryKey({ columns: [t.projectId, t.id] }),
+      unique("branch_groups_branch_name_key").on(t.projectId, t.branchName),
       check("branch_groups_source_type_check", sql`${t.sourceType} IN ('mission','planning','new-task')`),
       check("branch_groups_pr_state_check", sql`${t.prState} IN ('none','open','merged','closed')`),
       check("branch_groups_status_check", sql`${t.status} IN ('open','finalized','abandoned')`),
@@ -23016,12 +23032,14 @@ var init_project = __esm({
       index("idxUsageEventsKindTs").on(t.kind, t.ts)
     ]);
     pluginActivations = projectSchema.table("plugin_activations", {
-      id: integer("id").generatedAlwaysAsIdentity().primaryKey(),
+      projectId: text("project_id").notNull().default(sql`current_setting('fusion.project_id', true)`),
+      id: integer("id").generatedAlwaysAsIdentity().notNull(),
       pluginId: text("plugin_id").notNull(),
       source: text("source").notNull(),
       pluginVersion: text("plugin_version"),
       activatedAt: text("activated_at").notNull()
     }, (t) => [
+      primaryKey({ columns: [t.projectId, t.id] }),
       index("idxPluginActivationsActivatedAt").on(t.activatedAt),
       index("idxPluginActivationsPluginId").on(t.pluginId)
     ]);
@@ -23046,8 +23064,13 @@ var init_project = __esm({
       index("idxKnowledgePagesUpdatedAt").on(t.updatedAt)
     ]);
     deployments = projectSchema.table("deployments", {
-      id: integer("id").generatedAlwaysAsIdentity().primaryKey(),
-      projectId: text("project_id").notNull().default(""),
+      id: integer("id").generatedAlwaysAsIdentity().notNull(),
+      /*
+      FNXC:MultiProjectIsolation 2026-08-12-15:43:
+      Migration 0006 rebuilt deployments_pkey as (project_id, id). Drizzle emits DEFAULT while the
+      database GUC/trigger keeps ownership stamping and the physical legacy fallback authoritative.
+      */
+      projectId: text("project_id").notNull().default(sql`current_setting('fusion.project_id', true)`),
       deploymentId: text("deployment_id").notNull(),
       service: text("service"),
       environment: text("environment"),
@@ -23058,6 +23081,7 @@ var init_project = __esm({
       meta: jsonb("meta"),
       createdAt: text("created_at").notNull()
     }, (t) => [
+      primaryKey({ columns: [t.projectId, t.id], name: "deployments_pkey" }),
       uniqueIndex("idxDeploymentsProjectDeploymentId").on(t.projectId, t.deploymentId),
       index("idxDeploymentsProjectDeployedAt").on(t.projectId, t.deployedAt),
       index("idxDeploymentsDeployedAt").on(t.deployedAt),
@@ -23065,7 +23089,12 @@ var init_project = __esm({
     ]);
     githubCheckStates = projectSchema.table("github_check_states", {
       id: integer("id").generatedAlwaysAsIdentity().notNull(),
-      projectId: text("project_id").notNull().default(""),
+      /*
+      FNXC:MultiProjectIsolation 2026-08-12-15:43:
+      Migration 0048 post-dated 0006, so FN-9004 reconciles its physical default to the ownership
+      expression. Drizzle emits DEFAULT while the database GUC/trigger remains the stamping authority.
+      */
+      projectId: text("project_id").notNull().default(sql`current_setting('fusion.project_id', true)`),
       repo: text("repo").notNull(),
       headSha: text("head_sha").notNull(),
       checkName: text("check_name").notNull(),
@@ -23085,9 +23114,14 @@ var init_project = __esm({
       index("idxGithubCheckStatesProjectReceived").on(t.projectId, t.receivedAt)
     ]);
     incidents = projectSchema.table("incidents", {
-      id: integer("id").generatedAlwaysAsIdentity().primaryKey(),
-      projectId: text("project_id").notNull().default(""),
-      incidentId: text("incident_id").notNull().unique(),
+      id: integer("id").generatedAlwaysAsIdentity().notNull(),
+      /*
+      FNXC:MultiProjectIsolation 2026-08-12-15:43:
+      Migration 0006 rebuilt incident keys with project_id first. Drizzle emits DEFAULT while the
+      database GUC/trigger retains ownership stamping and its physical legacy fallback.
+      */
+      projectId: text("project_id").notNull().default(sql`current_setting('fusion.project_id', true)`),
+      incidentId: text("incident_id").notNull(),
       groupingKey: text("grouping_key").notNull(),
       title: text("title").notNull(),
       severity: text("severity"),
@@ -23101,6 +23135,8 @@ var init_project = __esm({
       createdAt: text("created_at").notNull(),
       updatedAt: text("updated_at").notNull()
     }, (t) => [
+      primaryKey({ columns: [t.projectId, t.id], name: "incidents_pkey" }),
+      unique("incidents_incident_id_key").on(t.projectId, t.incidentId),
       index("idxIncidentsProjectOpenedAt").on(t.projectId, t.openedAt),
       index("idxIncidentsProjectStatus").on(t.projectId, t.status),
       index("idxIncidentsGroupingKey").on(t.groupingKey),
@@ -23155,12 +23191,14 @@ var init_project = __esm({
       content: text("content").notNull(),
       type: text("type").notNull(),
       read: integer("read").default(0),
+      archived: integer("archived").default(0),
       metadata: jsonb("metadata"),
       createdAt: text("created_at").notNull(),
       updatedAt: text("updated_at").notNull()
     }, (t) => [
       primaryKey({ columns: [t.projectId, t.id] }),
       index("idxMessagesTo").on(t.toId, t.toType, t.read),
+      index("idxMessagesToArchived").on(t.toId, t.toType, t.archived),
       index("idxMessagesFrom").on(t.fromId, t.fromType),
       index("idxMessagesCreatedAt").on(t.createdAt)
     ]);
@@ -23261,7 +23299,8 @@ var init_project = __esm({
       index("idx_cli_sessions_project_state").on(t.projectId, t.agentState)
     ]);
     chatMessages = projectSchema.table("chat_messages", {
-      id: text("id").primaryKey(),
+      projectId: text("project_id").notNull().default(sql`current_setting('fusion.project_id', true)`),
+      id: text("id").notNull(),
       sessionId: text("session_id").notNull(),
       role: text("role").notNull(),
       content: text("content").notNull(),
@@ -23270,6 +23309,7 @@ var init_project = __esm({
       createdAt: text("created_at").notNull(),
       attachments: jsonb("attachments")
     }, (t) => [
+      primaryKey({ columns: [t.projectId, t.id] }),
       index("idxChatMessagesSessionId").on(t.sessionId),
       index("idxChatMessagesCreatedAt").on(t.createdAt)
     ]);
@@ -23295,7 +23335,8 @@ var init_project = __esm({
       index("idxChatTokenUsageCreatedAt").on(t.createdAt)
     ]);
     runAuditEvents = projectSchema.table("run_audit_events", {
-      id: text("id").primaryKey(),
+      projectId: text("project_id").notNull().default(sql`current_setting('fusion.project_id', true)`),
+      id: text("id").notNull(),
       timestamp: text("timestamp").notNull(),
       taskId: text("task_id"),
       agentId: text("agent_id").notNull(),
@@ -23305,6 +23346,7 @@ var init_project = __esm({
       target: text("target").notNull(),
       metadata: jsonb("metadata")
     }, (t) => [
+      primaryKey({ columns: [t.projectId, t.id] }),
       index("idxRunAuditEventsRunIdTimestamp").on(t.runId, t.timestamp),
       index("idxRunAuditEventsTaskIdTimestamp").on(t.taskId, t.timestamp),
       index("idxRunAuditEventsTimestamp").on(t.timestamp)
@@ -23405,13 +23447,14 @@ var init_project = __esm({
       index("idxMissionLineageStopsMissionId").on(t.projectId, t.missionId)
     ]);
     verificationCache = projectSchema.table("verification_cache", {
+      projectId: text("project_id").notNull().default(sql`current_setting('fusion.project_id', true)`),
       treeSha: text("tree_sha").notNull(),
       testCommand: text("test_command").notNull().default(""),
       buildCommand: text("build_command").notNull().default(""),
       recordedAt: text("recorded_at").notNull(),
       taskId: text("task_id")
     }, (t) => [
-      primaryKey({ columns: [t.treeSha, t.testCommand, t.buildCommand] }),
+      primaryKey({ columns: [t.projectId, t.treeSha, t.testCommand, t.buildCommand] }),
       index("idxVerificationCacheRecordedAt").on(t.recordedAt)
     ]);
     importTranslationCache = projectSchema.table("import_translation_cache", {
@@ -23444,7 +23487,8 @@ var init_project = __esm({
       index("idxImportTranslationCacheRecordedAt").on(t.recordedAt)
     ]);
     approvalRequests = projectSchema.table("approval_requests", {
-      id: text("id").primaryKey(),
+      projectId: text("project_id").notNull().default(sql`current_setting('fusion.project_id', true)`),
+      id: text("id").notNull(),
       status: text("status").notNull(),
       requesterActorId: text("requester_actor_id").notNull(),
       requesterActorType: text("requester_actor_type").notNull(),
@@ -23463,13 +23507,14 @@ var init_project = __esm({
       createdAt: text("created_at").notNull(),
       updatedAt: text("updated_at").notNull()
     }, (t) => [
+      primaryKey({ columns: [t.projectId, t.id] }),
       index("idxApprovalRequestsStatusCreatedAt").on(t.status, t.createdAt),
       index("idxApprovalRequestsRequesterCreatedAt").on(t.requesterActorId, t.createdAt),
       index("idxApprovalRequestsTaskCreatedAt").on(t.taskId, t.createdAt)
     ]);
     approvalRequestAuditEvents = projectSchema.table("approval_request_audit_events", {
-      projectId: text("project_id").notNull().default(""),
-      id: text("id").primaryKey(),
+      projectId: text("project_id").notNull().default(sql`current_setting('fusion.project_id', true)`),
+      id: text("id").notNull(),
       requestId: text("request_id").notNull(),
       eventType: text("event_type").notNull(),
       actorId: text("actor_id").notNull(),
@@ -23478,6 +23523,7 @@ var init_project = __esm({
       note: text("note"),
       createdAt: text("created_at").notNull()
     }, (t) => [
+      primaryKey({ columns: [t.projectId, t.id] }),
       index("idxApprovalRequestAuditRequestCreatedAt").on(t.requestId, t.createdAt, t.id),
       index("idxApprovalRequestAuditProjectCreatedAt").on(t.projectId, t.createdAt)
     ]);
@@ -26967,6 +27013,27 @@ var init_grok_provider = __esm({
       apiKey: "$GROK_API_KEY",
       api: "openai-completions",
       models: [
+        /*
+        FNXC:ModelRegistry 2026-08-12-20:17:
+        FN-9008 requires Grok 4.6 to be selectable in every model area. Keep it in this shared
+        catalog because pi's registerProvider() replaces provider model lists wholesale, while every
+        Fusion host seeds and re-merges this export. xAI's model docs verify grok-4.6, its 500k-token
+        context window, and configurable reasoning; max output and per-model image input remain
+        upstream-pending-verification, so retain the conservative text-only and 65536-token defaults.
+        Source: https://docs.x.ai/developers/models
+        */
+        {
+          id: "grok-4.6",
+          name: "Grok 4.6",
+          reasoning: true,
+          input: ["text"],
+          cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+          contextWindow: 5e5,
+          maxTokens: 65536,
+          compat: {
+            supportsDeveloperRole: false
+          }
+        },
         {
           id: "grok-4.5",
           name: "Grok 4.5",
@@ -34925,6 +34992,7 @@ function rowToMessage(row) {
     content: row.content,
     type: row.type,
     read: (row.read ?? 0) === 1,
+    archived: (row.archived ?? 0) === 1,
     metadata: row.metadata ?? void 0,
     createdAt: row.createdAt,
     updatedAt: row.updatedAt
@@ -34936,6 +35004,11 @@ function participantIdsForLookup(ownerId, ownerType) {
   }
   return [ownerId];
 }
+function archivedCondition(archived) {
+  if (archived === true) return eq(project_exports.messages.archived, 1);
+  if (archived === false) return or(eq(project_exports.messages.archived, 0), sql`${project_exports.messages.archived} IS NULL`);
+  return or(eq(project_exports.messages.archived, 0), sql`${project_exports.messages.archived} IS NULL`);
+}
 async function sendMessage(handle, message) {
   const sanitizedContent = sanitizeTextValue(message.content);
   const sanitizedMetadata = sanitizeJsonbValue(message.metadata);
@@ -34948,6 +35021,7 @@ async function sendMessage(handle, message) {
     content: sanitizedContent,
     type: message.type,
     read: message.read ? 1 : 0,
+    archived: message.archived ? 1 : 0,
     metadata: sanitizedMetadata,
     createdAt: message.createdAt,
     updatedAt: message.updatedAt
@@ -34956,7 +35030,8 @@ async function sendMessage(handle, message) {
     ...message,
     content: sanitizedContent,
     metadata: sanitizedMetadata,
-    read: message.read ? 1 : 0
+    read: message.read ? 1 : 0,
+    archived: message.archived ? 1 : 0
   });
 }
 async function sendMessageOnce(handle, message) {
@@ -34969,6 +35044,7 @@ async function sendMessageOnce(handle, message) {
     content: message.content,
     type: message.type,
     read: message.read ? 1 : 0,
+    archived: message.archived ? 1 : 0,
     metadata: message.metadata,
     createdAt: message.createdAt,
     updatedAt: message.updatedAt
@@ -35020,6 +35096,7 @@ async function queryMessagesByParticipant(handle, direction, ownerId, ownerType,
   if (filter?.read !== void 0) {
     conditions.push(eq(project_exports.messages.read, filter.read ? 1 : 0));
   }
+  conditions.push(archivedCondition(filter?.archived));
   const limit = filter?.limit ?? 100;
   const offset = filter?.offset ?? 0;
   const rows = await handle.select(messageColumns).from(project_exports.messages).where(and(...conditions)).orderBy(desc(project_exports.messages.createdAt), desc(project_exports.messages.id)).limit(limit).offset(offset);
@@ -35033,6 +35110,13 @@ async function markMessageAsRead(handle, messageId) {
   await handle.update(project_exports.messages).set({ read: 1, updatedAt: now }).where(eq(project_exports.messages.id, messageId));
   return await getMessage(handle, messageId);
 }
+async function setMessageArchived(handle, id, archived) {
+  const existing = await getMessage(handle, id);
+  if (!existing) return null;
+  if (existing.archived === archived) return existing;
+  const rows = await handle.update(project_exports.messages).set({ archived: archived ? 1 : 0, updatedAt: (/* @__PURE__ */ new Date()).toISOString() }).where(eq(project_exports.messages.id, id)).returning(messageColumns);
+  return rows[0] ? rowToMessage(rows[0]) : null;
+}
 async function markAllMessagesAsRead(handle, ownerId, ownerType) {
   const now = (/* @__PURE__ */ new Date()).toISOString();
   const participantIds = participantIdsForLookup(ownerId, ownerType);
@@ -35040,7 +35124,8 @@ async function markAllMessagesAsRead(handle, ownerId, ownerType) {
     and(
       inArray(project_exports.messages.toId, participantIds),
       eq(project_exports.messages.toType, ownerType),
-      eq(project_exports.messages.read, 0)
+      eq(project_exports.messages.read, 0),
+      archivedCondition()
     )
   );
   const count2 = countRows[0]?.count ?? 0;
@@ -35048,7 +35133,8 @@ async function markAllMessagesAsRead(handle, ownerId, ownerType) {
     and(
       inArray(project_exports.messages.toId, participantIds),
       eq(project_exports.messages.toType, ownerType),
-      eq(project_exports.messages.read, 0)
+      eq(project_exports.messages.read, 0),
+      archivedCondition()
     )
   );
   return count2;
@@ -35070,19 +35156,22 @@ async function getConversation(handle, participantA, participantB, options) {
   const aIds = participantIdsForLookup(participantA.id, participantA.type);
   const bIds = participantIdsForLookup(participantB.id, participantB.type);
   const rows = await handle.select(messageColumns).from(project_exports.messages).where(
-    or(
-      and(
-        inArray(project_exports.messages.fromId, aIds),
-        eq(project_exports.messages.fromType, participantA.type),
-        inArray(project_exports.messages.toId, bIds),
-        eq(project_exports.messages.toType, participantB.type)
+    and(
+      or(
+        and(
+          inArray(project_exports.messages.fromId, aIds),
+          eq(project_exports.messages.fromType, participantA.type),
+          inArray(project_exports.messages.toId, bIds),
+          eq(project_exports.messages.toType, participantB.type)
+        ),
+        and(
+          inArray(project_exports.messages.fromId, bIds),
+          eq(project_exports.messages.fromType, participantB.type),
+          inArray(project_exports.messages.toId, aIds),
+          eq(project_exports.messages.toType, participantA.type)
+        )
       ),
-      and(
-        inArray(project_exports.messages.fromId, bIds),
-        eq(project_exports.messages.fromType, participantB.type),
-        inArray(project_exports.messages.toId, aIds),
-        eq(project_exports.messages.toType, participantA.type)
-      )
+      archivedCondition(options?.archived)
     )
   ).orderBy(desc(project_exports.messages.createdAt)).limit(limit);
   return rows.reverse().map((row) => rowToMessage(row));
@@ -35093,14 +35182,16 @@ async function getMailbox(handle, ownerId, ownerType) {
     and(
       inArray(project_exports.messages.toId, participantIds),
       eq(project_exports.messages.toType, ownerType),
-      eq(project_exports.messages.read, 0)
+      eq(project_exports.messages.read, 0),
+      archivedCondition()
     )
   );
   const unreadCount = unreadRows[0]?.count ?? 0;
   const lastRows = await handle.select(messageColumns).from(project_exports.messages).where(
     and(
       inArray(project_exports.messages.toId, participantIds),
-      eq(project_exports.messages.toType, ownerType)
+      eq(project_exports.messages.toType, ownerType),
+      archivedCondition()
     )
   ).orderBy(desc(project_exports.messages.createdAt), desc(project_exports.messages.id)).limit(1);
   return {
@@ -35110,15 +35201,16 @@ async function getMailbox(handle, ownerId, ownerType) {
     lastMessage: lastRows[0] ? rowToMessage(lastRows[0]) : void 0
   };
 }
-async function getAllAgentToAgentMessages(handle) {
-  const rows = await handle.select(messageColumns).from(project_exports.messages).where(eq(project_exports.messages.type, "agent-to-agent")).orderBy(desc(project_exports.messages.createdAt), desc(project_exports.messages.id));
+async function getAllAgentToAgentMessages(handle, filter) {
+  const rows = await handle.select(messageColumns).from(project_exports.messages).where(and(eq(project_exports.messages.type, "agent-to-agent"), archivedCondition(filter?.archived))).orderBy(desc(project_exports.messages.createdAt), desc(project_exports.messages.id));
   return rows.map((row) => rowToMessage(row));
 }
 async function getUnreadAgentToAgentCount(handle) {
   const rows = await handle.select({ count: sql`count(*)::int` }).from(project_exports.messages).where(
     and(
       eq(project_exports.messages.type, "agent-to-agent"),
-      eq(project_exports.messages.read, 0)
+      eq(project_exports.messages.read, 0),
+      archivedCondition()
     )
   );
   return rows[0]?.count ?? 0;
@@ -35140,6 +35232,7 @@ var init_async_message_store = __esm({
       content: project_exports.messages.content,
       type: project_exports.messages.type,
       read: project_exports.messages.read,
+      archived: project_exports.messages.archived,
       metadata: project_exports.messages.metadata,
       createdAt: project_exports.messages.createdAt,
       updatedAt: project_exports.messages.updatedAt
@@ -35325,12 +35418,12 @@ var init_message_store = __esm({
         }
         const sqliteDb = this.db;
         this.stmtInsert = sqliteDb.prepare(`
-      INSERT INTO messages (id, fromId, fromType, toId, toType, content, type, read, metadata, createdAt, updatedAt)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      INSERT INTO messages (id, fromId, fromType, toId, toType, content, type, read, archived, metadata, createdAt, updatedAt)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     `);
         this.stmtInsertOnce = sqliteDb.prepare(`
-      INSERT OR IGNORE INTO messages (id, fromId, fromType, toId, toType, content, type, read, metadata, createdAt, updatedAt)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      INSERT OR IGNORE INTO messages (id, fromId, fromType, toId, toType, content, type, read, archived, metadata, createdAt, updatedAt)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     `);
         this.stmtGetById = sqliteDb.prepare(`
       SELECT * FROM messages WHERE id = ?
@@ -35368,6 +35461,7 @@ var init_message_store = __esm({
           content: row.content,
           type: row.type,
           read: row.read === 1,
+          archived: (row.archived ?? 0) === 1,
           metadata: fromJson(row.metadata),
           createdAt: row.createdAt,
           updatedAt: row.updatedAt
@@ -35401,6 +35495,7 @@ var init_message_store = __esm({
           content: sanitizeTextValue(input.content),
           type: input.type,
           read: false,
+          archived: false,
           metadata: sanitizeJsonbValue(input.metadata),
           createdAt: now,
           updatedAt: now
@@ -35416,6 +35511,7 @@ var init_message_store = __esm({
             content: message.content,
             type: message.type,
             read: message.read,
+            archived: message.archived,
             metadata: message.metadata ?? null,
             createdAt: message.createdAt,
             updatedAt: message.updatedAt
@@ -35430,6 +35526,7 @@ var init_message_store = __esm({
             message.content,
             message.type,
             message.read ? 1 : 0,
+            message.archived ? 1 : 0,
             toJsonNullable(message.metadata),
             message.createdAt,
             message.updatedAt
@@ -35488,6 +35585,7 @@ var init_message_store = __esm({
           content: sanitizeTextValue(input.content),
           type: input.type,
           read: false,
+          archived: false,
           metadata: sanitizeJsonbValue(input.metadata),
           createdAt: now,
           updatedAt: now
@@ -35508,6 +35606,7 @@ var init_message_store = __esm({
             message.content,
             message.type,
             0,
+            0,
             toJsonNullable(message.metadata),
             message.createdAt,
             message.updatedAt
@@ -35639,6 +35738,7 @@ var init_message_store = __esm({
           whereClauses.push("read = ?");
           params.push(filter.read ? 1 : 0);
         }
+        whereClauses.push(filter?.archived === true ? "archived = 1" : "(archived = 0 OR archived IS NULL)");
         const whereSql = whereClauses.join(" AND ");
         const limit = filter?.limit ?? 100;
         const offset = filter?.offset ?? 0;
@@ -35689,15 +35789,39 @@ var init_message_store = __esm({
         const participantIds = this.getParticipantIdsForLookup(ownerId, ownerType);
         const toIdPredicate = participantIds.length === 1 ? "toId = ?" : `toId IN (${participantIds.map(() => "?").join(", ")})`;
         const unreadRow = this.db.prepare(`
-      SELECT COUNT(*) as count FROM messages WHERE ${toIdPredicate} AND toType = ? AND read = 0
+      SELECT COUNT(*) as count FROM messages WHERE ${toIdPredicate} AND toType = ? AND read = 0 AND (archived = 0 OR archived IS NULL)
     `).get(...participantIds, ownerType);
         const count2 = unreadRow?.count ?? 0;
         this.db.prepare(`
-      UPDATE messages SET read = 1, updatedAt = ? WHERE ${toIdPredicate} AND toType = ? AND read = 0
+      UPDATE messages SET read = 1, updatedAt = ? WHERE ${toIdPredicate} AND toType = ? AND read = 0 AND (archived = 0 OR archived IS NULL)
     `).run(now, ...participantIds, ownerType);
         this.db.bumpLastModified();
         return count2;
       }
+      /** Archive a message without destroying its correspondence history. */
+      async archiveMessage(id) {
+        return this.setMessageArchived(id, true);
+      }
+      /** Restore a previously archived message to default mailbox lists. */
+      async unarchiveMessage(id) {
+        return this.setMessageArchived(id, false);
+      }
+      async setMessageArchived(id, archived) {
+        if (this.asyncLayer) {
+          const updated2 = await setMessageArchived(this.asyncLayer.db, id, archived);
+          if (!updated2) throw new Error(`Message ${id} not found`);
+          this.emit(archived ? "message:archived" : "message:unarchived", updated2);
+          return updated2;
+        }
+        const existing = await this.getMessage(id);
+        if (!existing) throw new Error(`Message ${id} not found`);
+        if (existing.archived === archived) return existing;
+        this.db.prepare("UPDATE messages SET archived = ?, updatedAt = ? WHERE id = ?").run(archived ? 1 : 0, (/* @__PURE__ */ new Date()).toISOString(), id);
+        this.db.bumpLastModified();
+        const updated = await this.getMessage(id);
+        this.emit(archived ? "message:archived" : "message:unarchived", updated);
+        return updated;
+      }
       /**
        * Delete a message by ID.
        * @param id - The message ID
@@ -35788,7 +35912,7 @@ var init_message_store = __esm({
         (${participantAFromPredicate} AND fromType = ? AND ${participantBToPredicate} AND toType = ?)
         OR
         (${participantBFromPredicate} AND fromType = ? AND ${participantAToPredicate} AND toType = ?)
-      )
+      ) AND ${options?.archived === true ? "archived = 1" : "(archived = 0 OR archived IS NULL)"}
       ORDER BY createdAt DESC
       LIMIT ?
     `).all(
@@ -35823,11 +35947,11 @@ var init_message_store = __esm({
         const participantIds = this.getParticipantIdsForLookup(ownerId, ownerType);
         const toIdPredicate = participantIds.length === 1 ? "toId = ?" : `toId IN (${participantIds.map(() => "?").join(", ")})`;
         const unreadRow = this.db.prepare(`
-      SELECT COUNT(*) as count FROM messages WHERE ${toIdPredicate} AND toType = ? AND read = 0
+      SELECT COUNT(*) as count FROM messages WHERE ${toIdPredicate} AND toType = ? AND read = 0 AND (archived = 0 OR archived IS NULL)
     `).get(...participantIds, ownerType);
         const unreadCount = unreadRow?.count ?? 0;
         const lastRow = this.db.prepare(`
-      SELECT * FROM messages WHERE ${toIdPredicate} AND toType = ? ORDER BY createdAt DESC, rowid DESC LIMIT 1
+      SELECT * FROM messages WHERE ${toIdPredicate} AND toType = ? AND (archived = 0 OR archived IS NULL) ORDER BY createdAt DESC, rowid DESC LIMIT 1
     `).get(...participantIds, ownerType);
         const lastMessage = lastRow ? this.rowToMessage(lastRow) : void 0;
         return {
@@ -35841,13 +35965,13 @@ var init_message_store = __esm({
        * Get all agent-to-agent messages across all agents.
        * @returns Array of messages (newest first)
        */
-      async getAllAgentToAgentMessages() {
+      async getAllAgentToAgentMessages(filter) {
         if (this.asyncLayer) {
-          return getAllAgentToAgentMessages(this.asyncLayer.db);
+          return getAllAgentToAgentMessages(this.asyncLayer.db, filter);
         }
         const rows = this.db.prepare(`
       SELECT * FROM messages
-      WHERE type = ?
+      WHERE type = ? AND ${filter?.archived === true ? "archived = 1" : "(archived = 0 OR archived IS NULL)"}
       ORDER BY createdAt DESC, rowid DESC
     `).all("agent-to-agent");
         return rows.map((row) => this.rowToMessage(row));
@@ -35861,7 +35985,7 @@ var init_message_store = __esm({
         }
         const row = this.db.prepare(`
       SELECT COUNT(*) as count FROM messages
-      WHERE type = ? AND read = 0
+      WHERE type = ? AND read = 0 AND (archived = 0 OR archived IS NULL)
     `).get("agent-to-agent");
         return row?.count ?? 0;
       }
@@ -35960,6 +36084,7 @@ async function createApprovalRequest(layer, input) {
   };
   await layer.transactionImmediate(async (tx) => {
     await tx.insert(project_exports.approvalRequests).values({
+      ...layer.projectId?.trim() ? { projectId: layer.projectId } : {},
       id: request2.id,
       status: request2.status,
       requesterActorId: request2.requester.actorId,
@@ -35983,12 +36108,12 @@ async function createApprovalRequest(layer, input) {
   });
   return request2;
 }
-async function getApprovalRequest(handle, id) {
-  const rows = await handle.select().from(project_exports.approvalRequests).where(eq(project_exports.approvalRequests.id, id));
+async function getApprovalRequest(handle, id, projectId2) {
+  const rows = await handle.select().from(project_exports.approvalRequests).where(and(eq(project_exports.approvalRequests.id, id), projectScopeFor(project_exports.approvalRequests.projectId, projectId2)));
   return rows[0] ? rowToRequest(rows[0]) : null;
 }
-async function listApprovalRequests(handle, input = {}) {
-  const conditions = [];
+async function listApprovalRequests(handle, input = {}, projectId2) {
+  const conditions = [projectScopeFor(project_exports.approvalRequests.projectId, projectId2)];
   if (input.status) conditions.push(eq(project_exports.approvalRequests.status, input.status));
   if (input.requesterActorId) conditions.push(eq(project_exports.approvalRequests.requesterActorId, input.requesterActorId));
   if (input.taskId) conditions.push(eq(project_exports.approvalRequests.taskId, input.taskId));
@@ -36002,7 +36127,7 @@ async function listApprovalRequests(handle, input = {}) {
 async function decideApprovalRequest(layer, requestId, status, input) {
   const now = (/* @__PURE__ */ new Date()).toISOString();
   return layer.transactionImmediate(async (tx) => {
-    const existing = await getApprovalRequest(tx, requestId);
+    const existing = await getApprovalRequest(tx, requestId, layer.projectId);
     if (!existing) throw new Error(`Approval request ${requestId} not found`);
     if (!isValidApprovalRequestTransition(existing.status, status)) {
       throw new Error(`Invalid approval request transition: ${existing.status} -> ${status}`);
@@ -36013,23 +36138,24 @@ async function decideApprovalRequest(layer, requestId, status, input) {
     const updatedRows = await tx.update(project_exports.approvalRequests).set({ status, decidedAt: now, updatedAt: now }).where(
       and(
         eq(project_exports.approvalRequests.id, requestId),
-        eq(project_exports.approvalRequests.status, existing.status)
+        eq(project_exports.approvalRequests.status, existing.status),
+        projectScopeFor(project_exports.approvalRequests.projectId, layer.projectId)
       )
     ).returning({ id: project_exports.approvalRequests.id });
     if (updatedRows.length === 0) {
-      const raced = await getApprovalRequest(tx, requestId);
+      const raced = await getApprovalRequest(tx, requestId, layer.projectId);
       throw new Error(
         `Invalid approval request transition: ${raced?.status ?? existing.status} -> ${status}`
       );
     }
     await appendAuditEvent(tx, layer.projectId ?? "", requestId, status, input.actor, now, input.note);
-    return await getApprovalRequest(tx, requestId);
+    return await getApprovalRequest(tx, requestId, layer.projectId);
   });
 }
 async function markApprovalRequestCompleted(layer, requestId, input) {
   const now = (/* @__PURE__ */ new Date()).toISOString();
   return layer.transactionImmediate(async (tx) => {
-    const existing = await getApprovalRequest(tx, requestId);
+    const existing = await getApprovalRequest(tx, requestId, layer.projectId);
     if (!existing) throw new Error(`Approval request ${requestId} not found`);
     if (!isValidApprovalRequestTransition(existing.status, "completed")) {
       throw new Error(`Invalid approval request transition: ${existing.status} -> completed`);
@@ -36043,21 +36169,22 @@ async function markApprovalRequestCompleted(layer, requestId, input) {
     const updatedRows = await tx.update(project_exports.approvalRequests).set({ status: "completed", completedAt: now, updatedAt: now }).where(
       and(
         eq(project_exports.approvalRequests.id, requestId),
-        eq(project_exports.approvalRequests.status, existing.status)
+        eq(project_exports.approvalRequests.status, existing.status),
+        projectScopeFor(project_exports.approvalRequests.projectId, layer.projectId)
       )
     ).returning({ id: project_exports.approvalRequests.id });
     if (updatedRows.length === 0) {
-      const raced = await getApprovalRequest(tx, requestId);
+      const raced = await getApprovalRequest(tx, requestId, layer.projectId);
       throw new Error(
         `Invalid approval request transition: ${raced?.status ?? existing.status} -> completed`
       );
     }
     await appendAuditEvent(tx, layer.projectId ?? "", requestId, "completed", input.actor, now, input.note);
-    return await getApprovalRequest(tx, requestId);
+    return await getApprovalRequest(tx, requestId, layer.projectId);
   });
 }
-async function getApprovalAuditHistory(handle, requestId) {
-  const rows = await handle.select().from(project_exports.approvalRequestAuditEvents).where(eq(project_exports.approvalRequestAuditEvents.requestId, requestId)).orderBy(
+async function getApprovalAuditHistory(handle, requestId, projectId2) {
+  const rows = await handle.select().from(project_exports.approvalRequestAuditEvents).where(and(eq(project_exports.approvalRequestAuditEvents.requestId, requestId), projectScopeFor(project_exports.approvalRequestAuditEvents.projectId, projectId2))).orderBy(
     sql`${project_exports.approvalRequestAuditEvents.createdAt} ASC, ${project_exports.approvalRequestAuditEvents.id} ASC`
   );
   return rows.map((row) => rowToAuditEvent(row));
@@ -36067,6 +36194,7 @@ var init_async_approval_request_store = __esm({
     "use strict";
     init_drizzle_orm();
     init_schema2();
+    init_data_layer();
     init_agents();
     init_types();
   }
@@ -36080,6 +36208,7 @@ var init_approval_request_store = __esm({
     "use strict";
     init_drizzle_orm();
     init_db2();
+    init_data_layer();
     init_async_approval_request_store();
     init_schema2();
     init_async_agent_activity();
@@ -36208,23 +36337,26 @@ var init_approval_request_store = __esm({
         return created;
       }
       async get(id) {
-        return getApprovalRequest(this.asyncLayer.db, id);
+        return getApprovalRequest(this.asyncLayer.db, id, this.asyncLayer.projectId);
       }
       async list(input = {}) {
-        return listApprovalRequests(this.asyncLayer.db, input);
+        return listApprovalRequests(this.asyncLayer.db, input, this.asyncLayer.projectId);
       }
       async getPendingCountsByActor() {
         const table = project_exports.approvalRequests;
         const rows = await this.asyncLayer.db.select({
           actorId: table.requesterActorId,
           requestCount: count()
-        }).from(table).where(eq(table.status, "pending")).groupBy(table.requesterActorId);
+        }).from(table).where(and(eq(table.status, "pending"), projectScopeFor(table.projectId, this.asyncLayer.projectId))).groupBy(table.requesterActorId);
         return new Map(rows.map((row) => [row.actorId, Number(row.requestCount)]));
       }
       async findLatestByDedupeKey(input) {
         if (this.backendMode) {
           const table = project_exports.approvalRequests;
-          const conditions = [eq(table.requesterActorId, input.requesterActorId)];
+          const conditions = [
+            eq(table.requesterActorId, input.requesterActorId),
+            projectScopeFor(table.projectId, this.asyncLayer.projectId)
+          ];
           if (input.taskId !== void 0) {
             conditions.push(eq(table.taskId, input.taskId));
           }
@@ -36263,7 +36395,7 @@ var init_approval_request_store = __esm({
         return markApprovalRequestCompleted(this.asyncLayer, requestId, input);
       }
       async getAuditHistory(requestId) {
-        return getApprovalAuditHistory(this.asyncLayer.db, requestId);
+        return getApprovalAuditHistory(this.asyncLayer.db, requestId, this.asyncLayer.projectId);
       }
     };
   }
@@ -40449,6 +40581,8 @@ async function applySchemaBaseline(db, options = {}) {
     const agentRatingProjectIsolationAlreadyApplied = applied.includes(AGENT_RATING_PROJECT_ISOLATION_VERSION);
     const agentRatingsProjectPartitionAlreadyApplied = applied.includes(AGENT_RATINGS_PROJECT_PARTITION_VERSION);
     const projectOwnershipDeclarationDriftAlreadyApplied = applied.includes(PROJECT_OWNERSHIP_DECLARATION_DRIFT_VERSION);
+    const projectOwnershipDefaultReconciliationAlreadyApplied = applied.includes(PROJECT_OWNERSHIP_DEFAULT_RECONCILIATION_VERSION);
+    const messageArchiveSchemaAlreadyApplied = applied.includes(MESSAGE_ARCHIVE_SCHEMA_VERSION);
     assertBinaryNotOlderThanDatabase(applied);
     let schemaChanged = false;
     if (!baselineAlreadyApplied) {
@@ -40932,17 +41066,29 @@ async function applySchemaBaseline(db, options = {}) {
       await tx.execute(sql`INSERT INTO public.${sql.identifier(MIGRATION_BOOKKEEPING_TABLE)} (version) VALUES (${PROJECT_OWNERSHIP_DECLARATION_DRIFT_VERSION}) ON CONFLICT (version) DO NOTHING`);
       schemaChanged = true;
     }
+    if (!projectOwnershipDefaultReconciliationAlreadyApplied) {
+      const migrationSql = await readFile4(PROJECT_OWNERSHIP_DEFAULT_RECONCILIATION_MIGRATION_PATH, "utf8");
+      await tx.execute(sql.raw(migrationSql));
+      await tx.execute(sql`INSERT INTO public.${sql.identifier(MIGRATION_BOOKKEEPING_TABLE)} (version) VALUES (${PROJECT_OWNERSHIP_DEFAULT_RECONCILIATION_VERSION}) ON CONFLICT (version) DO NOTHING`);
+      schemaChanged = true;
+    }
+    if (!messageArchiveSchemaAlreadyApplied) {
+      const migrationSql = await readFile4(MESSAGE_ARCHIVE_SCHEMA_MIGRATION_PATH, "utf8");
+      await tx.execute(sql.raw(migrationSql));
+      await tx.execute(sql`INSERT INTO public.${sql.identifier(MIGRATION_BOOKKEEPING_TABLE)} (version) VALUES (${MESSAGE_ARCHIVE_SCHEMA_VERSION}) ON CONFLICT (version) DO NOTHING`);
+      schemaChanged = true;
+    }
     return { applied: schemaChanged, pluginHooksRun: pluginHooks.length };
   });
 }
-var SCHEMA_BASELINE_VERSION, TASK_DECLARED_SYMBOLS_VERSION, INITIAL_SCHEMA_VERSION, AUTOMATION_ISOLATION_SCHEMA_VERSION, ANALYTICS_ISOLATION_SCHEMA_VERSION, MONITOR_APPROVAL_ISOLATION_SCHEMA_VERSION, LEGACY_CUTOVER_PRESERVATION_SCHEMA_VERSION, MULTI_PROJECT_CUTOVER_SCHEMA_VERSION, PROJECT_OWNERSHIP_SCHEMA_VERSION, SQLITE_SCHEMA_PARITY_VERSION, SESSION_ADVISOR_ENABLED_SCHEMA_VERSION, MISSION_FIX_IDEMPOTENCY_VERSION, IMPORT_TRANSLATION_CACHE_VERSION, IMPORT_TRANSLATION_CACHE_SCOPE_FIX_VERSION, IMPORT_TRANSLATION_CACHE_LEGACY_PARTITION_BACKFILL_VERSION, OWNER_PROJECT_ID_SPLIT_VERSION, CHAT_SESSION_PINS_VERSION, EXECUTOR_TOOL_FAILURE_RETRY_VERSION, EXECUTOR_ESCALATION_ATTEMPT_VERSION, GLOBAL_ROUTINES_SCHEMA_VERSION, TASK_MERGER_MODEL_LANE_VERSION, BULK_COMPLETION_REFUSAL_AT_VERSION, TASK_PROPOSAL_CLAIM_VERSION, CONFIGURATION_REVISIONS_VERSION, IDEATION_SCHEMA_VERSION, RESEARCH_FEATURE_PROVENANCE_VERSION, TASK_VERIFICATION_REQUEST_VERSION, SYMBOL_LOCKS_SCHEMA_VERSION, BIGINT_COUNTERS_VERSION, PLANNING_ACTIVE_TIMING_VERSION, SQLITE_MIGRATION_RUNTIME_READ_VERSION, WORKFLOW_TASK_CONTINUATIONS_VERSION, LEGACY_ADOPTION_DRAINED_MARKER_RUNTIME_GRANTS_VERSION, TASK_WEDGE_NOTIFICATION_VERSION, MILESTONE_ASSERTION_PROVENANCE_VERSION, MISSION_LINEAGE_STOP_VERSION, CHAT_SESSION_TAGS_VERSION, DROP_GLOBAL_CONCURRENCY_VERSION, MISSION_TASK_PREFIX_VERSION, CREDENTIAL_INSTANCE_SELECTION_VERSION, TASK_LIFECYCLE_OUTBOX_VERSION, TASK_LIFECYCLE_CONSUMERS_VERSION, VALIDATOR_INPUT_FINGERPRINT_VERSION, UNPLANNED_EXECUTION_BLOCK_DEDUPE_VERSION, QUEUED_EPISODE_SIGNATURE_VERSION, MULTI_ROLE_WORKFLOW_AGENTS_VERSION, WORKFLOW_PRINCIPAL_FENCE_VERSION, TASK_RECOMMENDATIONS_VERSION, GITHUB_CHECK_STATES_VERSION, AGENT_ACTIVITY_EVENTS_VERSION, SPEC_LOCK_DRIFT_REPORT_VERSION, SPEC_LOCK_SOURCE_REVISION_BIGINT_VERSION, MEMORY_RECALL_RECORDS_VERSION, MISSION_FEATURE_SPEC_ALIGNMENT_VERSION, AGENT_RATING_PROJECT_ISOLATION_VERSION, AGENT_RATINGS_PROJECT_PARTITION_VERSION, PROJECT_OWNERSHIP_DECLARATION_DRIFT_VERSION, LEGACY_ADOPTION_DRAINED_MARKER_FUNCTION, StaleBinarySchemaError, MIGRATION_BOOKKEEPING_TABLE, LEGACY_ADOPTION_DRAINED_MARKER, __dirname, MIGRATIONS_DIR, BASELINE_MIGRATION_PATH, AUTOMATION_ISOLATION_MIGRATION_PATH, ANALYTICS_ISOLATION_MIGRATION_PATH, MONITOR_APPROVAL_ISOLATION_MIGRATION_PATH, LEGACY_CUTOVER_PRESERVATION_MIGRATION_PATH, MULTI_PROJECT_CUTOVER_MIGRATION_PATH, PROJECT_OWNERSHIP_MIGRATION_PATH, SQLITE_SCHEMA_PARITY_MIGRATION_PATH, SESSION_ADVISOR_ENABLED_MIGRATION_PATH, MISSION_FIX_IDEMPOTENCY_MIGRATION_PATH, IMPORT_TRANSLATION_CACHE_MIGRATION_PATH, IMPORT_TRANSLATION_CACHE_SCOPE_FIX_MIGRATION_PATH, IMPORT_TRANSLATION_CACHE_LEGACY_PARTITION_BACKFILL_MIGRATION_PATH, OWNER_PROJECT_ID_SPLIT_MIGRATION_PATH, CHAT_SESSION_PINS_MIGRATION_PATH, EXECUTOR_TOOL_FAILURE_RETRY_MIGRATION_PATH, EXECUTOR_ESCALATION_ATTEMPT_MIGRATION_PATH, GLOBAL_ROUTINES_MIGRATION_PATH, TASK_MERGER_MODEL_LANE_MIGRATION_PATH, BULK_COMPLETION_REFUSAL_AT_MIGRATION_PATH, TASK_PROPOSAL_CLAIM_MIGRATION_PATH, CONFIGURATION_REVISIONS_MIGRATION_PATH, IDEATION_MIGRATION_PATH, RESEARCH_FEATURE_PROVENANCE_MIGRATION_PATH, TASK_VERIFICATION_REQUEST_MIGRATION_PATH, SYMBOL_LOCKS_MIGRATION_PATH, BIGINT_COUNTERS_MIGRATION_PATH, WORKFLOW_IR_PIN_AND_LEGACY_ADOPTION_VERSION, WORKFLOW_IR_PIN_AND_LEGACY_ADOPTION_MIGRATION_PATH, PLANNING_ACTIVE_TIMING_MIGRATION_PATH, TASK_DECLARED_SYMBOLS_MIGRATION_PATH, SQLITE_MIGRATION_RUNTIME_READ_PATH, WORKFLOW_TASK_CONTINUATIONS_PATH, LEGACY_ADOPTION_DRAINED_MARKER_RUNTIME_GRANTS_PATH, TASK_WEDGE_NOTIFICATION_MIGRATION_PATH, MILESTONE_ASSERTION_PROVENANCE_MIGRATION_PATH, MISSION_LINEAGE_STOP_MIGRATION_PATH, CHAT_SESSION_TAGS_MIGRATION_PATH, DROP_GLOBAL_CONCURRENCY_MIGRATION_PATH, MISSION_TASK_PREFIX_MIGRATION_PATH, CREDENTIAL_INSTANCE_SELECTION_MIGRATION_PATH, TASK_LIFECYCLE_OUTBOX_MIGRATION_PATH, TASK_LIFECYCLE_CONSUMERS_MIGRATION_PATH, VALIDATOR_INPUT_FINGERPRINT_MIGRATION_PATH, UNPLANNED_EXECUTION_BLOCK_DEDUPE_MIGRATION_PATH, QUEUED_EPISODE_SIGNATURE_MIGRATION_PATH, MULTI_ROLE_WORKFLOW_AGENTS_MIGRATION_PATH, WORKFLOW_PRINCIPAL_FENCE_MIGRATION_PATH, TASK_RECOMMENDATIONS_MIGRATION_PATH, GITHUB_CHECK_STATES_MIGRATION_PATH, AGENT_ACTIVITY_EVENTS_MIGRATION_PATH, SPEC_LOCK_DRIFT_REPORT_MIGRATION_PATH, SPEC_LOCK_SOURCE_REVISION_BIGINT_MIGRATION_PATH, MEMORY_RECALL_RECORDS_MIGRATION_PATH, MISSION_FEATURE_SPEC_ALIGNMENT_MIGRATION_PATH, AGENT_RATING_PROJECT_ISOLATION_MIGRATION_PATH, AGENT_RATINGS_PROJECT_PARTITION_MIGRATION_PATH, PROJECT_OWNERSHIP_DECLARATION_DRIFT_MIGRATION_PATH;
+var SCHEMA_BASELINE_VERSION, TASK_DECLARED_SYMBOLS_VERSION, INITIAL_SCHEMA_VERSION, AUTOMATION_ISOLATION_SCHEMA_VERSION, ANALYTICS_ISOLATION_SCHEMA_VERSION, MONITOR_APPROVAL_ISOLATION_SCHEMA_VERSION, LEGACY_CUTOVER_PRESERVATION_SCHEMA_VERSION, MULTI_PROJECT_CUTOVER_SCHEMA_VERSION, PROJECT_OWNERSHIP_SCHEMA_VERSION, SQLITE_SCHEMA_PARITY_VERSION, SESSION_ADVISOR_ENABLED_SCHEMA_VERSION, MISSION_FIX_IDEMPOTENCY_VERSION, IMPORT_TRANSLATION_CACHE_VERSION, IMPORT_TRANSLATION_CACHE_SCOPE_FIX_VERSION, IMPORT_TRANSLATION_CACHE_LEGACY_PARTITION_BACKFILL_VERSION, OWNER_PROJECT_ID_SPLIT_VERSION, CHAT_SESSION_PINS_VERSION, EXECUTOR_TOOL_FAILURE_RETRY_VERSION, EXECUTOR_ESCALATION_ATTEMPT_VERSION, GLOBAL_ROUTINES_SCHEMA_VERSION, TASK_MERGER_MODEL_LANE_VERSION, BULK_COMPLETION_REFUSAL_AT_VERSION, TASK_PROPOSAL_CLAIM_VERSION, CONFIGURATION_REVISIONS_VERSION, IDEATION_SCHEMA_VERSION, RESEARCH_FEATURE_PROVENANCE_VERSION, TASK_VERIFICATION_REQUEST_VERSION, SYMBOL_LOCKS_SCHEMA_VERSION, BIGINT_COUNTERS_VERSION, PLANNING_ACTIVE_TIMING_VERSION, SQLITE_MIGRATION_RUNTIME_READ_VERSION, WORKFLOW_TASK_CONTINUATIONS_VERSION, LEGACY_ADOPTION_DRAINED_MARKER_RUNTIME_GRANTS_VERSION, TASK_WEDGE_NOTIFICATION_VERSION, MILESTONE_ASSERTION_PROVENANCE_VERSION, MISSION_LINEAGE_STOP_VERSION, CHAT_SESSION_TAGS_VERSION, DROP_GLOBAL_CONCURRENCY_VERSION, MISSION_TASK_PREFIX_VERSION, CREDENTIAL_INSTANCE_SELECTION_VERSION, TASK_LIFECYCLE_OUTBOX_VERSION, TASK_LIFECYCLE_CONSUMERS_VERSION, VALIDATOR_INPUT_FINGERPRINT_VERSION, UNPLANNED_EXECUTION_BLOCK_DEDUPE_VERSION, QUEUED_EPISODE_SIGNATURE_VERSION, MULTI_ROLE_WORKFLOW_AGENTS_VERSION, WORKFLOW_PRINCIPAL_FENCE_VERSION, TASK_RECOMMENDATIONS_VERSION, GITHUB_CHECK_STATES_VERSION, AGENT_ACTIVITY_EVENTS_VERSION, SPEC_LOCK_DRIFT_REPORT_VERSION, SPEC_LOCK_SOURCE_REVISION_BIGINT_VERSION, MEMORY_RECALL_RECORDS_VERSION, MISSION_FEATURE_SPEC_ALIGNMENT_VERSION, AGENT_RATING_PROJECT_ISOLATION_VERSION, AGENT_RATINGS_PROJECT_PARTITION_VERSION, PROJECT_OWNERSHIP_DECLARATION_DRIFT_VERSION, PROJECT_OWNERSHIP_DEFAULT_RECONCILIATION_VERSION, MESSAGE_ARCHIVE_SCHEMA_VERSION, LEGACY_ADOPTION_DRAINED_MARKER_FUNCTION, StaleBinarySchemaError, MIGRATION_BOOKKEEPING_TABLE, LEGACY_ADOPTION_DRAINED_MARKER, __dirname, MIGRATIONS_DIR, BASELINE_MIGRATION_PATH, AUTOMATION_ISOLATION_MIGRATION_PATH, ANALYTICS_ISOLATION_MIGRATION_PATH, MONITOR_APPROVAL_ISOLATION_MIGRATION_PATH, LEGACY_CUTOVER_PRESERVATION_MIGRATION_PATH, MULTI_PROJECT_CUTOVER_MIGRATION_PATH, PROJECT_OWNERSHIP_MIGRATION_PATH, SQLITE_SCHEMA_PARITY_MIGRATION_PATH, SESSION_ADVISOR_ENABLED_MIGRATION_PATH, MISSION_FIX_IDEMPOTENCY_MIGRATION_PATH, IMPORT_TRANSLATION_CACHE_MIGRATION_PATH, IMPORT_TRANSLATION_CACHE_SCOPE_FIX_MIGRATION_PATH, IMPORT_TRANSLATION_CACHE_LEGACY_PARTITION_BACKFILL_MIGRATION_PATH, OWNER_PROJECT_ID_SPLIT_MIGRATION_PATH, CHAT_SESSION_PINS_MIGRATION_PATH, EXECUTOR_TOOL_FAILURE_RETRY_MIGRATION_PATH, EXECUTOR_ESCALATION_ATTEMPT_MIGRATION_PATH, GLOBAL_ROUTINES_MIGRATION_PATH, TASK_MERGER_MODEL_LANE_MIGRATION_PATH, BULK_COMPLETION_REFUSAL_AT_MIGRATION_PATH, TASK_PROPOSAL_CLAIM_MIGRATION_PATH, CONFIGURATION_REVISIONS_MIGRATION_PATH, IDEATION_MIGRATION_PATH, RESEARCH_FEATURE_PROVENANCE_MIGRATION_PATH, TASK_VERIFICATION_REQUEST_MIGRATION_PATH, SYMBOL_LOCKS_MIGRATION_PATH, BIGINT_COUNTERS_MIGRATION_PATH, WORKFLOW_IR_PIN_AND_LEGACY_ADOPTION_VERSION, WORKFLOW_IR_PIN_AND_LEGACY_ADOPTION_MIGRATION_PATH, PLANNING_ACTIVE_TIMING_MIGRATION_PATH, TASK_DECLARED_SYMBOLS_MIGRATION_PATH, SQLITE_MIGRATION_RUNTIME_READ_PATH, WORKFLOW_TASK_CONTINUATIONS_PATH, LEGACY_ADOPTION_DRAINED_MARKER_RUNTIME_GRANTS_PATH, TASK_WEDGE_NOTIFICATION_MIGRATION_PATH, MILESTONE_ASSERTION_PROVENANCE_MIGRATION_PATH, MISSION_LINEAGE_STOP_MIGRATION_PATH, CHAT_SESSION_TAGS_MIGRATION_PATH, DROP_GLOBAL_CONCURRENCY_MIGRATION_PATH, MISSION_TASK_PREFIX_MIGRATION_PATH, CREDENTIAL_INSTANCE_SELECTION_MIGRATION_PATH, TASK_LIFECYCLE_OUTBOX_MIGRATION_PATH, TASK_LIFECYCLE_CONSUMERS_MIGRATION_PATH, VALIDATOR_INPUT_FINGERPRINT_MIGRATION_PATH, UNPLANNED_EXECUTION_BLOCK_DEDUPE_MIGRATION_PATH, QUEUED_EPISODE_SIGNATURE_MIGRATION_PATH, MULTI_ROLE_WORKFLOW_AGENTS_MIGRATION_PATH, WORKFLOW_PRINCIPAL_FENCE_MIGRATION_PATH, TASK_RECOMMENDATIONS_MIGRATION_PATH, GITHUB_CHECK_STATES_MIGRATION_PATH, AGENT_ACTIVITY_EVENTS_MIGRATION_PATH, SPEC_LOCK_DRIFT_REPORT_MIGRATION_PATH, SPEC_LOCK_SOURCE_REVISION_BIGINT_MIGRATION_PATH, MEMORY_RECALL_RECORDS_MIGRATION_PATH, MISSION_FEATURE_SPEC_ALIGNMENT_MIGRATION_PATH, AGENT_RATING_PROJECT_ISOLATION_MIGRATION_PATH, AGENT_RATINGS_PROJECT_PARTITION_MIGRATION_PATH, PROJECT_OWNERSHIP_DECLARATION_DRIFT_MIGRATION_PATH, PROJECT_OWNERSHIP_DEFAULT_RECONCILIATION_MIGRATION_PATH, MESSAGE_ARCHIVE_SCHEMA_MIGRATION_PATH;
 var init_schema_applier = __esm({
   "../core/src/postgres/schema-applier.ts"() {
     "use strict";
     init_drizzle_orm();
     init_plugin_schema_hook();
     init_advisory_locks();
-    SCHEMA_BASELINE_VERSION = "0056";
+    SCHEMA_BASELINE_VERSION = "0058";
     TASK_DECLARED_SYMBOLS_VERSION = "0028";
     INITIAL_SCHEMA_VERSION = "0000";
     AUTOMATION_ISOLATION_SCHEMA_VERSION = "0001";
@@ -40999,6 +41145,8 @@ var init_schema_applier = __esm({
     AGENT_RATING_PROJECT_ISOLATION_VERSION = "0054";
     AGENT_RATINGS_PROJECT_PARTITION_VERSION = "0055";
     PROJECT_OWNERSHIP_DECLARATION_DRIFT_VERSION = "0056";
+    PROJECT_OWNERSHIP_DEFAULT_RECONCILIATION_VERSION = "0057";
+    MESSAGE_ARCHIVE_SCHEMA_VERSION = "0058";
     LEGACY_ADOPTION_DRAINED_MARKER_FUNCTION = "fusion_mark_legacy_adoption_drained";
     StaleBinarySchemaError = class extends Error {
       constructor(databaseVersion, binaryVersion) {
@@ -41135,6 +41283,8 @@ var init_schema_applier = __esm({
     AGENT_RATING_PROJECT_ISOLATION_MIGRATION_PATH = join8(MIGRATIONS_DIR, "0054_fn_8957_agent_rating_project_isolation.sql");
     AGENT_RATINGS_PROJECT_PARTITION_MIGRATION_PATH = join8(MIGRATIONS_DIR, "0055_fn_8988_agent_ratings_project_partition.sql");
     PROJECT_OWNERSHIP_DECLARATION_DRIFT_MIGRATION_PATH = join8(MIGRATIONS_DIR, "0056_fn_8997_project_ownership_declaration_drift.sql");
+    PROJECT_OWNERSHIP_DEFAULT_RECONCILIATION_MIGRATION_PATH = join8(MIGRATIONS_DIR, "0057_fn_9004_project_ownership_default_reconciliation.sql");
+    MESSAGE_ARCHIVE_SCHEMA_MIGRATION_PATH = join8(MIGRATIONS_DIR, "0058_fn_9014_message_archive.sql");
   }
 });
 
@@ -68667,8 +68817,10 @@ function safeJsonParse(value) {
     return null;
   }
 }
-async function queryRunAuditEvents(db, filter = {}) {
-  const conditions = [];
+async function queryRunAuditEvents(db, filter = {}, projectId2) {
+  const conditions = [projectScopeFor(project_exports.runAuditEvents.projectId, projectId2)].filter(
+    (condition) => condition !== void 0
+  );
   if (filter.runId) {
     conditions.push(eq(project_exports.runAuditEvents.runId, filter.runId));
   }
@@ -68814,6 +68966,7 @@ var init_async_audit = __esm({
     init_drizzle_orm();
     init_schema2();
     init_data_layer();
+    init_data_layer();
     LEGACY_REVIEW_LANES3 = ["in-review"];
     LEGACY_COMPLETE_LANES = ["done"];
   }
@@ -69203,7 +69356,10 @@ async function insertArtifactRow(layer, input, stored, archivedColumns) {
       createdAt: now,
       updatedAt: now
     });
-    const rows = await tx.select().from(project_exports.artifacts).where(eq(project_exports.artifacts.id, id)).limit(1);
+    const rows = await tx.select().from(project_exports.artifacts).where(and(
+      eq(project_exports.artifacts.id, id),
+      projectScopeFor(project_exports.artifacts.projectId, layer.projectId)
+    )).limit(1);
     const row = rows[0];
     if (!row) throw new Error(`Failed to register artifact ${id}`);
     return rowToArtifact2(row);
@@ -69211,7 +69367,7 @@ async function insertArtifactRow(layer, input, stored, archivedColumns) {
 }
 async function updateArtifactRow(layer, id, updates, archivedColumns) {
   return layer.transactionImmediate(async (tx) => {
-    const existing = await getArtifact(tx, id);
+    const existing = await getArtifact(tx, id, layer.projectId);
     if (!existing) {
       throw new Error(`Artifact ${id} not found`);
     }
@@ -69231,29 +69387,38 @@ async function updateArtifactRow(layer, id, updates, archivedColumns) {
       description: updates.description !== void 0 ? updates.description : existing.description ?? null,
       content: updates.content !== void 0 ? updates.content : existing.content ?? null,
       updatedAt: now
-    }).where(eq(project_exports.artifacts.id, id));
-    const updated = await getArtifact(tx, id);
+    }).where(and(
+      eq(project_exports.artifacts.id, id),
+      projectScopeFor(project_exports.artifacts.projectId, layer.projectId)
+    ));
+    const updated = await getArtifact(tx, id, layer.projectId);
     if (!updated) {
       throw new Error(`Failed to update artifact ${id}`);
     }
     return updated;
   });
 }
-async function getArtifact(db, id) {
-  const rows = await db.select().from(project_exports.artifacts).where(eq(project_exports.artifacts.id, id)).limit(1);
+async function getArtifact(db, id, projectId2) {
+  const rows = await db.select().from(project_exports.artifacts).where(and(
+    eq(project_exports.artifacts.id, id),
+    projectScopeFor(project_exports.artifacts.projectId, projectId2)
+  )).limit(1);
   const row = rows[0];
   return row ? rowToArtifact2(row) : null;
 }
 async function getArtifacts(db, taskId, projectId2, archivedColumns) {
   const column = await getLiveTaskColumn(db, taskId, projectId2, archivedColumns);
   if (column === null || column === "archived") return [];
-  const rows = await db.select().from(project_exports.artifacts).where(eq(project_exports.artifacts.taskId, taskId)).orderBy(desc(project_exports.artifacts.createdAt));
+  const rows = await db.select().from(project_exports.artifacts).where(and(
+    eq(project_exports.artifacts.taskId, taskId),
+    projectScopeFor(project_exports.artifacts.projectId, projectId2)
+  )).orderBy(desc(project_exports.artifacts.createdAt));
   return rows.map((row) => rowToArtifact2(row));
 }
-async function listArtifacts(db, options) {
+async function listArtifacts(db, options, projectId2) {
   const limit = Math.min(Math.max(1, options?.limit ?? 200), 1e3);
   const offset = Math.max(0, options?.offset ?? 0);
-  const conditions = [];
+  const conditions = [projectScopeFor(project_exports.artifacts.projectId, projectId2)];
   if (options?.type) {
     conditions.push(eq(project_exports.artifacts.type, options.type));
   }
@@ -69292,7 +69457,10 @@ async function listArtifacts(db, options) {
     taskColumn: project_exports.tasks.column
   }).from(project_exports.artifacts).leftJoin(
     project_exports.tasks,
-    eq(project_exports.artifacts.taskId, project_exports.tasks.id)
+    and(
+      eq(project_exports.artifacts.taskId, project_exports.tasks.id),
+      eq(project_exports.artifacts.projectId, project_exports.tasks.projectId)
+    )
   ).where(and(...conditions)).orderBy(desc(project_exports.artifacts.createdAt)).limit(limit).offset(offset);
   return rows.map((row) => {
     const artifact = rowToArtifact2(row);
@@ -70457,7 +70625,7 @@ function rowToBranchGroup2(row) {
     closedAt: row.closedAt ?? void 0
   };
 }
-async function createBranchGroup(db, input) {
+async function createBranchGroup(db, input, projectId2) {
   validateBranchGroupBranchName(input.branchName);
   const now = Date.now();
   const id = generateBranchGroupId2();
@@ -70476,44 +70644,52 @@ async function createBranchGroup(db, input) {
     updatedAt: now,
     closedAt: input.closedAt ?? null
   });
-  const created = await getBranchGroup(db, id);
+  const created = await getBranchGroup(db, id, projectId2);
   if (!created) throw new Error(`Failed to read branch group ${id} after create`);
   return created;
 }
-async function getBranchGroup(db, id) {
-  const rows = await db.select().from(project_exports.branchGroups).where(eq(project_exports.branchGroups.id, id)).limit(1);
+async function getBranchGroup(db, id, projectId2) {
+  const rows = await db.select().from(project_exports.branchGroups).where(and(
+    eq(project_exports.branchGroups.id, id),
+    projectScopeFor(project_exports.branchGroups.projectId, projectId2)
+  )).limit(1);
   const row = rows[0];
   return row ? rowToBranchGroup2(row) : null;
 }
-async function getBranchGroupBySource(db, sourceType, sourceId) {
+async function getBranchGroupBySource(db, sourceType, sourceId, projectId2) {
   const rows = await db.select().from(project_exports.branchGroups).where(
     and(
       eq(project_exports.branchGroups.sourceType, sourceType),
-      eq(project_exports.branchGroups.sourceId, sourceId)
+      eq(project_exports.branchGroups.sourceId, sourceId),
+      projectScopeFor(project_exports.branchGroups.projectId, projectId2)
     )
   ).limit(1);
   const row = rows[0];
   return row ? rowToBranchGroup2(row) : null;
 }
-async function getBranchGroupByBranchName(db, branchName) {
-  const rows = await db.select().from(project_exports.branchGroups).where(eq(project_exports.branchGroups.branchName, branchName)).orderBy(sql`${project_exports.branchGroups.createdAt} DESC`).limit(1);
+async function getBranchGroupByBranchName(db, branchName, projectId2) {
+  const rows = await db.select().from(project_exports.branchGroups).where(and(
+    eq(project_exports.branchGroups.branchName, branchName),
+    projectScopeFor(project_exports.branchGroups.projectId, projectId2)
+  )).orderBy(sql`${project_exports.branchGroups.createdAt} DESC`).limit(1);
   const row = rows[0];
   return row ? rowToBranchGroup2(row) : null;
 }
-async function ensureBranchGroupForSource(db, sourceType, sourceId, init) {
-  const existing = await getBranchGroupBySource(db, sourceType, sourceId);
+async function ensureBranchGroupForSource(db, sourceType, sourceId, init, projectId2) {
+  const existing = await getBranchGroupBySource(db, sourceType, sourceId, projectId2);
   if (existing) return existing;
-  const existingByBranch = await getBranchGroupByBranchName(db, init.branchName);
+  const existingByBranch = await getBranchGroupByBranchName(db, init.branchName, projectId2);
   if (existingByBranch) return existingByBranch;
-  return createBranchGroup(db, { sourceType, sourceId, ...init });
+  return createBranchGroup(db, { sourceType, sourceId, ...init }, projectId2);
 }
-async function listBranchGroups(db, options) {
-  const query = db.select().from(project_exports.branchGroups).orderBy(asc(project_exports.branchGroups.createdAt));
-  const rows = options?.status ? await query.where(eq(project_exports.branchGroups.status, options.status)) : await query;
+async function listBranchGroups(db, options, projectId2) {
+  const conditions = [projectScopeFor(project_exports.branchGroups.projectId, projectId2)];
+  if (options?.status) conditions.push(eq(project_exports.branchGroups.status, options.status));
+  const rows = await db.select().from(project_exports.branchGroups).where(and(...conditions)).orderBy(asc(project_exports.branchGroups.createdAt));
   return rows.map((row) => rowToBranchGroup2(row));
 }
-async function updateBranchGroup(db, id, patch) {
-  const current = await getBranchGroup(db, id);
+async function updateBranchGroup(db, id, patch, projectId2) {
+  const current = await getBranchGroup(db, id, projectId2);
   if (!current) throw new Error(`Branch group ${id} not found`);
   if (patch.branchName !== void 0) {
     validateBranchGroupBranchName(patch.branchName);
@@ -70532,8 +70708,11 @@ async function updateBranchGroup(db, id, patch) {
     status: nextStatus,
     updatedAt: now,
     closedAt: nextClosedAt
-  }).where(eq(project_exports.branchGroups.id, id));
-  const updated = await getBranchGroup(db, id);
+  }).where(and(
+    eq(project_exports.branchGroups.id, id),
+    projectScopeFor(project_exports.branchGroups.projectId, projectId2)
+  ));
+  const updated = await getBranchGroup(db, id, projectId2);
   if (!updated) throw new Error(`Branch group ${id} disappeared after update`);
   return updated;
 }
@@ -70690,6 +70869,7 @@ var init_async_branch_groups = __esm({
     "use strict";
     init_drizzle_orm();
     init_schema2();
+    init_data_layer();
     init_branch_assignment();
   }
 });
@@ -80503,6 +80683,9 @@ import { randomUUID as randomUUID21 } from "node:crypto";
 function tableForScope(scope) {
   return scope === "project" ? project_exports.secrets : central_exports.secretsGlobal;
 }
+function scopeForSecretTable(scope, table, projectId2) {
+  return scope === "project" ? projectScopeFor(table.projectId, projectId2) : void 0;
+}
 function isAccessPolicy(value) {
   return value === "auto" || value === "prompt" || value === "deny";
 }
@@ -80525,23 +80708,23 @@ function rowToRecord2(row, scope) {
     lastReadBy: row.lastReadBy
   };
 }
-async function getSecretMetadata(handle, id, scope) {
+async function getSecretMetadata(handle, id, scope, projectId2) {
   const table = tableForScope(scope);
-  const rows = await handle.select(metadataColumns(table)).from(table).where(eq(table.id, id)).limit(1);
+  const rows = await handle.select(metadataColumns(table)).from(table).where(and(eq(table.id, id), scopeForSecretTable(scope, table, projectId2))).limit(1);
   const row = rows[0];
   return row ? rowToRecord2(row, scope) : null;
 }
-async function listSecrets(handle, scope) {
+async function listSecrets(handle, scope, projectId2) {
   if (scope) {
     const table = tableForScope(scope);
-    const rows = await handle.select(metadataColumns(table)).from(table).orderBy(asc(sql`lower(${table.key})`));
+    const rows = await handle.select(metadataColumns(table)).from(table).where(scopeForSecretTable(scope, table, projectId2)).orderBy(asc(sql`lower(${table.key})`));
     return rows.map((row) => rowToRecord2(row, scope));
   }
-  const project = await listSecrets(handle, "project");
-  const global2 = await listSecrets(handle, "global");
+  const project = await listSecrets(handle, "project", projectId2);
+  const global2 = await listSecrets(handle, "global", projectId2);
   return [...project, ...global2];
 }
-async function createSecret(handle, cipher, input) {
+async function createSecret(handle, cipher, input, projectId2) {
   const key = input.key.trim();
   if (!key) {
     throw new SecretsStoreError({ code: "invalid-key", message: "Secret key is required" });
@@ -80555,6 +80738,7 @@ async function createSecret(handle, cipher, input) {
   const table = tableForScope(input.scope);
   try {
     await handle.insert(table).values({
+      ...input.scope === "project" && projectId2?.trim() ? { projectId: projectId2 } : {},
       id,
       key,
       valueCiphertext: encrypted.ciphertext,
@@ -80574,14 +80758,14 @@ async function createSecret(handle, cipher, input) {
     }
     throw error3;
   }
-  const created = await getSecretMetadata(handle, id, input.scope);
+  const created = await getSecretMetadata(handle, id, input.scope, projectId2);
   if (!created) {
     throw new SecretsStoreError({ code: "not-found", message: "Secret insert succeeded but row could not be read back" });
   }
   return created;
 }
-async function updateSecret(handle, cipher, id, scope, patch) {
-  const existing = await getSecretMetadata(handle, id, scope);
+async function updateSecret(handle, cipher, id, scope, patch, projectId2) {
+  const existing = await getSecretMetadata(handle, id, scope, projectId2);
   if (!existing) {
     throw new SecretsStoreError({ code: "not-found", message: "Secret not found" });
   }
@@ -80615,34 +80799,34 @@ async function updateSecret(handle, cipher, id, scope, patch) {
     updates.nonce = encrypted.nonce;
   }
   try {
-    await handle.update(table).set(updates).where(eq(table.id, id));
+    await handle.update(table).set(updates).where(and(eq(table.id, id), scopeForSecretTable(scope, table, projectId2)));
   } catch (error3) {
     if (isPostgresUniqueError(error3)) {
       throw new SecretsStoreError({ code: "duplicate-key", message: "Secret key already exists" });
     }
     throw error3;
   }
-  const updated = await getSecretMetadata(handle, id, scope);
+  const updated = await getSecretMetadata(handle, id, scope, projectId2);
   if (!updated) {
     throw new SecretsStoreError({ code: "not-found", message: "Secret update succeeded but row could not be read back" });
   }
   return updated;
 }
-async function deleteSecret(handle, id, scope) {
-  const existing = await getSecretMetadata(handle, id, scope);
+async function deleteSecret(handle, id, scope, projectId2) {
+  const existing = await getSecretMetadata(handle, id, scope, projectId2);
   if (!existing) {
     throw new SecretsStoreError({ code: "not-found", message: "Secret not found" });
   }
   const table = tableForScope(scope);
-  await handle.delete(table).where(eq(table.id, id));
+  await handle.delete(table).where(and(eq(table.id, id), scopeForSecretTable(scope, table, projectId2)));
 }
-async function revealSecret(handle, cipher, id, scope, reader) {
+async function revealSecret(handle, cipher, id, scope, reader, projectId2) {
   const table = tableForScope(scope);
   const rows = await handle.select({
     ...metadataColumns(table),
     valueCiphertext: table.valueCiphertext,
     nonce: table.nonce
-  }).from(table).where(eq(table.id, id)).limit(1);
+  }).from(table).where(and(eq(table.id, id), scopeForSecretTable(scope, table, projectId2))).limit(1);
   const row = rows[0];
   if (!row) {
     throw new SecretsStoreError({ code: "not-found", message: "Secret not found" });
@@ -80661,7 +80845,7 @@ async function revealSecret(handle, cipher, id, scope, reader) {
   }
   const now = (/* @__PURE__ */ new Date()).toISOString();
   const lastReadBy = reader.userId ?? reader.agentId ?? null;
-  await handle.update(table).set({ lastReadAt: now, lastReadBy, updatedAt: now }).where(eq(table.id, id));
+  await handle.update(table).set({ lastReadAt: now, lastReadBy, updatedAt: now }).where(and(eq(table.id, id), scopeForSecretTable(scope, table, projectId2)));
   return { key: row.key, plaintextValue };
 }
 var severityAuditLog10, SecretsStoreError, metadataColumns;
@@ -80672,6 +80856,7 @@ var init_async_secrets_store = __esm({
     init_drizzle_orm();
     init_postgres_errors();
     init_schema2();
+    init_data_layer();
     init_secrets_crypto();
     severityAuditLog10 = createLogger("core-async-secrets-store");
     SecretsStoreError = class extends Error {
@@ -80767,7 +80952,7 @@ var init_secrets_store = __esm({
         };
       }
       async listSecrets(scope) {
-        return listSecrets(this.asyncLayer.db, scope);
+        return listSecrets(this.asyncLayer.db, scope, this.asyncLayer.projectId);
       }
       async listEnvExportable(opts) {
         const keyPrefix = opts?.keyPrefix;
@@ -80810,7 +80995,7 @@ var init_secrets_store = __esm({
         return [...exported.values()];
       }
       async getSecretMetadata(id, scope) {
-        return getSecretMetadata(this.asyncLayer.db, id, scope);
+        return getSecretMetadata(this.asyncLayer.db, id, scope, this.asyncLayer.projectId);
       }
       async createSecret(input) {
         const key = input.key.trim();
@@ -80820,12 +81005,12 @@ var init_secrets_store = __esm({
         if (input.accessPolicy && !isAccessPolicy2(input.accessPolicy)) {
           throw new SecretsStoreError2({ code: "invalid-policy", message: "Invalid access policy" });
         }
-        const created = await createSecret(this.asyncLayer.db, this.cipher, input);
+        const created = await createSecret(this.asyncLayer.db, this.cipher, input, this.asyncLayer.projectId);
         this.emitAudit({ mutationType: "secret:create", scope: input.scope, secretId: created.id, key: created.key });
         return created;
       }
       async updateSecret(id, scope, patch) {
-        const updated = await updateSecret(this.asyncLayer.db, this.cipher, id, scope, patch);
+        const updated = await updateSecret(this.asyncLayer.db, this.cipher, id, scope, patch, this.asyncLayer.projectId);
         this.emitAudit({ mutationType: "secret:update", scope, secretId: updated.id, key: updated.key });
         return updated;
       }
@@ -80834,12 +81019,12 @@ var init_secrets_store = __esm({
         if (!existing) {
           throw new SecretsStoreError2({ code: "not-found", message: "Secret not found" });
         }
-        await deleteSecret(this.asyncLayer.db, id, scope);
+        await deleteSecret(this.asyncLayer.db, id, scope, this.asyncLayer.projectId);
         this.emitAudit({ mutationType: "secret:delete", scope, secretId: id, key: existing.key });
         return;
       }
       async revealSecret(id, scope, reader) {
-        const revealed = await revealSecret(this.asyncLayer.db, this.cipher, id, scope, reader);
+        const revealed = await revealSecret(this.asyncLayer.db, this.cipher, id, scope, reader, this.asyncLayer.projectId);
         this.emitAudit({ mutationType: "secret:read", scope, secretId: id, key: revealed.key, actor: reader });
         return revealed;
       }
@@ -81940,6 +82125,7 @@ async function getVerificationCacheHitImpl(store, treeSha, testCommand, buildCom
   const normalizedBuild = buildCommand2 ?? "";
   const table = project_exports.verificationCache;
   const rows = await store.asyncLayer.db.select({ recordedAt: table.recordedAt, taskId: table.taskId }).from(table).where(and(
+    projectScopeFor(table.projectId, store.asyncLayer.projectId),
     eq(table.treeSha, treeSha),
     eq(table.testCommand, normalizedTest),
     eq(table.buildCommand, normalizedBuild)
@@ -82682,7 +82868,7 @@ async function invokeTaskCreatedHookImpl(store, task) {
 }
 async function createBranchGroupImpl(store, input) {
   const layer = store.asyncLayer;
-  return createBranchGroup(layer.db, input);
+  return createBranchGroup(layer.db, input, layer.projectId);
 }
 var init_task_id_integrity2 = __esm({
   "../core/src/task-store/task-id-integrity.ts"() {
@@ -82767,22 +82953,23 @@ import { readFile as readFile7, writeFile as writeFile5 } from "node:fs/promises
 import { join as join23 } from "node:path";
 async function getBranchGroupImpl(store, id) {
   const layer = store.asyncLayer;
-  return getBranchGroup(layer.db, id);
+  return getBranchGroup(layer.db, id, layer.projectId);
 }
 async function getBranchGroupBySourceImpl(store, sourceType, sourceId) {
   const layer = store.asyncLayer;
-  return getBranchGroupBySource(layer.db, sourceType, sourceId);
+  return getBranchGroupBySource(layer.db, sourceType, sourceId, layer.projectId);
 }
 async function getBranchGroupByBranchNameImpl(store, branchName) {
   const layer = store.asyncLayer;
-  return getBranchGroupByBranchName(layer.db, branchName);
+  return getBranchGroupByBranchName(layer.db, branchName, layer.projectId);
 }
 async function ensureBranchGroupForSourceImpl(store, sourceType, sourceId, init) {
-  return ensureBranchGroupForSource(store.asyncLayer.db, sourceType, sourceId, init);
+  const layer = store.asyncLayer;
+  return ensureBranchGroupForSource(layer.db, sourceType, sourceId, init, layer.projectId);
 }
 async function listBranchGroupsImpl(store, options) {
   const layer = store.asyncLayer;
-  return listBranchGroups(layer.db, options);
+  return listBranchGroups(layer.db, options, layer.projectId);
 }
 async function listTasksByBranchGroupImpl(store, groupId) {
   const tasks2 = await store.listTasks({ includeArchived: true, slim: false });
@@ -84324,7 +84511,7 @@ function insertArtifactRowImpl(store, input, id, now, stored) {
 }
 async function getArtifactImpl(store, id) {
   const layer = store.asyncLayer;
-  return getArtifact(layer.db, id);
+  return getArtifact(layer.db, id, layer.projectId);
 }
 async function updateArtifactImpl(store, id, updates) {
   const layer = store.asyncLayer;
@@ -89193,6 +89380,7 @@ var init_async_archive_lineage = __esm({
     "use strict";
     init_drizzle_orm();
     init_schema2();
+    init_data_layer();
     init_async_persistence();
     init_async_lifecycle();
     init_lineage_approval_invalidation();
@@ -92660,7 +92848,7 @@ async function _maybeAutoArchiveSameAgentDuplicateBackendImpl(store, task, input
 }
 async function updateBranchGroupImpl(store, id, patch) {
   const layer = store.asyncLayer;
-  return updateBranchGroup(layer.db, id, patch);
+  return updateBranchGroup(layer.db, id, patch, layer.projectId);
 }
 async function updatePrEntityImpl(store, id, patch) {
   const layer = store.asyncLayer;
@@ -93170,13 +93358,19 @@ async function deleteAttachmentArtifactRows(store, taskId, filename) {
   const linkedArtifactIds = artifacts2.filter((artifact) => artifact.metadata?.source === "attachment" && artifact.metadata.attachmentFilename === filename).map((artifact) => artifact.id);
   if (linkedArtifactIds.length === 0) return;
   for (const artifactId of linkedArtifactIds) {
-    await layer.db.delete(project_exports.artifacts).where(eq(project_exports.artifacts.id, artifactId));
+    await layer.db.delete(project_exports.artifacts).where(and(
+      eq(project_exports.artifacts.id, artifactId),
+      projectScopeFor(project_exports.artifacts.projectId, layer.projectId)
+    ));
   }
   return;
 }
 async function getArtifactsForAttachmentCleanup(store, taskId) {
   const layer = store.asyncLayer;
-  const rows = await layer.db.select().from(project_exports.artifacts).where(eq(project_exports.artifacts.taskId, taskId));
+  const rows = await layer.db.select().from(project_exports.artifacts).where(and(
+    eq(project_exports.artifacts.taskId, taskId),
+    projectScopeFor(project_exports.artifacts.projectId, layer.projectId)
+  ));
   return rows;
 }
 async function deleteAttachmentImpl(store, id, filename) {
@@ -95592,7 +95786,7 @@ function clearLinkedAgentTaskIdsImpl(store, taskId, updatedAt = (/* @__PURE__ */
     `).run(updatedAt, updatedAt, taskId);
 }
 async function listArtifactsImpl(store, options) {
-  return listArtifacts(store.asyncLayer.db, options);
+  return listArtifacts(store.asyncLayer.db, options, store.asyncLayer.projectId);
 }
 async function rehomeOccupantImpl(store, taskId, targetColumn, reason, metadata) {
   let current;
@@ -103919,7 +104113,11 @@ var init_store = __esm({
       /** PostgreSQL-authoritative audit reader; sync fallback remains for test doubles. */
       async getRunAuditEventsAsync(options = {}) {
         if (this.asyncLayer) {
-          const events = await queryRunAuditEvents(this.asyncLayer.db, options);
+          const events = await queryRunAuditEvents(
+            this.asyncLayer.db,
+            options,
+            this.asyncLayer.projectId
+          );
           return events.map((event) => ({
             ...event,
             taskId: event.taskId ?? void 0,
@@ -107497,7 +107695,9 @@ function rangeWhere(query) {
 async function aggregatePluginActivations(dbOrLayer, query = {}) {
   if ("ping" in dbOrLayer) {
     const layer = dbOrLayer;
-    const conditions = [];
+    const conditions = [projectScopeFor(project_exports.pluginActivations.projectId, layer.projectId)].filter(
+      (condition) => condition !== void 0
+    );
     if (query.from !== void 0) conditions.push(gte(project_exports.pluginActivations.activatedAt, query.from));
     if (query.to !== void 0) conditions.push(lte(project_exports.pluginActivations.activatedAt, query.to));
     const where2 = conditions.length > 0 ? and(...conditions) : void 0;
@@ -107536,6 +107736,7 @@ async function aggregatePluginActivations(dbOrLayer, query = {}) {
 var init_plugin_activation_analytics = __esm({
   "../core/src/plugins/plugin-activation-analytics.ts"() {
     "use strict";
+    init_data_layer();
     init_drizzle_orm();
     init_schema2();
   }
@@ -130533,6 +130734,18 @@ function rowToMessage2(row) {
     createdAt: row.createdAt
   };
 }
+function chatMessageProjectConditions(handle, projectId2) {
+  const messageScope = projectScopeFor(project_exports.chatMessages.projectId, projectId2);
+  const sessionScope = projectScopeFor(project_exports.chatSessions.projectId, projectId2);
+  if (!messageScope || !sessionScope) return [];
+  return [
+    messageScope,
+    exists(handle.select({ id: project_exports.chatSessions.id }).from(project_exports.chatSessions).where(and(
+      eq(project_exports.chatSessions.id, project_exports.chatMessages.sessionId),
+      sessionScope
+    )))
+  ];
+}
 function rowToRoom(row) {
   return {
     id: row.id,
@@ -130704,7 +130917,7 @@ async function replaceChatSessionTags(layer, sessionId, projectId2, tagIds) {
     return attachTags(tx, session);
   });
 }
-async function addChatMessage(handle, message) {
+async function addChatMessage(handle, message, projectId2) {
   const sanitizedAttachments = message.attachments === void 0 ? void 0 : sanitizeJsonbValue(message.attachments);
   const sanitized = {
     ...message,
@@ -130723,15 +130936,24 @@ async function addChatMessage(handle, message) {
     attachments: sanitizedAttachments ?? null,
     createdAt: sanitized.createdAt
   });
-  await handle.update(project_exports.chatSessions).set({ updatedAt: sanitized.createdAt }).where(eq(project_exports.chatSessions.id, sanitized.sessionId));
+  await handle.update(project_exports.chatSessions).set({ updatedAt: sanitized.createdAt }).where(and(
+    eq(project_exports.chatSessions.id, sanitized.sessionId),
+    projectScopeFor(project_exports.chatSessions.projectId, projectId2)
+  ));
   return sanitized;
 }
-async function getChatMessage(handle, id) {
-  const rows = await handle.select().from(project_exports.chatMessages).where(eq(project_exports.chatMessages.id, id));
+async function getChatMessage(handle, id, projectId2) {
+  const rows = await handle.select().from(project_exports.chatMessages).where(and(
+    eq(project_exports.chatMessages.id, id),
+    ...chatMessageProjectConditions(handle, projectId2)
+  ));
   return rows[0] ? rowToMessage2(rows[0]) : void 0;
 }
-async function getChatMessages(handle, sessionId, filter) {
-  const conditions = [eq(project_exports.chatMessages.sessionId, sessionId)];
+async function getChatMessages(handle, sessionId, filter, projectId2) {
+  const conditions = [
+    eq(project_exports.chatMessages.sessionId, sessionId),
+    ...chatMessageProjectConditions(handle, projectId2)
+  ];
   if (filter?.before) {
     conditions.push(lte(project_exports.chatMessages.createdAt, filter.before));
   }
@@ -130741,9 +130963,12 @@ async function getChatMessages(handle, sessionId, filter) {
   const rows = await handle.select().from(project_exports.chatMessages).where(and(...conditions)).orderBy(filter?.order === "desc" ? desc(orderCol) : asc(orderCol)).limit(limit).offset(offset);
   return rows.map(rowToMessage2);
 }
-async function getLastMessageForSessions(handle, sessionIds) {
+async function getLastMessageForSessions(handle, sessionIds, projectId2) {
   if (sessionIds.length === 0) return /* @__PURE__ */ new Map();
-  const rows = await handle.select().from(project_exports.chatMessages).where(inArray(project_exports.chatMessages.sessionId, sessionIds)).orderBy(
+  const rows = await handle.select().from(project_exports.chatMessages).where(and(
+    inArray(project_exports.chatMessages.sessionId, sessionIds),
+    ...chatMessageProjectConditions(handle, projectId2)
+  )).orderBy(
     desc(project_exports.chatMessages.createdAt),
     desc(project_exports.chatMessages.id)
   );
@@ -130909,8 +131134,8 @@ async function setInFlightGeneration(handle, id, inFlightGeneration) {
   await handle.update(project_exports.chatSessions).set({ inFlightGeneration: sanitizedInFlightGeneration }).where(eq(project_exports.chatSessions.id, id));
   return getChatSession(handle, id);
 }
-async function addChatMessageAttachment(handle, sessionId, messageId, attachment) {
-  const message = await getChatMessage(handle, messageId);
+async function addChatMessageAttachment(handle, sessionId, messageId, attachment, projectId2) {
+  const message = await getChatMessage(handle, messageId, projectId2);
   if (!message || message.sessionId !== sessionId) {
     throw new Error(`Message ${messageId} not found in session ${sessionId}`);
   }
@@ -130918,25 +131143,35 @@ async function addChatMessageAttachment(handle, sessionId, messageId, attachment
     ...message.attachments ?? [],
     attachment
   ]);
-  await handle.update(project_exports.chatMessages).set({ attachments: updatedAttachments }).where(eq(project_exports.chatMessages.id, messageId));
-  const updated = await getChatMessage(handle, messageId);
+  await handle.update(project_exports.chatMessages).set({ attachments: updatedAttachments }).where(and(
+    eq(project_exports.chatMessages.id, messageId),
+    ...chatMessageProjectConditions(handle, projectId2)
+  ));
+  const updated = await getChatMessage(handle, messageId, projectId2);
   if (!updated) throw new Error(`Failed to update message ${messageId}`);
   return updated;
 }
-async function deleteChatMessage(handle, id) {
-  const existing = await getChatMessage(handle, id);
+async function deleteChatMessage(handle, id, projectId2) {
+  const existing = await getChatMessage(handle, id, projectId2);
   if (!existing) return false;
-  await handle.delete(project_exports.chatMessages).where(eq(project_exports.chatMessages.id, id));
-  await handle.update(project_exports.chatSessions).set({ updatedAt: (/* @__PURE__ */ new Date()).toISOString() }).where(eq(project_exports.chatSessions.id, existing.sessionId));
+  await handle.delete(project_exports.chatMessages).where(and(
+    eq(project_exports.chatMessages.id, id),
+    ...chatMessageProjectConditions(handle, projectId2)
+  ));
+  await handle.update(project_exports.chatSessions).set({ updatedAt: (/* @__PURE__ */ new Date()).toISOString() }).where(and(
+    eq(project_exports.chatSessions.id, existing.sessionId),
+    projectScopeFor(project_exports.chatSessions.projectId, projectId2)
+  ));
   return true;
 }
-async function searchChatSessionsByMessageContent(handle, query, sessionIds) {
+async function searchChatSessionsByMessageContent(handle, query, sessionIds, projectId2) {
   const trimmed = query.trim();
   if (!trimmed || sessionIds.length === 0) return /* @__PURE__ */ new Map();
   const escaped = trimmed.replace(/\\/g, "\\\\").replace(/%/g, "\\%").replace(/_/g, "\\_");
   const rows = await handle.select().from(project_exports.chatMessages).where(and(
     inArray(project_exports.chatMessages.sessionId, sessionIds),
-    ilike(project_exports.chatMessages.content, `%${escaped}%`)
+    ilike(project_exports.chatMessages.content, `%${escaped}%`),
+    ...chatMessageProjectConditions(handle, projectId2)
   )).orderBy(
     desc(project_exports.chatMessages.createdAt),
     desc(project_exports.chatMessages.id)
@@ -130950,13 +131185,16 @@ async function searchChatSessionsByMessageContent(handle, query, sessionIds) {
   }
   return result2;
 }
-async function deleteChatMessagesFrom(handle, sessionId, fromMessageId) {
-  const orderedRows = await handle.select().from(project_exports.chatMessages).where(eq(project_exports.chatMessages.sessionId, sessionId)).orderBy(
+async function deleteChatMessagesFrom(handle, sessionId, fromMessageId, projectId2) {
+  const orderedRows = await handle.select().from(project_exports.chatMessages).where(and(
+    eq(project_exports.chatMessages.sessionId, sessionId),
+    ...chatMessageProjectConditions(handle, projectId2)
+  )).orderBy(
     asc(project_exports.chatMessages.createdAt),
     asc(project_exports.chatMessages.id)
   );
   const ordered2 = orderedRows.map(rowToMessage2);
-  const target = await getChatMessage(handle, fromMessageId);
+  const target = await getChatMessage(handle, fromMessageId, projectId2);
   if (!target || target.sessionId !== sessionId) {
     return { deletedIds: [], retained: ordered2 };
   }
@@ -130969,19 +131207,28 @@ async function deleteChatMessagesFrom(handle, sessionId, fromMessageId) {
   if (deletedIds.length === 0) {
     return { deletedIds: [], retained };
   }
-  await handle.delete(project_exports.chatMessages).where(inArray(project_exports.chatMessages.id, deletedIds));
-  await handle.update(project_exports.chatSessions).set({ updatedAt: (/* @__PURE__ */ new Date()).toISOString() }).where(eq(project_exports.chatSessions.id, sessionId));
+  await handle.delete(project_exports.chatMessages).where(and(
+    inArray(project_exports.chatMessages.id, deletedIds),
+    ...chatMessageProjectConditions(handle, projectId2)
+  ));
+  await handle.update(project_exports.chatSessions).set({ updatedAt: (/* @__PURE__ */ new Date()).toISOString() }).where(and(
+    eq(project_exports.chatSessions.id, sessionId),
+    projectScopeFor(project_exports.chatSessions.projectId, projectId2)
+  ));
   return { deletedIds, retained };
 }
-async function updateChatMessageMetadata(handle, messageId, metadata, options) {
-  const existing = await getChatMessage(handle, messageId);
+async function updateChatMessageMetadata(handle, messageId, metadata, options, projectId2) {
+  const existing = await getChatMessage(handle, messageId, projectId2);
   if (!existing) {
     throw new Error(`Message ${messageId} not found`);
   }
   const merge2 = options?.merge !== false;
   const nextMetadata = metadata === null ? merge2 ? existing.metadata : null : merge2 ? { ...existing.metadata ?? {}, ...metadata } : metadata;
-  await handle.update(project_exports.chatMessages).set({ metadata: sanitizeJsonbValue(nextMetadata) ?? null }).where(eq(project_exports.chatMessages.id, messageId));
-  const updated = await getChatMessage(handle, messageId);
+  await handle.update(project_exports.chatMessages).set({ metadata: sanitizeJsonbValue(nextMetadata) ?? null }).where(and(
+    eq(project_exports.chatMessages.id, messageId),
+    ...chatMessageProjectConditions(handle, projectId2)
+  ));
+  const updated = await getChatMessage(handle, messageId, projectId2);
   if (!updated) {
     throw new Error(`Failed to update message ${messageId}`);
   }
@@ -131363,7 +131610,7 @@ var init_chat_store = __esm({
           attachments: input.attachments,
           createdAt: now
         };
-        const created = await addChatMessage(this.asyncLayer.db, message);
+        const created = await addChatMessage(this.asyncLayer.db, message, this.asyncLayer.projectId);
         this.emit("chat:message:added", created);
         return created;
       }
@@ -131371,7 +131618,7 @@ var init_chat_store = __esm({
        * Append a file attachment metadata record to an existing message.
        */
       async addMessageAttachment(sessionId, messageId, attachment) {
-        const updated = await addChatMessageAttachment(this.asyncLayer.db, sessionId, messageId, attachment);
+        const updated = await addChatMessageAttachment(this.asyncLayer.db, sessionId, messageId, attachment, this.asyncLayer.projectId);
         this.emit("chat:message:updated", updated);
         return updated;
       }
@@ -131383,7 +131630,7 @@ var init_chat_store = __esm({
        * @returns Array of messages ordered by createdAt ASC (default) or DESC
        */
       async getMessages(sessionId, filter) {
-        return getChatMessages(this.asyncLayer.db, sessionId, filter);
+        return getChatMessages(this.asyncLayer.db, sessionId, filter, this.asyncLayer.projectId);
       }
       /**
        * Get a message by ID.
@@ -131392,7 +131639,7 @@ var init_chat_store = __esm({
        * @returns The message, or undefined if not found
        */
       async getMessage(id) {
-        return getChatMessage(this.asyncLayer.db, id);
+        return getChatMessage(this.asyncLayer.db, id, this.asyncLayer.projectId);
       }
       /**
        * Get the latest message for each session in the provided list.
@@ -131402,10 +131649,10 @@ var init_chat_store = __esm({
        * @returns Map of sessionId -> latest ChatMessage for that session
        */
       async getLastMessageForSessions(sessionIds) {
-        return getLastMessageForSessions(this.asyncLayer.db, sessionIds);
+        return getLastMessageForSessions(this.asyncLayer.db, sessionIds, this.asyncLayer.projectId);
       }
       async hasMessages(sessionId) {
-        return (await getChatMessages(this.asyncLayer.db, sessionId, { limit: 1 })).length > 0;
+        return (await getChatMessages(this.asyncLayer.db, sessionId, { limit: 1 }, this.asyncLayer.projectId)).length > 0;
       }
       /**
        * Search sessions by message content (not just title/agentId).
@@ -131433,7 +131680,7 @@ var init_chat_store = __esm({
         if (!trimmed || !sessionIds || sessionIds.length === 0) {
           return /* @__PURE__ */ new Map();
         }
-        return searchChatSessionsByMessageContent(this.asyncLayer.db, trimmed, sessionIds);
+        return searchChatSessionsByMessageContent(this.asyncLayer.db, trimmed, sessionIds, this.asyncLayer.projectId);
       }
       /**
        * Delete a message by ID.
@@ -131442,9 +131689,9 @@ var init_chat_store = __esm({
        * @returns true if deleted, false if not found
        */
       async deleteMessage(id) {
-        const existing = await getChatMessage(this.asyncLayer.db, id);
+        const existing = await getChatMessage(this.asyncLayer.db, id, this.asyncLayer.projectId);
         if (!existing) return false;
-        const deleted = await deleteChatMessage(this.asyncLayer.db, id);
+        const deleted = await deleteChatMessage(this.asyncLayer.db, id, this.asyncLayer.projectId);
         if (deleted) {
           this.emit("chat:message:deleted", id);
           const updatedSession = await this.getSession(existing.sessionId);
@@ -131467,7 +131714,7 @@ var init_chat_store = __esm({
        * @returns deletedIds (in ASC order) and retained messages (pre-edit history, ASC order)
        */
       async deleteMessagesFrom(sessionId, fromMessageId) {
-        const result2 = await deleteChatMessagesFrom(this.asyncLayer.db, sessionId, fromMessageId);
+        const result2 = await deleteChatMessagesFrom(this.asyncLayer.db, sessionId, fromMessageId, this.asyncLayer.projectId);
         if (result2.deletedIds.length > 0) {
           for (const id of result2.deletedIds) {
             this.emit("chat:message:deleted", id);
@@ -131485,7 +131732,7 @@ var init_chat_store = __esm({
        * is what lets a later edit rewind losslessly via SessionManager.branch()/resetLeaf().
        */
       async updateMessageMetadata(messageId, metadata, options) {
-        const updated = await updateChatMessageMetadata(this.asyncLayer.db, messageId, metadata, options);
+        const updated = await updateChatMessageMetadata(this.asyncLayer.db, messageId, metadata, options, this.asyncLayer.projectId);
         this.emit("chat:message:updated", updated);
         return updated;
       }
@@ -135954,7 +136201,13 @@ var init_gating_classifications = __esm({
       "fn_post_room_message",
       "fn_update_identity",
       "fn_reflect_on_performance",
-      "fn_read_evaluations"
+      /*
+      FNXC:ToolGovernance 2026-08-12-22:11:
+      fn_agent_read_evaluations is a subtree-scoped read. Authorization is enforced by
+      the extension tool's getChainOfCommand boundary, not by this action classifier.
+      */
+      "fn_read_evaluations",
+      "fn_agent_read_evaluations"
     ]);
     COORDINATION_EXEMPT_TOOLS = [
       "read",
@@ -136014,6 +136267,8 @@ var init_gating_classifications = __esm({
       "fn_post_room_message",
       "fn_memory_append",
       "fn_read_evaluations",
+      // FNXC:ToolGovernance 2026-08-12-22:11: The manager read is subtree-authorized in extension.ts; follow-up remains absent so it falls back to task_agent_mutation policy.
+      "fn_agent_read_evaluations",
       "fn_update_identity",
       "fn_reflect_on_performance"
     ];
@@ -178003,32 +178258,36 @@ var init_scheduler = __esm({
             const hierarchy = await missionStore.getMissionWithHierarchy(mission.id);
             if (!hierarchy) continue;
             for (const slice of hierarchy.milestones.flatMap((milestone) => milestone.slices).filter((slice2) => slice2.status === "active")) {
-              const superseded = await missionStore.reconcileSupersededGeneratedFixFeatures(slice.id);
-              fixed += superseded.supersededCount;
-              if (superseded.supersededCount > 0) {
-                const refreshed = await missionStore.getSlice(slice.id);
-                if (refreshed?.status === "complete") {
-                  await this.onSliceComplete(refreshed);
-                  continue;
+              try {
+                const superseded = await missionStore.reconcileSupersededGeneratedFixFeatures(slice.id);
+                fixed += superseded.supersededCount;
+                if (superseded.supersededCount > 0) {
+                  const refreshed = await missionStore.getSlice(slice.id);
+                  if (refreshed?.status === "complete") {
+                    await this.onSliceComplete(refreshed);
+                    continue;
+                  }
                 }
-              }
-              const listFeatures2 = missionStore.listFeatures;
-              const features = listFeatures2 ? await listFeatures2(slice.id) : slice.features;
-              const supersededFeatureIds = new Set(superseded.featureIds ?? []);
-              const autoTriage = mission.autopilotEnabled === true || mission.autoAdvance === true;
-              for (const feature of features) {
-                if (supersededFeatureIds.has(feature.id) || feature.taskId || !autoTriage || feature.status === "blocked") continue;
-                if (feature.status !== "defined" && this.isGeneratedFixFeature(feature)) {
-                  await missionStore.updateFeature(feature.id, { status: "blocked", loopState: "blocked", taskId: void 0 });
+                const listFeatures2 = missionStore.listFeatures;
+                const features = listFeatures2 ? await listFeatures2.call(missionStore, slice.id) : slice.features;
+                const supersededFeatureIds = new Set(superseded.featureIds ?? []);
+                const autoTriage = mission.autopilotEnabled === true || mission.autoAdvance === true;
+                for (const feature of features) {
+                  if (supersededFeatureIds.has(feature.id) || feature.taskId || !autoTriage || feature.status === "blocked") continue;
+                  if (feature.status !== "defined" && this.isGeneratedFixFeature(feature)) {
+                    await missionStore.updateFeature(feature.id, { status: "blocked", loopState: "blocked", taskId: void 0 });
+                    fixed++;
+                    continue;
+                  }
+                  if (feature.status !== "defined" && feature.status !== "triaged" && feature.status !== "in-progress") continue;
+                  const ready = feature.status === "defined" ? feature : await missionStore.updateFeature(feature.id, { status: "defined", loopState: "idle", taskId: void 0 });
+                  if (ready !== feature) fixed++;
+                  const triaged = await missionStore.triageFeature(ready.id);
                   fixed++;
-                  continue;
+                  if (triaged.taskId) await this.emitStrandedFeatureTriageAudit(mission.id, slice.id, triaged.id, triaged.taskId);
                 }
-                if (feature.status !== "defined" && feature.status !== "triaged" && feature.status !== "in-progress") continue;
-                const ready = feature.status === "defined" ? feature : await missionStore.updateFeature(feature.id, { status: "defined", loopState: "idle", taskId: void 0 });
-                if (ready !== feature) fixed++;
-                const triaged = await missionStore.triageFeature(ready.id);
-                fixed++;
-                if (triaged.taskId) await this.emitStrandedFeatureTriageAudit(mission.id, slice.id, triaged.id, triaged.taskId);
+              } catch (error3) {
+                schedulerLog.error(`Error during active mission recovery reconciliation for slice ${slice.id}:`, error3);
               }
             }
           }
@@ -312361,6 +312620,50 @@ async function getAgentStore(cwd) {
   const projectStore = await getStore(cwd);
   return new AgentStore({ rootDir: getFusionDir(cwd), asyncLayer: requireProjectLayer(projectStore, "CLI AgentStore") });
 }
+async function resolveManagerEvaluationTarget(agentStore, agentId, ctx) {
+  const target = await agentStore.resolveAgent(agentId);
+  if (!target) {
+    return {
+      kind: "error",
+      response: {
+        content: [{ type: "text", text: `Agent '${agentId}' not found` }],
+        isError: true,
+        details: { outcome: "not_found", error: "Agent not found", agentId }
+      }
+    };
+  }
+  if (isEphemeralAgent(target)) {
+    return {
+      kind: "error",
+      response: {
+        content: [{ type: "text", text: `ERROR: Cannot evaluate ephemeral/runtime agent ${target.id}` }],
+        isError: true,
+        details: { outcome: "invalid", field: "agent_id", agentId: target.id }
+      }
+    };
+  }
+  const callerAgentId = typeof ctx.agentId === "string" && ctx.agentId ? ctx.agentId : void 0;
+  if (callerAgentId) {
+    const chain = await agentStore.getChainOfCommand(target.id);
+    const callerIndex = chain.findIndex((agent) => agent.id === callerAgentId);
+    if (callerAgentId === target.id || callerIndex < 1) {
+      return {
+        kind: "error",
+        response: {
+          content: [{ type: "text", text: "ERROR: You can only access evaluations for your own direct or indirect reports." }],
+          isError: true,
+          details: {
+            outcome: "denied",
+            agentId: target.id,
+            callerAgentId,
+            rule: "direct-or-indirect-reports-only"
+          }
+        }
+      };
+    }
+  }
+  return { kind: "allowed", target, callerAgentId };
+}
 function emitSecretAudit(store, ctx, mutationType, target, metadata) {
   if (!ctx.runId || !ctx.agentId) return;
   try {
@@ -316433,6 +316736,143 @@ Status: ${updated.status}`
       };
     }
   });
+  pi2.registerTool({
+    name: "fn_agent_read_evaluations",
+    label: "fn: Read Report Evaluations",
+    description: "Read ratings, feedback, reflections, and performance data for a direct or indirect report.",
+    promptSnippet: "Review evaluation and reflection results for an agent in your management subtree",
+    promptGuidelines: [
+      "Use to review evaluation data for a direct or indirect report in your management subtree",
+      "Agent callers cannot target themselves, peers, ancestors, or agents outside their subtree",
+      "Operator and CLI calls are privileged and may read any durable agent"
+    ],
+    parameters: Type12.Object({
+      agent_id: Type12.String({ description: "Target agent ID or resolvable name" }),
+      rating_limit: Type12.Optional(Type12.Number({ minimum: 1, maximum: 50, description: "Maximum ratings to return (default 10)" })),
+      reflection_limit: Type12.Optional(Type12.Number({ minimum: 1, maximum: 20, description: "Maximum reflections to return (default 5)" }))
+    }),
+    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+      const agentStore = await getAgentStore(ctx.cwd);
+      await agentStore.init();
+      const resolved = await resolveManagerEvaluationTarget(agentStore, params.agent_id, ctx);
+      if (resolved.kind === "error") return resolved.response;
+      const ratingLimit = params.rating_limit ?? 10;
+      const reflectionLimit = params.reflection_limit ?? 5;
+      const reflectionStore = new ReflectionStore({ rootDir: getFusionDir(ctx.cwd) });
+      await reflectionStore.init();
+      const [summary, ratings, latestReflection, reflections, performance4] = await Promise.all([
+        agentStore.getRatingSummary(resolved.target.id),
+        agentStore.getRatings(resolved.target.id, { limit: ratingLimit }),
+        reflectionStore.getLatestReflection(resolved.target.id),
+        reflectionStore.getReflections(resolved.target.id, reflectionLimit),
+        reflectionStore.getPerformanceSummary(resolved.target.id)
+      ]);
+      const hasRatings = ratings.length > 0 || summary.totalRatings > 0;
+      const hasReflections = Boolean(latestReflection) || reflections.length > 0;
+      if (!hasRatings && !hasReflections) {
+        return {
+          content: [{ type: "text", text: `${resolved.target.name} (${resolved.target.id})
+
+No evaluation data available yet.` }],
+          details: { outcome: "empty", agentId: resolved.target.id, agentName: resolved.target.name, summary, ratings, reflections, latestReflection, performance: performance4 }
+        };
+      }
+      const formatScore2 = (score) => typeof score === "number" && Number.isFinite(score) ? score.toFixed(2) : "n/a";
+      const lines = [
+        `Evaluation Summary: ${resolved.target.name} (${resolved.target.id})`,
+        `- Average score: ${formatScore2(summary.averageScore)}`,
+        `- Trend: ${summary.trend}`,
+        `- Total ratings: ${summary.totalRatings}`
+      ];
+      const categoryEntries = Object.entries(summary.categoryAverages ?? {});
+      if (categoryEntries.length > 0) {
+        lines.push("", "Category averages:");
+        categoryEntries.forEach(([category, score]) => lines.push(`- ${category}: ${formatScore2(score)}`));
+      }
+      const commentedRatings = ratings.filter((rating) => rating.comment?.trim());
+      if (commentedRatings.length > 0) {
+        lines.push("", "Recent rating comments:");
+        commentedRatings.slice(0, 5).forEach((rating) => lines.push(`- [${rating.score}/5] ${rating.comment.trim()}`));
+      }
+      if (latestReflection) {
+        lines.push("", "Latest reflection:", `- Summary: ${latestReflection.summary}`);
+        if (latestReflection.insights.length > 0) {
+          lines.push("- Insights:");
+          latestReflection.insights.forEach((insight) => lines.push(`  - ${insight}`));
+        }
+        if (latestReflection.suggestedImprovements.length > 0) {
+          lines.push("- Suggested improvements:");
+          latestReflection.suggestedImprovements.forEach((item) => lines.push(`  - ${item}`));
+        }
+      }
+      if (reflections.length > 0) {
+        lines.push("", "Recent reflection history:");
+        reflections.slice(0, 5).forEach((reflection) => lines.push(`- ${reflection.timestamp}: ${reflection.summary}`));
+      }
+      return {
+        content: [{ type: "text", text: lines.join("\n") }],
+        details: { outcome: "read", agentId: resolved.target.id, agentName: resolved.target.name, summary, ratings, reflections, latestReflection, performance: performance4 }
+      };
+    }
+  });
+  pi2.registerTool({
+    name: "fn_agent_evaluation_followup",
+    label: "fn: Record Evaluation Follow-up",
+    description: "Record a coaching evaluation follow-up for a direct or indirect report to read through its self-improvement loop.",
+    promptSnippet: "Record coaching feedback for an agent in your management subtree",
+    promptGuidelines: [
+      "Use to record actionable coaching feedback for a direct or indirect report",
+      "Agent callers cannot target themselves, peers, ancestors, or agents outside their subtree",
+      "Create or delegate separate implementation work with fn_task_create or fn_delegate_task"
+    ],
+    parameters: Type12.Object({
+      agent_id: Type12.String({ description: "Target agent ID or resolvable name" }),
+      score: Type12.Number({ minimum: 1, maximum: 5, description: "Evaluation score from 1 to 5" }),
+      comment: Type12.String({ minLength: 1, maxLength: 4e3, description: "Coaching or follow-up note" }),
+      category: Type12.Optional(Type12.String({ maxLength: 100, description: "Optional evaluation category" })),
+      task_id: Type12.Optional(Type12.String({ description: "Optional related task ID" }))
+    }),
+    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+      const gated = await applyAgentPolicyGateForExtensionTool(
+        "fn_agent_evaluation_followup",
+        params,
+        ctx
+      );
+      if (gated) return gated;
+      const agentStore = await getAgentStore(ctx.cwd);
+      await agentStore.init();
+      const resolved = await resolveManagerEvaluationTarget(agentStore, params.agent_id, ctx);
+      if (resolved.kind === "error") return resolved.response;
+      if (!Number.isFinite(params.score) || params.score < 1 || params.score > 5) {
+        return {
+          content: [{ type: "text", text: "ERROR: score must be a finite value from 1 to 5" }],
+          isError: true,
+          details: { outcome: "invalid", field: "score" }
+        };
+      }
+      const comment = params.comment.trim();
+      if (!comment) {
+        return {
+          content: [{ type: "text", text: "ERROR: comment must not be empty" }],
+          isError: true,
+          details: { outcome: "invalid", field: "comment" }
+        };
+      }
+      const raterType = resolved.callerAgentId ? "agent" : "user";
+      const rating = await agentStore.addRating(resolved.target.id, {
+        raterType,
+        ...resolved.callerAgentId ? { raterId: resolved.callerAgentId } : {},
+        score: params.score,
+        ...params.category !== void 0 ? { category: params.category } : {},
+        comment,
+        ...params.task_id !== void 0 ? { taskId: params.task_id } : {}
+      });
+      return {
+        content: [{ type: "text", text: `Recorded evaluation follow-up for ${resolved.target.name} (${resolved.target.id}).` }],
+        details: { outcome: "recorded", agentId: resolved.target.id, ratingId: rating.id, score: rating.score, raterType }
+      };
+    }
+  });
   pi2.registerTool({
     name: "fn_agent_delete",
     label: "fn: Delete Agent",