@alook/daemon 0.1.48 → 0.1.50

package/dist/index.js

@@ -8173,15 +8173,14 @@ function createPiSessionDependencies(ctx, loadSdk = loadPiSdkModule) {
     },
     async createAgentSession(opts) {
       const sdk = await loadSdk();
-      const authStorage = sdk.AuthStorage.create();
+      const modelRuntime = await sdk.ModelRuntime.create();
       const runtimeConfig = ctx.config.runtimeConfig;
       const provider = runtimeConfig && "provider" in runtimeConfig ? runtimeConfig.provider : undefined;
       if (provider?.kind === "builtin") {
-        authStorage.setRuntimeApiKey(provider.providerId, provider.apiKey);
+        await modelRuntime.setRuntimeApiKey(provider.providerId, provider.apiKey);
       }
-      const modelRegistry = sdk.ModelRegistry.create(authStorage);
       const parsed = parseModelString(opts.model);
-      const model = parsed ? modelRegistry.find(parsed.provider, parsed.id) : undefined;
+      const model = parsed ? modelRuntime.getModel(parsed.provider, parsed.id) : undefined;
       const cwd = opts.cwd;
       const requestedSessionId = opts.sessionId;
       let sessionManager;
@@ -8200,8 +8199,7 @@ function createPiSessionDependencies(ctx, loadSdk = loadPiSdkModule) {
         cwd,
         model,
         thinkingLevel: opts.thinkingLevel,
-        authStorage,
-        modelRegistry,
+        modelRuntime,
         sessionManager,
         customTools: [bashTool]
       });
@@ -8436,9 +8434,8 @@ class PiDriver {
     try {
       const reasoning = await Promise.race([
         this.loadSdk().then(async (sdk) => {
-          const authStorage = sdk.AuthStorage.create();
-          const registry = sdk.ModelRegistry.create(authStorage);
-          return parsePiModelCatalog(await registry.getAvailable());
+          const modelRuntime = await sdk.ModelRuntime.create();
+          return parsePiModelCatalog(await modelRuntime.getAvailable());
         }),
         new Promise((resolve4) => {
           timer = setTimeout(() => resolve4(undefined), PI_MODEL_PROBE_TIMEOUT_MS);
@@ -11565,10 +11562,31 @@ function reduceManager(state, event) {
       return withAgent(state, event.agentId, (a) => a ?? freshAgent(event.agentId), []);
     case "wake":
       return onWake(state, event.agentId, event.message);
-    case "spawned":
+    case "spawned": {
+      const existing = state.agents[event.agentId];
+      if (!existing || existing.status !== "starting")
+        return { state, effects: [] };
+      const agent = clone(existing);
+      enterStable(agent, "running");
+      syncExecutionProjection(agent);
+      const mode = leaseIsWorking(agent.execution.lease) || agent.pendingAdmissions.length > 0 ? "busy" : "idle";
+      const messages = drainInbox(agent);
+      return commit(state, agent, messages.map((message) => ({ type: "send", agentId: event.agentId, message, mode })));
+    }
+    case "queue_delivery":
       return mutate(state, event.agentId, (a) => {
-        enterStable(a, "running");
+        const queuedById = new Map(a.inbox.filter((message) => message.id).map((message) => [message.id, message]));
+        const restoredIds = new Set;
+        const messages = event.messages.filter((message) => {
+          if (message.id && restoredIds.has(message.id))
+            return false;
+          if (message.id)
+            restoredIds.add(message.id);
+          return true;
+        }).map((message) => message.id ? queuedById.get(message.id) ?? message : message);
+        a.inbox = [...messages, ...a.inbox.filter((message) => !message.id || !restoredIds.has(message.id))];
         syncExecutionProjection(a);
+        a.idleSince = null;
       });
     case "backend_session":
       return mutate(state, event.agentId, (a) => {
@@ -11909,14 +11927,14 @@ function onTurnCompleted(state, agentId, sessionInstanceId, nowMs, turnId, endRe
     agent.stalledSessionId = null;
   syncExecutionProjection(agent);
   const clearEffects = clearedStallSessionId === null ? [] : [{ type: "clear_stall_recovery", agentId, sessionId: clearedStallSessionId }];
-  if (agent.inbox.length > 0 && !agent.resetting) {
+  if (agent.status === "running" && agent.inbox.length > 0 && !agent.resetting) {
     const messages = drainInbox(agent);
     return commit(state, agent, [
       ...clearEffects,
       ...messages.map((queued) => ({ type: "send", agentId, message: queued, mode: "idle" }))
     ]);
   }
-  agent.idleSince = nowMs;
+  agent.idleSince = agent.status === "running" && !agent.resetting ? nowMs : null;
   return commit(state, agent, clearEffects);
 }
 function onTurnToolLifecycle(state, event, lifecycle) {
@@ -13440,8 +13458,34 @@ class AgentProcessManager {
         }
       }
     }
-    for (const effect of effects)
-      this.applyEffect(effect);
+    const completed = new Set;
+    const deferSends = (agentId) => {
+      const remaining = effects.filter((candidate) => candidate.type === "send" && !completed.has(candidate) && (agentId === undefined || candidate.agentId === agentId));
+      for (const id of new Set(remaining.map((candidate) => candidate.agentId))) {
+        const batch = remaining.filter((candidate) => candidate.agentId === id);
+        batch.forEach((candidate) => completed.add(candidate));
+        this.dispatch({
+          type: "queue_delivery",
+          agentId: id,
+          messages: batch.map((candidate) => candidate.message)
+        });
+      }
+    };
+    try {
+      for (const effect of effects) {
+        if (completed.has(effect))
+          continue;
+        if (effect.type === "send" && !this.canSend(effect.agentId)) {
+          deferSends(effect.agentId);
+          continue;
+        }
+        this.applyEffect(effect);
+        completed.add(effect);
+      }
+    } catch (error) {
+      deferSends();
+      throw error;
+    }
     return effects;
   }
   deriveActivitySnapshot(state) {
@@ -13473,6 +13517,26 @@ ${this.opts.wakePromptFooter}` : text2;
   stampNow(text2) {
     return this.opts.stampWakePromptTime ? `[${nowLocalISO()}] ${text2}` : text2;
   }
+  prepareDelivery(message) {
+    return {
+      ...message,
+      preparedInput: message.preparedInput ?? {
+        id: message.id,
+        kind: "user",
+        text: this.stampNow(this.withFooter(message.text)),
+        sequence: message.seq
+      }
+    };
+  }
+  canSend(agentId) {
+    const session = this.sessions.get(agentId);
+    const owner = this.activeSpawnState.get(agentId);
+    const agent = this.state.agents[agentId];
+    if (!session || !owner || owner.session !== session || owner.torndown || owner.superseded || agent?.status !== "running" || agent.resetting || agent.execution.sessionInstanceId !== session.sessionInstanceId)
+      return false;
+    const driverState = session.snapshot().state;
+    return driverState !== "stopping" && driverState !== "closed";
+  }
   beginPendingDelivery(owner, commandId, message, mode, span, requeueOnFailure = true) {
     const sessionInstanceId = owner.sessionInstanceId;
     if (!sessionInstanceId || owner.pendingDeliverySpans.has(commandId))
@@ -13532,18 +13596,15 @@ ${this.opts.wakePromptFooter}` : text2;
         break;
       case "send": {
         const session = this.sessions.get(effect.agentId);
-        const input = {
-          id: effect.message.id,
-          kind: "user",
-          text: this.stampNow(this.withFooter(effect.message.text)),
-          sequence: effect.message.seq
-        };
-        if (session) {
+        if (session && this.canSend(effect.agentId)) {
+          const message = this.prepareDelivery(effect.message);
+          effect.message = message;
+          const input = message.preparedInput;
           const owner = this.activeSpawnState.get(effect.agentId);
           const exactOwner = owner?.session === session ? owner : undefined;
           const associatedSpan = exactOwner ? effect.mode === "idle" ? this.openTurn(exactOwner) : exactOwner.activeSpan : null;
           if (exactOwner)
-            this.beginPendingDelivery(exactOwner, input.id, effect.message, effect.mode, associatedSpan);
+            this.beginPendingDelivery(exactOwner, input.id, message, effect.mode, associatedSpan);
           let sent;
           try {
             sent = session.send(input);
@@ -13752,9 +13813,11 @@ ${this.opts.wakePromptFooter}` : text2;
     this.log.info("agent session ended", { agentId, sessionId, reason });
   }
   doSpawn(agentId, messages, resumeSessionId) {
-    const [first, ...pending] = messages;
-    if (!first)
+    const [initial, ...pending] = messages;
+    if (!initial)
       throw new Error(`AgentProcessManager: spawn for ${agentId} has no command`);
+    this.dispatch({ type: "queue_delivery", agentId, messages: pending });
+    const first = this.prepareDelivery(initial);
     const prompt = this.withFooter(first.text);
     const driver = this.opts.driverFor(agentId, this.runtimeConfigs.get(agentId));
     this.liveBackendIds.set(agentId, driver.id);
@@ -13958,12 +14021,7 @@ ${this.opts.wakePromptFooter}` : text2;
       this.beginPendingDelivery(state, commandId, first, "idle", startedSpan, false);
       let startResult;
       try {
-        startResult = session.start({
-          id: commandId,
-          kind: "user",
-          text: this.stampNow(prompt),
-          sequence: first.seq
-        });
+        startResult = session.start(first.preparedInput);
         this.markPendingDeliveryObserved(state, commandId);
       } catch (error) {
         this.settlePendingDelivery(state, commandId);
@@ -13971,7 +14029,7 @@ ${this.opts.wakePromptFooter}` : text2;
         throw error;
       }
       startResult.then((receipt) => {
-        if (this.sessions.get(agentId) !== session || state.torndown)
+        if (this.sessions.get(agentId) !== session || state.torndown || state.superseded || this.activeSpawnState.get(agentId) !== state)
           return;
         if (receipt?.status === "rejected") {
           this.settlePendingDelivery(state, commandId);
@@ -13980,44 +14038,16 @@ ${this.opts.wakePromptFooter}` : text2;
           session.stop({ reason: "shutdown", forceAfterMs: SESSION_STOP_GRACE_MS2 });
           return;
         }
-        this.dispatch({ type: "spawned", agentId, nowMs: this.now() }, state);
-        (async () => {
-          for (const message of pending) {
-            if (state.torndown || this.sessions.get(agentId) !== session || this.activeSpawnState.get(agentId) !== state) {
-              return;
-            }
-            this.beginPendingDelivery(state, message.id, message, "busy", state.activeSpan);
-            let queuedReceipt;
-            try {
-              const queuedResult = session.send({
-                id: message.id,
-                kind: "user",
-                text: this.stampNow(this.withFooter(message.text)),
-                sequence: message.seq
-              });
-              this.markPendingDeliveryObserved(state, message.id);
-              queuedReceipt = await queuedResult;
-            } catch (error) {
-              this.settlePendingDelivery(state, message.id);
-              if (!state.torndown && this.sessions.get(agentId) === session && this.activeSpawnState.get(agentId) === state) {
-                this.emitErrorAudit(agentId, "runtime", "send_failed", String(error));
-                session.stop({ reason: "shutdown", forceAfterMs: SESSION_STOP_GRACE_MS2 });
-              }
-              return;
-            }
-            if (state.torndown || this.sessions.get(agentId) !== session || this.activeSpawnState.get(agentId) !== state) {
-              return;
-            }
-            if (queuedReceipt.status === "rejected") {
-              if (!state.pendingDeliverySpans.has(message.id))
-                return;
-              this.settlePendingDelivery(state, message.id);
-              this.emitErrorAudit(agentId, "runtime", queuedReceipt.error?.code ?? queuedReceipt.reason, queuedReceipt.error?.message ?? `Delivery rejected (${queuedReceipt.reason})`);
-              session.stop({ reason: "shutdown", forceAfterMs: SESSION_STOP_GRACE_MS2 });
-              return;
-            }
-          }
-        })().catch((error) => this.emitErrorAudit(agentId, "runtime", "send_failed", String(error)));
+        const driverState = session.snapshot().state;
+        if (this.state.agents[agentId]?.status !== "starting" || driverState === "stopping" || driverState === "closed")
+          return;
+        try {
+          this.dispatch({ type: "spawned", agentId, nowMs: this.now() }, state);
+        } catch (error) {
+          this.emitErrorAudit(agentId, "runtime", "send_failed", String(error));
+          session.stop({ reason: "shutdown", forceAfterMs: SESSION_STOP_GRACE_MS2 });
+          return;
+        }
         if (state.hasEstablished || state.hasReportedSpawnFailure)
           return;
         state.handshakeTimer = setTimeout(() => {
@@ -33725,7 +33755,7 @@ __export(exports_community_machine_schema, {
   DIAGNOSTIC_REPORT_FAILURE_CODES: () => DIAGNOSTIC_REPORT_FAILURE_CODES
 });
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/entity.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/entity.js
 var entityKind = Symbol.for("drizzle:entityKind");
 var hasOwnEntityKind = Symbol.for("drizzle:hasOwnEntityKind");
 function is(value, type) {
@@ -33750,7 +33780,7 @@ function is(value, type) {
   return false;
 }
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/column.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/column.js
 class Column {
   constructor(table, config2) {
     this.table = table;
@@ -33800,7 +33830,7 @@ class Column {
   }
 }
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/column-builder.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/column-builder.js
 class ColumnBuilder {
   static [entityKind] = "ColumnBuilder";
   config;
@@ -33856,20 +33886,20 @@ class ColumnBuilder {
   }
 }
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/table.utils.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/table.utils.js
 var TableName = Symbol.for("drizzle:Name");
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/tracing-utils.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/tracing-utils.js
 function iife(fn, ...args) {
   return fn(...args);
 }
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/pg-core/unique-constraint.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/pg-core/unique-constraint.js
 function uniqueKeyName(table, columns) {
   return `${table[TableName]}_${columns.join("_")}_unique`;
 }
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/pg-core/columns/common.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/pg-core/columns/common.js
 class PgColumn extends Column {
   constructor(table, config2) {
     if (!config2.uniqueName) {
@@ -33918,7 +33948,7 @@ class ExtraConfigColumn extends PgColumn {
   }
 }
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/pg-core/columns/enum.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/pg-core/columns/enum.js
 class PgEnumObjectColumn extends PgColumn {
   static [entityKind] = "PgEnumObjectColumn";
   enum;
@@ -33948,7 +33978,7 @@ class PgEnumColumn extends PgColumn {
   }
 }
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/subquery.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/subquery.js
 class Subquery {
   static [entityKind] = "Subquery";
   constructor(sql, fields2, alias, isWith = false, usedTables = []) {
@@ -33963,10 +33993,10 @@ class Subquery {
   }
 }
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/version.js
-var version2 = "0.45.3";
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/version.js
+var version2 = "0.45.4";
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/tracing.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/tracing.js
 var otel;
 var rawTracer;
 var tracer = {
@@ -33993,10 +34023,10 @@ var tracer = {
   }
 };
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/view-common.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/view-common.js
 var ViewBaseConfig = Symbol.for("drizzle:ViewBaseConfig");
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/table.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/table.js
 var Schema = Symbol.for("drizzle:Schema");
 var Columns = Symbol.for("drizzle:Columns");
 var ExtraConfigColumns = Symbol.for("drizzle:ExtraConfigColumns");
@@ -34034,7 +34064,7 @@ class Table {
   }
 }
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/sql/sql.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/sql/sql.js
 function isSQLWrapper(value) {
   return value !== null && value !== undefined && typeof value.getSQL === "function";
 }
@@ -34397,7 +34427,7 @@ Subquery.prototype.getSQL = function() {
   return new SQL([this]);
 };
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/alias.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/alias.js
 class ColumnAliasProxyHandler {
   constructor(table) {
     this.table = table;
@@ -34453,12 +34483,12 @@ class TableAliasProxyHandler {
   }
 }
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/sqlite-core/alias.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/sqlite-core/alias.js
 function alias(table, alias2) {
   return new Proxy(table, new TableAliasProxyHandler(alias2, false));
 }
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/sqlite-core/checks.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/sqlite-core/checks.js
 class CheckBuilder {
   constructor(name, value) {
     this.name = name;
@@ -34485,7 +34515,7 @@ function check2(name, value) {
   return new CheckBuilder(name, value);
 }
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/utils.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/utils.js
 function getColumnNameAndConfig(a, b) {
   return {
     name: typeof a === "string" && a.length > 0 ? a : "",
@@ -34494,7 +34524,7 @@ function getColumnNameAndConfig(a, b) {
 }
 var textDecoder = typeof TextDecoder === "undefined" ? null : new TextDecoder;
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/sqlite-core/foreign-keys.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/sqlite-core/foreign-keys.js
 class ForeignKeyBuilder {
   static [entityKind] = "SQLiteForeignKeyBuilder";
   reference;
@@ -34562,7 +34592,7 @@ function foreignKey(config2) {
   return new ForeignKeyBuilder(mappedConfig);
 }
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/sqlite-core/unique-constraint.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/sqlite-core/unique-constraint.js
 function uniqueKeyName2(table, columns) {
   return `${table[TableName]}_${columns.join("_")}_unique`;
 }
@@ -34607,7 +34637,7 @@ class UniqueConstraint {
   }
 }
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/sqlite-core/columns/common.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/sqlite-core/columns/common.js
 class SQLiteColumnBuilder extends ColumnBuilder {
   static [entityKind] = "SQLiteColumnBuilder";
   foreignKeyConfigs = [];
@@ -34658,7 +34688,7 @@ class SQLiteColumn extends Column {
   static [entityKind] = "SQLiteColumn";
 }
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/sqlite-core/columns/blob.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/sqlite-core/columns/blob.js
 class SQLiteBigIntBuilder extends SQLiteColumnBuilder {
   static [entityKind] = "SQLiteBigIntBuilder";
   constructor(name) {
@@ -34746,7 +34776,7 @@ function blob(a, b) {
   return new SQLiteBlobBufferBuilder(name);
 }
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/sqlite-core/columns/custom.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/sqlite-core/columns/custom.js
 class SQLiteCustomColumnBuilder extends SQLiteColumnBuilder {
   static [entityKind] = "SQLiteCustomColumnBuilder";
   constructor(name, fieldConfig, customTypeParams) {
@@ -34787,7 +34817,7 @@ function customType(customTypeParams) {
   };
 }
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/sqlite-core/columns/integer.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/sqlite-core/columns/integer.js
 class SQLiteBaseIntegerBuilder extends SQLiteColumnBuilder {
   static [entityKind] = "SQLiteBaseIntegerBuilder";
   constructor(name, dataType, columnType) {
@@ -34889,7 +34919,7 @@ function integer2(a, b) {
   return new SQLiteIntegerBuilder(name);
 }
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/sqlite-core/columns/numeric.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/sqlite-core/columns/numeric.js
 class SQLiteNumericBuilder extends SQLiteColumnBuilder {
   static [entityKind] = "SQLiteNumericBuilder";
   constructor(name) {
@@ -34959,7 +34989,7 @@ function numeric(a, b) {
   return mode === "number" ? new SQLiteNumericNumberBuilder(name) : mode === "bigint" ? new SQLiteNumericBigIntBuilder(name) : new SQLiteNumericBuilder(name);
 }
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/sqlite-core/columns/real.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/sqlite-core/columns/real.js
 class SQLiteRealBuilder extends SQLiteColumnBuilder {
   static [entityKind] = "SQLiteRealBuilder";
   constructor(name) {
@@ -34980,7 +35010,7 @@ function real(name) {
   return new SQLiteRealBuilder(name ?? "");
 }
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/sqlite-core/columns/text.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/sqlite-core/columns/text.js
 class SQLiteTextBuilder extends SQLiteColumnBuilder {
   static [entityKind] = "SQLiteTextBuilder";
   constructor(name, config2) {
@@ -35035,7 +35065,7 @@ function text2(a, b = {}) {
   return new SQLiteTextBuilder(name, config2);
 }
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/sqlite-core/columns/all.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/sqlite-core/columns/all.js
 function getSQLiteColumnBuilders() {
   return {
     blob,
@@ -35047,7 +35077,7 @@ function getSQLiteColumnBuilders() {
   };
 }
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/sqlite-core/table.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/sqlite-core/table.js
 var InlineForeignKeys = Symbol.for("drizzle:SQLiteInlineForeignKeys");
 
 class SQLiteTable extends Table {
@@ -35081,7 +35111,7 @@ var sqliteTable = (name, columns, extraConfig) => {
   return sqliteTableBase(name, columns, extraConfig);
 };
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/sqlite-core/indexes.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/sqlite-core/indexes.js
 class IndexBuilderOn {
   constructor(name, unique2) {
     this.name = name;
@@ -35127,7 +35157,7 @@ function uniqueIndex(name) {
   return new IndexBuilderOn(name, true);
 }
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/sqlite-core/primary-keys.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/sqlite-core/primary-keys.js
 function primaryKey(...config2) {
   if (config2[0].columns) {
     return new PrimaryKeyBuilder(config2[0].columns, config2[0].name);
@@ -35162,7 +35192,7 @@ class PrimaryKey {
   }
 }
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/sql/expressions/conditions.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/sql/expressions/conditions.js
 function bindIfParam(value, column) {
   if (isDriverValueEncoder(column) && !isSQLWrapper(value) && !is(value, Param) && !is(value, Placeholder) && !is(value, Column) && !is(value, Table) && !is(value, View)) {
     return new Param(value, column);
@@ -35190,7 +35220,7 @@ function isNotNull(value) {
   return sql`${value} is not null`;
 }
 
-// ../../node_modules/.pnpm/drizzle-orm@0.45.3_@cloudflare+workers-types@5.20261002.1_@opentelemetry+api@1.9.1_@typ_63527d4415342e3b436227e1d40bc1bd/node_modules/drizzle-orm/sql/expressions/select.js
+// ../../node_modules/.pnpm/drizzle-orm@0.45.4_@cloudflare+workers-types@5.20261009.1_@opentelemetry+api@1.9.1_@typ_2c5bdbc2e285e95e03f6fc3b5df79b2b/node_modules/drizzle-orm/sql/expressions/select.js
 function desc(column) {
   return sql`${column} desc`;
 }
@@ -37577,30 +37607,288 @@ function writeStatusFile(path14, snapshot) {
     renameSync3(tmp, path14);
   } catch {}
 }
-// ../shared/src/community-attention.ts
+// ../shared/src/community-contract.ts
+var COMMUNITY_RESOURCE_CONTRACT_VERSION = 3;
+
+// ../shared/src/community-friend-approval.ts
+var profile = exports_external.strictObject({
+  id: exports_external.string(),
+  name: exports_external.string(),
+  discriminator: exports_external.string(),
+  image: exports_external.string().nullable(),
+  avatarVersion: exports_external.number().int().nonnegative()
+});
+var FriendApprovalPayloadSchema = exports_external.strictObject({
+  friendshipId: exports_external.string(),
+  status: exports_external.enum(["pending", "approved", "denied", "superseded", "cancelled"]),
+  waitingOn: exports_external.enum(["you", "other-owner", "addressee"]).nullable(),
+  otherProfile: profile,
+  botProfile: profile,
+  waitingOnProfile: profile.nullable().optional()
+});
+
+// ../shared/src/community-resources.ts
 var id = exports_external.string().min(1);
-var AttentionScopeSchema = exports_external.strictObject({
-  scopeId: id,
+var nullableId = id.nullable();
+var legacyArchivedSchema = exports_external.union([exports_external.boolean(), exports_external.literal(0), exports_external.literal(1)]).transform((value) => value === true || value === 1);
+var CommunityChannelResourceSchema = exports_external.strictObject({
+  id,
+  type: exports_external.enum(["text", "forum", "thread", "dm"]),
+  serverId: nullableId,
+  categoryId: nullableId,
+  name: exports_external.string().nullable(),
+  topic: exports_external.string(),
+  parentChannelId: nullableId,
+  parentMessageId: nullableId,
+  creatorId: nullableId,
+  position: exports_external.number(),
+  archived: exports_external.boolean(),
+  createdAt: exports_external.string(),
+  lastMessageAt: exports_external.string().nullable(),
+  messageCount: exports_external.number().int().nonnegative()
+});
+var CommunityChannelIdentitySchema = CommunityChannelResourceSchema.pick({
+  id: true,
+  type: true,
+  serverId: true,
+  name: true,
+  parentChannelId: true,
+  parentMessageId: true,
+  creatorId: true,
+  archived: true,
+  lastMessageAt: true,
+  createdAt: true
+}).partial({ createdAt: true }).strip();
+var legacyChannelIdentitySchema = CommunityChannelIdentitySchema.extend({
+  archived: legacyArchivedSchema,
+  parentChannelId: nullableId.default(null),
+  parentMessageId: nullableId.default(null),
+  creatorId: nullableId.default(null),
+  lastMessageAt: CommunityChannelResourceSchema.shape.lastMessageAt.default(null)
+});
+var CommunityAccessDecisionSchema = exports_external.strictObject({
   channelId: id,
-  serverId: id.nullable().optional(),
-  parentChannelId: id.nullable().optional(),
+  canRead: exports_external.boolean(),
+  canSend: exports_external.boolean(),
+  canCreateDiscussion: exports_external.boolean()
+});
+var CommunityLegacyMessageAttachmentSchema = exports_external.strictObject({
+  kind: exports_external.enum(["image", "file"]),
+  name: exports_external.string(),
+  url: exports_external.string(),
+  thumbnailUrl: exports_external.string().optional(),
+  contentType: exports_external.string().optional(),
+  size: exports_external.string().optional(),
+  sizeBytes: exports_external.number().nonnegative().optional(),
+  width: exports_external.number().nonnegative().optional(),
+  height: exports_external.number().nonnegative().optional()
+});
+var CommunityMessageAttachmentSchema = exports_external.strictObject({
+  id,
+  name: exports_external.string(),
+  url: exports_external.string(),
+  thumbnailUrl: exports_external.string().nullable(),
+  contentType: exports_external.string().nullable(),
+  sizeBytes: exports_external.number().int().nonnegative().nullable(),
+  width: exports_external.number().int().nonnegative().nullable(),
+  height: exports_external.number().int().nonnegative().nullable()
+});
+var CommunityMessagePreviewAttachmentSchema = CommunityMessageAttachmentSchema.partial().required({ name: true, url: true });
+var CommunityResourceProfileSchema = exports_external.strictObject({
+  id,
+  name: exports_external.string(),
+  discriminator: exports_external.string().min(1).nullable(),
+  avatar: exports_external.string().nullable(),
+  avatarVersion: exports_external.number().int().nonnegative(),
+  aboutMe: exports_external.string().optional(),
+  bannerColor: exports_external.string().nullable().optional(),
+  kind: exports_external.enum(["human", "bot"]).optional(),
+  ownerUserId: nullableId.optional(),
+  ownerHandle: exports_external.string().nullable().optional(),
+  mutualServers: exports_external.number().int().nonnegative().optional(),
+  ownedByViewer: exports_external.boolean().optional(),
+  statusEmoji: exports_external.string().nullable().optional(),
+  statusText: exports_external.string().nullable().optional()
+});
+var CommunityMessageThreadParticipantSchema = CommunityResourceProfileSchema.pick({ id: true, name: true, avatar: true, avatarVersion: true });
+var messageThreadSchema = exports_external.strictObject({
+  id,
+  name: CommunityChannelResourceSchema.shape.name,
+  messageCount: CommunityChannelResourceSchema.shape.messageCount,
+  lastReplyAt: CommunityChannelResourceSchema.shape.lastMessageAt.optional(),
+  tags: exports_external.array(exports_external.string()).optional(),
+  preview: exports_external.string().optional(),
+  participants: exports_external.array(CommunityMessageThreadParticipantSchema).optional(),
+  participantCount: exports_external.number().int().nonnegative().optional()
+});
+var legacyMessageThreadSchema = messageThreadSchema.extend({
+  name: exports_external.string(),
+  lastReplyAt: exports_external.string().optional(),
+  participants: exports_external.array(CommunityMessageThreadParticipantSchema.extend({ avatar: exports_external.string() })).optional()
+});
+var messageThreadPreviewSchema = messageThreadSchema.partial().required({ id: true }).extend({
+  participants: exports_external.array(CommunityMessageThreadParticipantSchema.partial().required({ id: true })).optional()
+});
+var CommunityMessageResourceSchema = exports_external.strictObject({
+  id,
+  channelId: id,
+  seq: exports_external.number().int().nonnegative(),
+  authorId: id,
+  createdAt: exports_external.string(),
+  type: exports_external.enum(["chat", "system"]),
+  content: exports_external.string(),
+  replyToId: nullableId,
+  clientNonce: exports_external.string().nullable(),
+  attachments: exports_external.array(CommunityMessageAttachmentSchema),
+  systemKind: exports_external.literal("thread").optional(),
+  authorName: exports_external.string().optional(),
+  authorAvatar: exports_external.string().nullable().optional(),
+  authorAvatarVersion: exports_external.number().int().nonnegative().optional(),
+  mentionType: exports_external.literal("everyone").nullable().optional(),
+  replyTo: exports_external.strictObject({
+    id,
+    authorId: id.optional(),
+    authorName: exports_external.string(),
+    text: exports_external.string(),
+    deleted: exports_external.boolean().optional()
+  }).optional(),
+  embeds: exports_external.array(exports_external.unknown()).optional(),
+  reactions: exports_external.array(exports_external.strictObject({
+    emoji: exports_external.string(),
+    count: exports_external.number().int().nonnegative(),
+    me: exports_external.boolean(),
+    userIds: exports_external.array(id)
+  })).optional(),
+  thread: messageThreadSchema.optional(),
+  approval: FriendApprovalPayloadSchema.optional()
+});
+var CommunityMessagePreviewSchema = CommunityMessageResourceSchema.partial().required({
+  id: true,
+  type: true
+}).extend({ attachments: exports_external.array(CommunityMessagePreviewAttachmentSchema).optional(), thread: messageThreadPreviewSchema.optional() });
+var CommunityReadStateResourceSchema = exports_external.strictObject({
+  channelId: id,
+  lastReadMessageId: nullableId,
+  lastReadAt: exports_external.string().nullable(),
+  lastReadSeq: exports_external.number().int().nonnegative()
+});
+var CommunityMemberRelationSchema = exports_external.strictObject({
+  channelId: id,
+  userId: id,
+  relation: exports_external.enum(["access", "notify"]),
+  source: exports_external.string(),
+  isCreator: exports_external.boolean(),
+  role: exports_external.string().nullable(),
+  memberId: nullableId
+});
+var CommunityPageSchema = exports_external.strictObject({
+  olderCursor: exports_external.string().nullable(),
+  newerCursor: exports_external.string().nullable(),
+  hasMoreOlder: exports_external.boolean(),
+  hasMoreNewer: exports_external.boolean(),
+  latestSeq: exports_external.number().int().nonnegative()
+});
+var envelope = { contractVersion: exports_external.literal(COMMUNITY_RESOURCE_CONTRACT_VERSION), channelId: id };
+var CommunityChannelReadSchema = exports_external.strictObject({ ...envelope, channel: CommunityChannelResourceSchema, access: CommunityAccessDecisionSchema });
+var CommunityMessagesReadSchema = exports_external.strictObject({
+  ...envelope,
+  messages: exports_external.array(CommunityMessageResourceSchema),
+  page: CommunityPageSchema,
+  surfaceReceipt: exports_external.strictObject({ channelId: id, surfaceKind: exports_external.enum(["channel", "forum", "thread", "dm"]) })
+});
+var CommunityMessagePostedSchema = CommunityMessagesReadSchema.pick({ contractVersion: true, channelId: true }).extend({
+  message: CommunityMessageResourceSchema,
+  deduped: exports_external.boolean(),
+  threadId: id.optional()
+});
+var CommunityMessageReadSchema = CommunityMessagePostedSchema.omit({ deduped: true, threadId: true });
+var CommunityReadStateReadSchema = exports_external.strictObject({ ...envelope, readState: CommunityReadStateResourceSchema });
+var CommunityMembersReadSchema = exports_external.strictObject({ ...envelope, relation: exports_external.enum(["access", "notify"]), members: exports_external.array(CommunityMemberRelationSchema), profiles: exports_external.array(CommunityResourceProfileSchema) });
+var CommunityThreadsReadSchema = exports_external.strictObject({
+  ...envelope,
+  channel: CommunityChannelResourceSchema,
+  threads: exports_external.array(CommunityChannelResourceSchema),
+  included: exports_external.strictObject({
+    messages: exports_external.array(CommunityMessageResourceSchema),
+    members: exports_external.array(CommunityMemberRelationSchema),
+    profiles: exports_external.array(CommunityResourceProfileSchema),
+    tags: exports_external.array(exports_external.strictObject({ messageId: id, tag: exports_external.string() })),
+    participantCounts: exports_external.array(exports_external.strictObject({ channelId: id, count: exports_external.number().int().nonnegative() }))
+  }),
+  page: exports_external.strictObject({ nextCursor: exports_external.string().nullable(), hasMore: exports_external.boolean() })
+});
+var CommunityReadAdvanceSchema = exports_external.strictObject({ ...envelope, changed: exports_external.boolean(), targetSeq: exports_external.number().int().nonnegative(), revision: exports_external.number().int().nonnegative() });
+var CommunityReadErrorSchema = exports_external.strictObject({ contractVersion: exports_external.literal(COMMUNITY_RESOURCE_CONTRACT_VERSION), error: exports_external.strictObject({
+  code: exports_external.enum(["invalid_input", "invalid_reply_target", "unauthenticated", "not_found", "not_allowed", "blocked", "idempotency_conflict", "rate_limited", "temporarily_unavailable"]),
+  message: exports_external.string(),
+  retryable: exports_external.boolean()
+}) });
+var legacyProfileSchema = CommunityResourceProfileSchema.pick({
+  id: true,
+  name: true,
+  avatar: true,
+  avatarVersion: true
+}).extend({ discriminator: exports_external.string().nullable(), statusEmoji: exports_external.string().nullable(), statusText: exports_external.string() });
+var CommunityLegacyMessageResourceSchema = CommunityMessageResourceSchema.extend({ authorAvatar: exports_external.string().optional(), attachments: exports_external.array(CommunityLegacyMessageAttachmentSchema), thread: legacyMessageThreadSchema.optional() });
+var legacyEnvelope = { contractVersion: exports_external.literal(2), channelId: id };
+var legacyReadSchemas = {
+  channel: CommunityChannelReadSchema.extend(legacyEnvelope),
+  messages: CommunityMessagesReadSchema.extend({ ...legacyEnvelope, messages: exports_external.array(CommunityLegacyMessageResourceSchema) }),
+  readState: CommunityReadStateReadSchema.extend(legacyEnvelope),
+  members: CommunityMembersReadSchema.extend({ ...legacyEnvelope, profiles: exports_external.array(legacyProfileSchema) }),
+  threads: CommunityThreadsReadSchema.extend({ ...legacyEnvelope, included: CommunityThreadsReadSchema.shape.included.extend({
+    messages: exports_external.array(CommunityLegacyMessageResourceSchema),
+    profiles: exports_external.array(legacyProfileSchema)
+  }) }),
+  readAdvance: CommunityReadAdvanceSchema.extend(legacyEnvelope),
+  error: CommunityReadErrorSchema.extend({ contractVersion: exports_external.literal(2) })
+};
+var legacyChannelResourcePreviewSchema = CommunityChannelResourceSchema.partial().strip().extend({
+  archived: legacyArchivedSchema.optional()
+});
+var legacyChannelResourceSchema = CommunityChannelResourceSchema.strip().extend({
+  topic: CommunityChannelResourceSchema.shape.topic.nullish().transform((value) => value ?? ""),
+  position: CommunityChannelResourceSchema.shape.position.nullish().transform((value) => value ?? 0),
+  messageCount: CommunityChannelResourceSchema.shape.messageCount.nullish().transform((value) => value ?? 0),
+  categoryId: nullableId.default(null),
+  parentChannelId: nullableId.default(null),
+  parentMessageId: nullableId.default(null),
+  creatorId: nullableId.default(null),
+  lastMessageAt: CommunityChannelResourceSchema.shape.lastMessageAt.default(null),
+  archived: legacyArchivedSchema
+});
+var legacyMessageResourceSchema = CommunityLegacyMessageResourceSchema.strip().extend({
+  channelId: id.optional(),
+  replyToId: nullableId.optional(),
+  clientNonce: CommunityMessageResourceSchema.shape.clientNonce.default(null),
+  attachments: CommunityLegacyMessageResourceSchema.shape.attachments.default([]),
+  embeds: CommunityMessageResourceSchema.shape.embeds.nullable().transform((value) => value ?? undefined)
+});
+
+// ../shared/src/community-attention.ts
+var id2 = exports_external.string().min(1);
+var AttentionScopeSchema = exports_external.strictObject({
+  scopeId: id2,
+  channelId: id2,
+  serverId: id2.nullable().optional(),
+  parentChannelId: id2.nullable().optional(),
   ordinaryUnread: exports_external.boolean(),
   lastUnreadSeq: exports_external.number().int().nonnegative(),
   lastAttentionSeq: exports_external.number().int().nonnegative().nullable().optional(),
   attentionCount: exports_external.number().int().nonnegative()
 });
 var AttentionItemSchema = exports_external.strictObject({
-  id,
+  id: id2,
   kind: exports_external.enum(["mention", "reply", "friend_request", "forum_post"]),
-  sourceId: id,
-  scopeId: id.nullable().optional(),
-  messageId: id.nullable().optional(),
-  actorUserId: id.nullable().optional(),
+  sourceId: id2,
+  scopeId: id2.nullable().optional(),
+  messageId: id2.nullable().optional(),
+  actorUserId: id2.nullable().optional(),
   createdAt: exports_external.string(),
-  childChannelId: id.optional(),
+  childChannelId: id2.optional(),
   openerSeq: exports_external.number().int().nonnegative().optional(),
   readTarget: exports_external.strictObject({
-    channelId: id,
+    channelId: id2,
     seq: exports_external.number().int().nonnegative()
   }).optional()
 }).superRefine((item, ctx) => {
@@ -37630,26 +37918,30 @@ var AttentionItemSchema = exports_external.strictObject({
   }
 });
 var AttentionIncludedServerSchema = exports_external.strictObject({
-  id,
+  id: id2,
   name: exports_external.string(),
   discriminator: exports_external.string()
 });
-var AttentionIncludedChannelSchema = exports_external.strictObject({
-  id,
-  serverId: id,
-  name: exports_external.string(),
-  type: exports_external.enum(["text", "forum", "thread"]),
-  parentChannelId: id.nullable(),
-  parentMessageId: id.nullable(),
-  creatorId: id.nullable(),
-  archived: exports_external.boolean(),
-  lastMessageAt: exports_external.string().nullable(),
+var AttentionIncludedChannelSchema = CommunityChannelResourceSchema.pick({
+  id: true,
+  serverId: true,
+  name: true,
+  type: true,
+  parentChannelId: true,
+  parentMessageId: true,
+  creatorId: true,
+  archived: true,
+  lastMessageAt: true
+}).extend({
+  serverId: CommunityChannelResourceSchema.shape.serverId.unwrap(),
+  name: CommunityChannelResourceSchema.shape.name.unwrap(),
+  type: CommunityChannelResourceSchema.shape.type.extract(["text", "forum", "thread"]),
   openerSeq: exports_external.number().int().nonnegative().optional(),
   openerUnread: exports_external.boolean().optional()
 });
 var AttentionIncludedDmSchema = exports_external.strictObject({
-  id,
-  userId: id,
+  id: id2,
+  userId: id2,
   name: exports_external.string(),
   discriminator: exports_external.string(),
   avatar: exports_external.string(),
@@ -37658,22 +37950,21 @@ var AttentionIncludedDmSchema = exports_external.strictObject({
   lastUnreadSeq: exports_external.number().int().nonnegative()
 });
 var AttentionIncludedProfileSchema = exports_external.strictObject({
-  userId: id,
-  name: exports_external.string(),
+  userId: CommunityResourceProfileSchema.shape.id,
+  ...CommunityResourceProfileSchema.pick({ name: true, discriminator: true, avatar: true, avatarVersion: true }).shape,
   discriminator: exports_external.string(),
-  avatar: exports_external.string(),
-  avatarVersion: exports_external.number().int().nonnegative()
-});
-var AttentionIncludedMessageSchema = exports_external.strictObject({
-  id,
-  channelId: id,
-  type: exports_external.enum(["chat", "system"]),
-  authorId: id.optional(),
-  authorName: exports_external.string().optional(),
-  seq: exports_external.number().int().nonnegative(),
-  createdAt: exports_external.string(),
-  content: exports_external.string()
+  avatar: exports_external.string()
 });
+var AttentionIncludedMessageSchema = CommunityMessagePreviewSchema.pick({
+  id: true,
+  channelId: true,
+  type: true,
+  authorId: true,
+  authorName: true,
+  seq: true,
+  createdAt: true,
+  content: true
+}).required({ channelId: true, seq: true, createdAt: true, content: true });
 var AttentionIncludedSchema = exports_external.strictObject({
   servers: exports_external.array(AttentionIncludedServerSchema),
   channels: exports_external.array(AttentionIncludedChannelSchema),
@@ -37699,7 +37990,7 @@ var AccountAttentionSnapshotSchema = exports_external.strictObject({
   const serverById = new Map(snapshot.included.servers.map((server) => [server.id, server]));
   const channelById = new Map(snapshot.included.channels.map((channel2) => [channel2.id, channel2]));
   const dmById = new Map(snapshot.included.dms.map((dm) => [dm.id, dm]));
-  const profileById = new Map(snapshot.included.profiles.map((profile) => [profile.userId, profile]));
+  const profileById = new Map(snapshot.included.profiles.map((profile2) => [profile2.userId, profile2]));
   const messageById = new Map(snapshot.included.messages.map((message2) => [message2.id, message2]));
   const rejectDuplicates = (values, kind) => {
     const seen = new Set;
@@ -37712,7 +38003,7 @@ var AccountAttentionSnapshotSchema = exports_external.strictObject({
   rejectDuplicates(snapshot.included.servers.map((server) => server.id), "server");
   rejectDuplicates(snapshot.included.channels.map((channel2) => channel2.id), "channel");
   rejectDuplicates(snapshot.included.dms.map((dm) => dm.id), "dm");
-  rejectDuplicates(snapshot.included.profiles.map((profile) => profile.userId), "profile");
+  rejectDuplicates(snapshot.included.profiles.map((profile2) => profile2.userId), "profile");
   rejectDuplicates(snapshot.included.messages.map((message2) => message2.id), "message");
   for (const scope of snapshot.scopes) {
     if (scope.serverId) {
@@ -38523,15 +38814,15 @@ var CommunityMachineRuntimeListSchema = exports_external.array(CommunityMachineR
 var CommunityRunningAgentListSchema = exports_external.array(exports_external.string()).transform((list) => {
   const seen = new Set;
   const out = [];
-  for (const id2 of list) {
-    if (seen.has(id2))
+  for (const id3 of list) {
+    if (seen.has(id3))
       continue;
-    seen.add(id2);
-    out.push(id2);
+    seen.add(id3);
+    out.push(id3);
   }
   return out;
 });
-var CommunityMachineSummarySchema = exports_external.object({
+var CommunityMachineSummarySchema = exports_external.strictObject({
   id: exports_external.string(),
   hostname: exports_external.string(),
   displayName: exports_external.string(),
@@ -38541,8 +38832,8 @@ var CommunityMachineSummarySchema = exports_external.object({
   daemonVersion: exports_external.string(),
   lastSeenAt: exports_external.string().nullable(),
   status: exports_external.enum(["online", "offline"]),
-  availableRuntimes: exports_external.array(CommunityMachineRuntimeSchema).default([]),
-  lastRuntimeError: exports_external.object({
+  availableRuntimes: exports_external.array(CommunityMachineRuntimeSchema.strict()),
+  lastRuntimeError: exports_external.strictObject({
     requested: exports_external.string(),
     available: exports_external.array(exports_external.string()),
     at: exports_external.string()
@@ -39482,203 +39773,6 @@ var AGENT_UNREAD_CHANNEL_CHUNK_SIZE = maxInParams(13);
 
 // ../shared/src/db/queries/community/mention.ts
 var MENTION_INSERT_MAX_ROWS = maxRowsPerInsert(5);
-// ../shared/src/community-friend-approval.ts
-var profile = exports_external.strictObject({
-  id: exports_external.string(),
-  name: exports_external.string(),
-  discriminator: exports_external.string(),
-  image: exports_external.string().nullable(),
-  avatarVersion: exports_external.number().int().nonnegative()
-});
-var FriendApprovalPayloadSchema = exports_external.strictObject({
-  friendshipId: exports_external.string(),
-  status: exports_external.enum(["pending", "approved", "denied", "superseded", "cancelled"]),
-  waitingOn: exports_external.enum(["you", "other-owner", "addressee"]).nullable(),
-  otherProfile: profile,
-  botProfile: profile,
-  waitingOnProfile: profile.nullable().optional()
-});
-
-// ../shared/src/community-contract.ts
-var COMMUNITY_CONTRACT_VERSION = 2;
-
-// ../shared/src/community-resources.ts
-var id2 = exports_external.string().min(1);
-var nullableId = id2.nullable();
-var legacyArchivedSchema = exports_external.union([exports_external.boolean(), exports_external.literal(0), exports_external.literal(1)]).transform((value) => value === true || value === 1);
-var CommunityChannelResourceSchema = exports_external.strictObject({
-  id: id2,
-  type: exports_external.enum(["text", "forum", "thread", "dm"]),
-  serverId: nullableId,
-  categoryId: nullableId,
-  name: exports_external.string().nullable(),
-  topic: exports_external.string(),
-  parentChannelId: nullableId,
-  parentMessageId: nullableId,
-  creatorId: nullableId,
-  position: exports_external.number(),
-  archived: exports_external.boolean(),
-  createdAt: exports_external.string(),
-  lastMessageAt: exports_external.string().nullable(),
-  messageCount: exports_external.number().int().nonnegative()
-});
-var CommunityChannelIdentitySchema = CommunityChannelResourceSchema.pick({
-  id: true,
-  type: true,
-  serverId: true,
-  name: true,
-  parentChannelId: true,
-  parentMessageId: true,
-  creatorId: true,
-  archived: true,
-  lastMessageAt: true,
-  createdAt: true
-}).partial({ createdAt: true }).strip();
-var legacyChannelIdentitySchema = CommunityChannelIdentitySchema.extend({
-  archived: legacyArchivedSchema,
-  parentChannelId: nullableId.default(null),
-  parentMessageId: nullableId.default(null),
-  creatorId: nullableId.default(null),
-  lastMessageAt: CommunityChannelResourceSchema.shape.lastMessageAt.default(null)
-});
-var CommunityAccessDecisionSchema = exports_external.strictObject({
-  channelId: id2,
-  canRead: exports_external.boolean(),
-  canSend: exports_external.boolean(),
-  canCreateDiscussion: exports_external.boolean()
-});
-var CommunityMessageAttachmentSchema = exports_external.strictObject({
-  kind: exports_external.enum(["image", "file"]),
-  name: exports_external.string(),
-  url: exports_external.string(),
-  thumbnailUrl: exports_external.string().optional(),
-  contentType: exports_external.string().optional(),
-  size: exports_external.string().optional(),
-  sizeBytes: exports_external.number().nonnegative().optional(),
-  width: exports_external.number().nonnegative().optional(),
-  height: exports_external.number().nonnegative().optional()
-});
-var CommunityMessageResourceSchema = exports_external.strictObject({
-  id: id2,
-  channelId: id2,
-  seq: exports_external.number().int().nonnegative(),
-  authorId: id2,
-  createdAt: exports_external.string(),
-  type: exports_external.enum(["chat", "system"]),
-  content: exports_external.string(),
-  replyToId: nullableId,
-  clientNonce: exports_external.string().nullable(),
-  attachments: exports_external.array(CommunityMessageAttachmentSchema),
-  systemKind: exports_external.literal("thread").optional(),
-  authorName: exports_external.string().optional(),
-  authorAvatar: exports_external.string().optional(),
-  authorAvatarVersion: exports_external.number().int().nonnegative().optional(),
-  mentionType: exports_external.literal("everyone").nullable().optional(),
-  replyTo: exports_external.strictObject({
-    id: id2,
-    authorId: id2.optional(),
-    authorName: exports_external.string(),
-    text: exports_external.string(),
-    deleted: exports_external.boolean().optional()
-  }).optional(),
-  embeds: exports_external.array(exports_external.unknown()).optional(),
-  reactions: exports_external.array(exports_external.strictObject({
-    emoji: exports_external.string(),
-    count: exports_external.number().int().nonnegative(),
-    me: exports_external.boolean(),
-    userIds: exports_external.array(id2)
-  })).optional(),
-  thread: exports_external.strictObject({
-    id: id2,
-    name: exports_external.string(),
-    messageCount: exports_external.number().int().nonnegative(),
-    lastReplyAt: exports_external.string().optional(),
-    tags: exports_external.array(exports_external.string()).optional(),
-    preview: exports_external.string().optional(),
-    participants: exports_external.array(exports_external.strictObject({ id: id2, name: exports_external.string(), avatar: exports_external.string(), avatarVersion: exports_external.number().int().nonnegative() })).optional(),
-    participantCount: exports_external.number().int().nonnegative().optional()
-  }).optional(),
-  approval: FriendApprovalPayloadSchema.optional()
-});
-var CommunityReadStateResourceSchema = exports_external.strictObject({
-  channelId: id2,
-  lastReadMessageId: nullableId,
-  lastReadAt: exports_external.string().nullable(),
-  lastReadSeq: exports_external.number().int().nonnegative()
-});
-var CommunityMemberRelationSchema = exports_external.strictObject({
-  channelId: id2,
-  userId: id2,
-  relation: exports_external.enum(["access", "notify"]),
-  source: exports_external.string(),
-  isCreator: exports_external.boolean(),
-  role: exports_external.string().nullable(),
-  memberId: nullableId
-});
-var CommunityResourceProfileSchema = exports_external.strictObject({
-  id: id2,
-  name: exports_external.string(),
-  discriminator: exports_external.string().nullable(),
-  avatar: exports_external.string().nullable(),
-  avatarVersion: exports_external.number().int().nonnegative(),
-  statusEmoji: exports_external.string().nullable(),
-  statusText: exports_external.string()
-});
-var CommunityPageSchema = exports_external.strictObject({
-  olderCursor: exports_external.string().nullable(),
-  newerCursor: exports_external.string().nullable(),
-  hasMoreOlder: exports_external.boolean(),
-  hasMoreNewer: exports_external.boolean(),
-  latestSeq: exports_external.number().int().nonnegative()
-});
-var envelope = { contractVersion: exports_external.literal(COMMUNITY_CONTRACT_VERSION), channelId: id2 };
-var CommunityChannelReadSchema = exports_external.strictObject({ ...envelope, channel: CommunityChannelResourceSchema, access: CommunityAccessDecisionSchema });
-var CommunityMessagesReadSchema = exports_external.strictObject({
-  ...envelope,
-  messages: exports_external.array(CommunityMessageResourceSchema),
-  page: CommunityPageSchema,
-  surfaceReceipt: exports_external.strictObject({ channelId: id2, surfaceKind: exports_external.enum(["channel", "forum", "thread", "dm"]) })
-});
-var CommunityReadStateReadSchema = exports_external.strictObject({ ...envelope, readState: CommunityReadStateResourceSchema });
-var CommunityMembersReadSchema = exports_external.strictObject({ ...envelope, relation: exports_external.enum(["access", "notify"]), members: exports_external.array(CommunityMemberRelationSchema), profiles: exports_external.array(CommunityResourceProfileSchema) });
-var CommunityThreadsReadSchema = exports_external.strictObject({
-  ...envelope,
-  channel: CommunityChannelResourceSchema,
-  threads: exports_external.array(CommunityChannelResourceSchema),
-  included: exports_external.strictObject({
-    messages: exports_external.array(CommunityMessageResourceSchema),
-    members: exports_external.array(CommunityMemberRelationSchema),
-    profiles: exports_external.array(CommunityResourceProfileSchema),
-    tags: exports_external.array(exports_external.strictObject({ messageId: id2, tag: exports_external.string() })),
-    participantCounts: exports_external.array(exports_external.strictObject({ channelId: id2, count: exports_external.number().int().nonnegative() }))
-  }),
-  page: exports_external.strictObject({ nextCursor: exports_external.string().nullable(), hasMore: exports_external.boolean() })
-});
-var CommunityReadAdvanceSchema = exports_external.strictObject({ ...envelope, changed: exports_external.boolean(), targetSeq: exports_external.number().int().nonnegative(), revision: exports_external.number().int().nonnegative() });
-var CommunityReadErrorSchema = exports_external.strictObject({ contractVersion: exports_external.literal(COMMUNITY_CONTRACT_VERSION), error: exports_external.strictObject({
-  code: exports_external.enum(["invalid_input", "invalid_reply_target", "unauthenticated", "not_found", "not_allowed", "blocked", "idempotency_conflict", "rate_limited", "temporarily_unavailable"]),
-  message: exports_external.string(),
-  retryable: exports_external.boolean()
-}) });
-var legacyChannelResourceSchema = CommunityChannelResourceSchema.strip().extend({
-  topic: CommunityChannelResourceSchema.shape.topic.nullish().transform((value) => value ?? ""),
-  position: CommunityChannelResourceSchema.shape.position.nullish().transform((value) => value ?? 0),
-  messageCount: CommunityChannelResourceSchema.shape.messageCount.nullish().transform((value) => value ?? 0),
-  categoryId: nullableId.default(null),
-  parentChannelId: nullableId.default(null),
-  parentMessageId: nullableId.default(null),
-  creatorId: nullableId.default(null),
-  lastMessageAt: CommunityChannelResourceSchema.shape.lastMessageAt.default(null),
-  archived: legacyArchivedSchema
-});
-var legacyMessageResourceSchema = CommunityMessageResourceSchema.strip().extend({
-  channelId: id2.optional(),
-  replyToId: nullableId.optional(),
-  clientNonce: CommunityMessageResourceSchema.shape.clientNonce.default(null),
-  attachments: CommunityMessageResourceSchema.shape.attachments.default([]),
-  embeds: CommunityMessageResourceSchema.shape.embeds.nullable().transform((value) => value ?? undefined)
-});
-
 // ../shared/src/community-ws-events.ts
 var string4 = exports_external.string();
 var nullableString = string4.nullable();
@@ -39708,6 +39802,7 @@ var messageSchema = CommunityMessageResourceSchema.pick({
   seq: exports_external.number(),
   authorId: string4,
   authorName: string4,
+  authorAvatar: string4.optional(),
   authorAvatarVersion: CommunityMessageResourceSchema.shape.authorAvatarVersion.unwrap(),
   replyToId: nullableString.optional(),
   replyTo: CommunityMessageResourceSchema.shape.replyTo.unwrap().extend({
@@ -39717,7 +39812,7 @@ var messageSchema = CommunityMessageResourceSchema.pick({
   attachments: exports_external.array(messageAttachmentSchema).optional(),
   clientNonce: string4.optional()
 });
-var communityMessageCreateSchema = exports_external.strictObject({
+var CommunityLegacyMessageCreateSchema = exports_external.strictObject({
   type: exports_external.literal("community:message.create"),
   channelId: string4,
   serverId: string4.optional(),
@@ -40029,29 +40124,9 @@ var communityProfileUpdateSchema = exports_external.strictObject({
   kind: exports_external.enum(["human", "bot"]),
   ownerUserId: nullableString
 });
-var machineRuntimeSchema = CommunityMachineRuntimeSchema.strict();
-var CommunityMachineSummarySchema2 = exports_external.strictObject({
-  id: string4,
-  hostname: string4,
-  displayName: string4,
-  platform: string4,
-  arch: string4,
-  osRelease: string4,
-  daemonVersion: string4,
-  lastSeenAt: nullableString,
-  status: exports_external.enum(["online", "offline"]),
-  availableRuntimes: exports_external.array(machineRuntimeSchema),
-  lastRuntimeError: exports_external.strictObject({
-    requested: string4,
-    available: exports_external.array(string4),
-    at: string4
-  }).optional(),
-  createdAt: string4,
-  updatedAt: string4
-});
 var communityMachineCreatedSchema = exports_external.strictObject({
   type: exports_external.literal("community:machine.created"),
-  machine: CommunityMachineSummarySchema2,
+  machine: CommunityMachineSummarySchema,
   tokenId: string4
 });
 var communityMachineStatusSchema = exports_external.strictObject({
@@ -40062,7 +40137,7 @@ var communityMachineStatusSchema = exports_external.strictObject({
 });
 var communityMachineUpdatedSchema = exports_external.strictObject({
   type: exports_external.literal("community:machine.updated"),
-  machine: CommunityMachineSummarySchema2
+  machine: CommunityMachineSummarySchema
 });
 var communityMachineRemovedSchema = exports_external.strictObject({
   type: exports_external.literal("community:machine.removed"),
@@ -40078,8 +40153,7 @@ var communityBotAuditEventSchema = exports_external.strictObject({
   launchId: nullableString.optional(),
   createdAt: string4
 }).refine((event) => Object.prototype.hasOwnProperty.call(event, "payload"));
-var CommunityWsEventDiscriminatedSchema = exports_external.discriminatedUnion("type", [
-  communityMessageCreateSchema,
+var commonCommunityEventSchemas = [
   communityMessageUpdatedSchema,
   communityMessageEditedSchema,
   communityReactionAddSchema,
@@ -40088,12 +40162,8 @@ var CommunityWsEventDiscriminatedSchema = exports_external.discriminatedUnion("t
   communityPinRemoveSchema,
   communityTypingStartSchema,
   communityTypingStopSchema,
-  communityChildChannelCreateSchema,
-  communityChildChannelUpdateSchema,
   communityServerUpdateSchema,
   communityServerDeleteSchema,
-  communityChannelCreateSchema,
-  communityChannelUpdateSchema,
   communityChannelDeleteSchema,
   communityChannelReorderSchema,
   communityChannelMemberAddSchema,
@@ -40118,15 +40188,34 @@ var CommunityWsEventDiscriminatedSchema = exports_external.discriminatedUnion("t
   communityInboxChangedSchema,
   communityPresenceUpdateSchema,
   communityStatusUpdateSchema,
-  communityIdentityUpdateSchema,
-  communityProfileUpdateSchema,
   communityMachineCreatedSchema,
   communityMachineStatusSchema,
   communityMachineUpdatedSchema,
   communityMachineRemovedSchema,
   communityBotAuditEventSchema
+];
+var CommunityWsEventDiscriminatedSchema = exports_external.discriminatedUnion("type", [
+  ...commonCommunityEventSchemas,
+  CommunityLegacyMessageCreateSchema,
+  communityChildChannelCreateSchema,
+  communityChannelCreateSchema,
+  communityChildChannelUpdateSchema,
+  communityChannelUpdateSchema,
+  communityIdentityUpdateSchema,
+  communityProfileUpdateSchema
+]);
+var CommunityResourceWsEventDiscriminatedSchema = exports_external.discriminatedUnion("type", [
+  ...commonCommunityEventSchemas,
+  CommunityLegacyMessageCreateSchema.extend({ message: CommunityMessageResourceSchema.required({ authorName: true, authorAvatarVersion: true }) }).refine((event) => event.message.channelId === event.channelId),
+  communityChildChannelCreateSchema.extend({ channel: CommunityChannelResourceSchema.extend({ type: exports_external.literal("thread") }) }).refine((event) => event.channel.parentChannelId === event.parentChannelId && (event.parentMessageId === undefined || event.parentMessageId === event.channel.parentMessageId)),
+  communityChannelCreateSchema.extend({ channel: CommunityChannelResourceSchema.extend({ type: channelTypeSchema }) }).refine((event) => event.channel.serverId === event.serverId),
+  communityChildChannelUpdateSchema.extend({ changes: CommunityChannelResourceSchema.pick({ name: true, archived: true, lastMessageAt: true, messageCount: true }).partial().extend({ tags: exports_external.array(string4).nullable().optional() }) }),
+  communityChannelUpdateSchema.extend({ changes: CommunityChannelResourceSchema.pick({ name: true, topic: true, categoryId: true, type: true }).partial().extend({ type: channelTypeSchema.optional() }) }),
+  communityIdentityUpdateSchema.extend({ avatar: CommunityResourceProfileSchema.shape.avatar, avatarVersion: CommunityResourceProfileSchema.shape.avatarVersion.refine((version3) => version3 > 0) }),
+  CommunityResourceProfileSchema.pick({ name: true, discriminator: true, aboutMe: true, bannerColor: true, kind: true, ownerUserId: true }).required().extend({ type: exports_external.literal("community:profile.update"), userId: string4 })
 ]);
 var CommunityWsEventSchema = CommunityWsEventDiscriminatedSchema.transform((event) => event);
+var CommunityResourceWsEventSchema = CommunityResourceWsEventDiscriminatedSchema.transform((event) => event);
 var WS_EVENTS = {
   MESSAGE_CREATE: "community:message.create",
   MESSAGE_UPDATED: "community:message.updated",
@@ -40210,6 +40299,7 @@ var memberAddedSchema = exports_external.strictObject({
   channelId: exports_external.string().min(1)
 });
 var batchShape = exports_external.strictObject({
+  communityContract: exports_external.literal(3).optional(),
   messageId: exports_external.string().min(1),
   messageEvent: exports_external.unknown(),
   contentUserIds: targetList,