@desplega.ai/agent-swarm 1.145.0 → 1.147.0

package/src/commands/templates.ts

@@ -133,7 +133,7 @@ registerTemplate({
 
 **RESUMED TASK** - This task was interrupted during a deployment and is being resumed.
 
-Task: "{{task_description}}"
+Task: "{{task_description}}"{{attachments_section}}
 
 Previous Progress:
 {{progress}}
@@ -143,6 +143,7 @@ Continue from where you left off. Review the progress above and complete the rem
     { name: "work_on_task_cmd", description: "Formatted /work-on-task command" },
     { name: "task_id", description: "Task ID" },
     { name: "task_description", description: "Original task description" },
+    { name: "attachments_section", description: "Task attachment fetch recipes" },
     { name: "progress", description: "Previous progress text" },
     {
       name: "completion_instructions",
@@ -159,13 +160,14 @@ registerTemplate({
 
 **RESUMED TASK** - This task was interrupted during a deployment and is being resumed.
 
-Task: "{{task_description}}"
+Task: "{{task_description}}"{{attachments_section}}
 
 No progress was saved before the interruption. Start the task fresh but be aware files may have been partially modified.{{completion_instructions}}`,
   variables: [
     { name: "work_on_task_cmd", description: "Formatted /work-on-task command" },
     { name: "task_id", description: "Task ID" },
     { name: "task_description", description: "Original task description" },
+    { name: "attachments_section", description: "Task attachment fetch recipes" },
     {
       name: "completion_instructions",
       description: "Completion instructions (empty for providers without MCP)",
@@ -173,3 +175,24 @@ No progress was saved before the interruption. Start the task fresh but be aware
   ],
   category: "task_lifecycle",
 });
+
+registerTemplate({
+  eventType: "task.output.schema",
+  header: "",
+  defaultBody: `\n\n**Required Output Format**: When completing this task, you MUST call store-progress with output that is valid JSON conforming to this schema:
+\`\`\`json
+{{schema}}
+\`\`\`
+Call store-progress with status "completed" and your JSON output. If your output doesn't match the schema, the tool call will fail and you should fix and retry.`,
+  variables: [{ name: "schema", description: "Required output JSON schema" }],
+  category: "task_lifecycle",
+});
+
+registerTemplate({
+  eventType: "task.output.generic",
+  header: "",
+  defaultBody:
+    '\n\nWhen done, use `store-progress` with status: "completed" and include your output.',
+  variables: [],
+  category: "task_lifecycle",
+});

package/src/hooks/hook.ts

@@ -9,9 +9,12 @@ import {
   postRatings,
   type RetrievalRow,
 } from "../be/memory/raters/llm";
+import { materializeClaudeMd, stopClaudeMd } from "../commands/claude-md-session";
 import {
   buildIndependentIdentityPayloads,
   contentSha256,
+  fetchWithSyncTimeout,
+  type ProfilePayload,
   readIdentityBaselines,
   warnProfileFileTooLarge,
 } from "../commands/profile-sync";
@@ -24,10 +27,6 @@ import { checkToolLoop, clearToolHistory } from "./tool-loop-detection";
 
 const SERVER_NAME = pkg.config?.name ?? "agent-swarm";
 
-// CLAUDE.md file paths
-const CLAUDE_MD_PATH = `${process.env.HOME}/.claude/CLAUDE.md`;
-const CLAUDE_MD_BACKUP_PATH = `${process.env.HOME}/.claude/CLAUDE.md.bak`;
-
 // Identity and workspace file paths
 const SOUL_MD_PATH = "/workspace/SOUL.md";
 const IDENTITY_MD_PATH = "/workspace/IDENTITY.md";
@@ -120,7 +119,7 @@ export async function postHookProfileUpdate({
 }: {
   url: string;
   headers: Record<string, string>;
-  body: Record<string, string>;
+  body: ProfilePayload["body"];
   label: string;
   fetchImpl?: typeof fetch;
 }): Promise<void> {
@@ -204,47 +203,6 @@ async function fetchTaskDetails(
   }
 }
 
-/**
- * Backup existing CLAUDE.md file if it exists
- */
-async function backupExistingClaudeMd(): Promise<void> {
-  const file = Bun.file(CLAUDE_MD_PATH);
-  if (await file.exists()) {
-    const content = await file.text();
-    await Bun.write(CLAUDE_MD_BACKUP_PATH, content);
-  }
-}
-
-/**
- * Write agent's CLAUDE.md content to ~/.claude/CLAUDE.md
- */
-async function writeAgentClaudeMd(content: string): Promise<void> {
-  // Ensure ~/.claude directory exists
-  const dir = `${process.env.HOME}/.claude`;
-  try {
-    await Bun.$`mkdir -p ${dir}`.quiet();
-  } catch {
-    // Directory may already exist
-  }
-  await Bun.write(CLAUDE_MD_PATH, content);
-}
-
-/**
- * Restore CLAUDE.md from backup or remove it if no backup exists
- */
-async function restoreClaudeMdBackup(): Promise<void> {
-  const backupFile = Bun.file(CLAUDE_MD_BACKUP_PATH);
-  if (await backupFile.exists()) {
-    const content = await backupFile.text();
-    await Bun.write(CLAUDE_MD_PATH, content);
-    // Remove backup file
-    await Bun.$`rm -f ${CLAUDE_MD_BACKUP_PATH}`.quiet();
-  } else {
-    // No backup existed, remove the agent's CLAUDE.md
-    await Bun.$`rm -f ${CLAUDE_MD_PATH}`.quiet();
-  }
-}
-
 /**
  * Resolve task context for the Stop-hook session-summary / memory-rater
  * piggyback. Prefers the AGENT_SWARM_TASK_ID env var (set by the harness in
@@ -663,22 +621,21 @@ export async function handleHook(): Promise<void> {
   };
 
   /**
-   * Sync CLAUDE.md content back to the server
+   * Stop's CLAUDE.md step: sync an agent's edit (never content a hook wrote, and
+   * as a compare-and-set against its base), then restore the `.bak` — all under
+   * the CLAUDE.md lock (see `claude-md-session.ts`). The POST is bounded
+   * (CLAUDE_MD_SYNC_TIMEOUT_MS) so the lock is never held for long.
    */
-  const syncClaudeMdToServer = async (agentId: string): Promise<void> => {
-    if (!mcpConfig) return;
-
-    const file = Bun.file(CLAUDE_MD_PATH);
-    if (!(await file.exists())) return;
-
-    const content = await file.text();
-
-    if (!content.trim()) return;
-    await postHookProfileUpdate({
-      url: `${getBaseUrl()}/api/agents/${agentId}/profile`,
-      headers: mcpConfig.headers,
-      body: { claudeMd: content, changeSource: "session_sync" },
-      label: "claudeMd",
+  const syncAndRestoreClaudeMd = async (agentId: string): Promise<void> => {
+    await stopClaudeMd(async (body) => {
+      if (!mcpConfig) return;
+      await postHookProfileUpdate({
+        url: `${getBaseUrl()}/api/agents/${agentId}/profile`,
+        headers: mcpConfig.headers,
+        body,
+        label: "claudeMd",
+        fetchImpl: fetchWithSyncTimeout(),
+      });
     });
   };
 
@@ -1055,9 +1012,12 @@ export async function handleHook(): Promise<void> {
       // Write agent's CLAUDE.md if available
       if (agentInfo.claudeMd) {
         try {
-          await backupExistingClaudeMd();
-          await writeAgentClaudeMd(agentInfo.claudeMd);
-          console.log("Loaded your personal CLAUDE.md configuration.");
+          const outcome = await materializeClaudeMd(agentInfo.claudeMd);
+          console.log(
+            outcome === "busy" || outcome === "error"
+              ? "CLAUDE.md is being updated by another session; keeping the current copy."
+              : "Loaded your personal CLAUDE.md configuration.",
+          );
         } catch (error) {
           console.log(`Warning: Could not load CLAUDE.md: ${(error as Error).message}`);
         }
@@ -1334,13 +1294,12 @@ export async function handleHook(): Promise<void> {
         // PM2 not available or no processes - silently ignore
       }
 
-      // Sync CLAUDE.md, identity files, and setup script back to database, then restore backup
+      // Sync CLAUDE.md (then restore its backup), identity files, and setup script back to database
       if (agentInfo?.id) {
         try {
-          await syncClaudeMdToServer(agentInfo.id);
+          await syncAndRestoreClaudeMd(agentInfo.id);
           await syncIdentityFilesToServer(agentInfo.id);
           await syncSetupScriptToServer(agentInfo.id);
-          await restoreClaudeMdBackup();
         } catch {
           // Silently fail - don't block shutdown
         }

package/src/http/agents.ts

@@ -48,10 +48,12 @@ import {
   AgentSchema,
   AgentStatusSchema,
   AgentWithTasksSchema,
+  type ProfileSyncConflict,
   type ProviderName,
   ProviderNameSchema,
   ReasoningEffortSchema,
   RuntimeInstanceSchema,
+  VersionableFieldSchema,
 } from "../types";
 import {
   type ClaudeTransport,
@@ -59,6 +61,7 @@ import {
   resolveClaudeTransport,
 } from "../utils/claude-transport";
 import { MAX_PROFILE_FILE_LENGTH } from "../utils/constants";
+import { HeartbeatExpiryError } from "../utils/heartbeat-expiry";
 import {
   type BudgetedIdentityField,
   IDENTITY_FIELD_BUDGETS,
@@ -411,6 +414,8 @@ const listAgentRuntimeInstances = route({
   },
 });
 
+const ContentHashSchema = z.string().regex(/^[0-9a-f]{64}$/, "sha256 hex");
+
 const ProfileSyncRejectionSchema = z.object({
   field: z.enum(["soulMd", "identityMd", "claudeMd", "toolsMd"]),
   diskSize: z.number().int(),
@@ -442,6 +447,12 @@ const updateAgentProfileRoute = route({
     changeSource: z.string().optional(),
     changedByAgentId: z.string().optional(),
     changeReason: z.string().optional(),
+    /**
+     * Compare-and-set token per field: the sha256 (hex) of the content the edit
+     * was based on. A field whose current value hashes differently is dropped
+     * (the DB moved since), without failing the rest of the update.
+     */
+    expectedHashes: z.partialRecord(VersionableFieldSchema, ContentHashSchema).optional(),
   }),
   responses: {
     200: { description: "Profile updated", schema: AgentWithCapacitySchema },
@@ -840,6 +851,7 @@ export async function handleAgentsRest(
           }
         : undefined;
 
+    const conflicts: ProfileSyncConflict[] = [];
     let agent: Agent | null;
     try {
       agent = await updateAgentProfile(
@@ -859,8 +871,16 @@ export async function handleAgentsRest(
           ...(body.avatar !== undefined ? { avatar: body.avatar } : {}),
         },
         versionMeta,
+        {
+          expectedHashes: body.expectedHashes,
+          onConflict: (conflict) => conflicts.push(conflict),
+        },
       );
     } catch (error) {
+      if (error instanceof HeartbeatExpiryError) {
+        jsonError(res, error.message, 400);
+        return true;
+      }
       if (error instanceof IdentityFieldBudgetError) {
         if (
           versionMeta?.changeSource === "self_edit" ||
@@ -901,10 +921,29 @@ export async function handleAgentsRest(
       return true;
     }
 
+    // A dropped field still answers 200 (the rest of the update landed), so the
+    // drop must be visible somewhere: one event per field, queryable later.
+    for (const conflict of conflicts) {
+      try {
+        await createEvent({
+          category: "system",
+          event: "system.profile_sync_conflict",
+          status: "skipped",
+          source: "api",
+          agentId: parsed.params.id,
+          data: { ...conflict, changeSource: versionMeta?.changeSource ?? null },
+        });
+      } catch (eventError) {
+        const message = eventError instanceof Error ? eventError.message : String(eventError);
+        console.error(scrubSecrets(`[profile-sync] Failed to persist conflict event: ${message}`));
+      }
+    }
+
     if (versionMeta?.changeSource === "self_edit" || versionMeta?.changeSource === "session_sync") {
       try {
         for (const field of Object.keys(IDENTITY_FIELD_BUDGETS) as BudgetedIdentityField[]) {
-          if (body[field] === undefined) continue;
+          // A field dropped by the compare-and-set was not written: nothing reconciled.
+          if (body[field] === undefined || conflicts.some((c) => c.field === field)) continue;
           await createEvent({
             category: "system",
             event: "system.profile_sync_reconciled",

package/src/http/auth.ts

@@ -1,6 +1,11 @@
 import type { IncomingMessage } from "node:http";
 import { getPage } from "../be/db";
-import { findUserById, fingerprintApiKey, resolveUserByToken } from "../be/users";
+import {
+  findUserById,
+  fingerprintApiKey,
+  resolveBySessionToken,
+  resolveUserByToken,
+} from "../be/users";
 import type { User } from "../types";
 import { verifyPageSession } from "../utils/page-session";
 import type { HttpRequestAuth } from "../utils/request-auth-context";
@@ -52,6 +57,13 @@ export async function resolveHttpRequestAuth(
     }
   }
 
+  if (bearer.startsWith("aseph_")) {
+    const principal = await resolveBySessionToken(bearer);
+    if (principal) {
+      return { kind: "agent", agentId: principal.agentId, taskId: principal.taskId };
+    }
+  }
+
   return null;
 }
 

package/src/http/fs.ts

@@ -1,17 +1,11 @@
-import { createHash } from "node:crypto";
 import type { IncomingMessage, ServerResponse } from "node:http";
 import { z } from "zod";
-import {
-  deleteTaskAttachment,
-  getAgentById,
-  getTaskAttachments,
-  getTaskById,
-  insertTaskAttachment,
-} from "../be/db";
+import { deleteTaskAttachment, getAgentById, getTaskAttachments, getTaskById } from "../be/db";
 import {
   ensureAgentFsCredentialsForAgent,
   inviteEmailToSharedOrg,
 } from "../be/seed/agent-fs-provision";
+import { MAX_TASK_ATTACHMENT_BYTES, recordTaskAttachmentUpload } from "../be/task-attachment-store";
 import { type FileObject, type FileScope, FilesError, normalizeFilesError } from "../fs/provider";
 import { getFileStorageProvider } from "../fs/registry";
 import { can, type RbacPrincipal, type RbacResource } from "../rbac";
@@ -22,8 +16,6 @@ import { scrubSecrets } from "../utils/secret-scrubber";
 import { route } from "./route-def";
 import { BODY_TOO_LARGE, enforceContentLengthCap, jsonError } from "./utils";
 
-const MAX_UPLOAD_BYTES = 50 * 1024 * 1024;
-
 // Upload wall-clock past which the provider round-trip is worth a log line.
 // Attachment stalls were invisible before: this path had no timing at all.
 const SLOW_UPLOAD_LOG_MS = 3_000;
@@ -306,7 +298,8 @@ export async function handleFs(
   }
 
   if (uploadTaskFileRoute.match(req.method, pathSegments)) {
-    if (enforceContentLengthCap(req, res, MAX_UPLOAD_BYTES) === BODY_TOO_LARGE) return true;
+    if (enforceContentLengthCap(req, res, MAX_TASK_ATTACHMENT_BYTES) === BODY_TOO_LARGE)
+      return true;
     const parsed = await uploadTaskFileRoute.parse(req, res, pathSegments, queryParams);
     if (!parsed) return true;
     const task = await getTaskById(parsed.params.taskId);
@@ -344,9 +337,9 @@ async function sendUpload(
   query: z.infer<typeof uploadQuery>,
   agentId: string | null,
 ): Promise<boolean> {
-  const body = await readRawBody(req, MAX_UPLOAD_BYTES);
+  const body = await readRawBody(req, MAX_TASK_ATTACHMENT_BYTES);
   if (body === BODY_TOO_LARGE) {
-    jsonError(res, `Payload too large (max ${MAX_UPLOAD_BYTES} bytes)`, 413);
+    jsonError(res, `Payload too large (max ${MAX_TASK_ATTACHMENT_BYTES} bytes)`, 413);
     return true;
   }
 
@@ -380,44 +373,21 @@ async function sendUpload(
     return sendProviderError(res, error);
   }
 
-  try {
-    const auth = getCurrentRequestAuth();
-    const attachment = await insertTaskAttachment({
-      taskId,
-      agentId,
-      name: query.name,
-      kind: provider.id === "agent-fs" ? "agent-fs" : "shared-fs",
-      path: uploaded.key,
-      providerId: provider.id,
-      providerKey: uploaded.key,
-      capabilities: {
-        ...provider.capabilities,
-        version: uploaded.version,
-        etag: uploaded.etag,
-      },
-      mimeType: uploaded.contentType ?? contentType,
-      sizeBytes: uploaded.sizeBytes ?? body.byteLength,
-      sha256: uploaded.sha256 ?? createHash("sha256").update(body).digest("hex"),
-      intent: query.intent,
-      description: query.description,
-      isPrimary: query.isPrimary === "true",
-      createdBy: auth?.kind === "user" ? auth.userId : undefined,
-    });
-    uploadTaskFileRoute.respond(res, 201, attachment);
-  } catch (error) {
-    try {
-      await provider.delete(scope);
-    } catch (cleanupError) {
-      console.warn(
-        scrubSecrets(
-          `[fs] upload metadata insert failed and blob cleanup failed: ${
-            cleanupError instanceof Error ? cleanupError.message : String(cleanupError)
-          }`,
-        ),
-      );
-    }
-    throw error;
-  }
+  const auth = getCurrentRequestAuth();
+  const attachment = await recordTaskAttachmentUpload({
+    provider,
+    scope,
+    uploaded,
+    sizeBytes: body.byteLength,
+    sha256: uploaded.sha256 ?? new Bun.CryptoHasher("sha256").update(body).digest("hex"),
+    contentType,
+    agentId,
+    intent: query.intent,
+    description: query.description,
+    isPrimary: query.isPrimary === "true",
+    createdBy: auth?.kind === "user" ? auth.userId : undefined,
+  });
+  uploadTaskFileRoute.respond(res, 201, attachment);
   return true;
 }
 

package/src/http/index.ts

@@ -118,6 +118,7 @@ import {
   parseQueryParams,
   safeRequestUrlForLog,
   setCorsHeaders,
+  warnIfCorsAllowsAnyOrigin,
   wireHttpSpanLifecycle,
 } from "./utils";
 import { handleWebhooks } from "./webhooks";
@@ -556,6 +557,7 @@ try {
   process.exitCode = 1;
   throw err;
 }
+warnIfCorsAllowsAnyOrigin();
 
 // Upgrade seed: explicit CAPABILITIES env values that predate capability
 // gating get the previously always-registered groups backfilled into a

package/src/http/mcp.ts

@@ -4,6 +4,7 @@ import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/
 import { isInitializeRequest } from "@modelcontextprotocol/sdk/types.js";
 import { getAgentById, getResolvedConfig } from "@/be/db";
 import { createServer } from "@/server";
+import { getRequestAuth } from "@/utils/request-auth-context";
 import { resolveScriptsOnlyMode } from "@/utils/scripts-only-mode";
 
 export type McpTransportActivity = Record<string, number>;
@@ -64,6 +65,34 @@ function unauthorized(res: ServerResponse, message = "Unauthorized"): true {
   return true;
 }
 
+function forbidden(res: ServerResponse, message: string): true {
+  res.writeHead(403, { "Content-Type": "application/json" });
+  res.end(JSON.stringify({ error: message }));
+  return true;
+}
+
+/**
+ * When a request is authenticated via an aseph_ session token (kind: "agent"),
+ * the X-Agent-ID and X-Source-Task-Id headers MUST match the token's bound
+ * agentId and taskId. A valid token cannot be used on behalf of a different
+ * agent or task.
+ */
+function validateAgentTokenIdentity(req: IncomingMessage, res: ServerResponse): true | undefined {
+  const auth = getRequestAuth(req);
+  if (!auth || auth.kind !== "agent") return undefined;
+
+  const agentId = headerValue(req.headers["x-agent-id"]);
+  const taskId = headerValue(req.headers["x-source-task-id"]);
+
+  if (!agentId || agentId !== auth.agentId) {
+    return forbidden(res, "X-Agent-ID does not match session token");
+  }
+  if (!taskId || taskId !== auth.taskId) {
+    return forbidden(res, "X-Source-Task-Id does not match session token");
+  }
+  return undefined;
+}
+
 function headerValue(value: string | string[] | undefined): string | undefined {
   return Array.isArray(value) ? value[0] : value;
 }
@@ -111,6 +140,9 @@ export async function handleMcp(
     return false;
   }
 
+  const tokenIdentityMismatch = validateAgentTokenIdentity(req, res);
+  if (tokenIdentityMismatch) return true;
+
   const agentMismatch = validateBoundAgent(req, res, sessionId, sessionAgents);
   if (agentMismatch) return true;
 

package/src/http/pages-public.ts

@@ -8,7 +8,8 @@
  * Scope of THIS module (step-3):
  *   - `auth_mode === 'public'`: ungated. HTML responses inline-inject the
  *     `BROWSER_SDK_JS` constant from `src/artifact-sdk/browser-sdk.ts` (reused
- *     verbatim — no token-injection hook on the client). JSON responses
+ *     verbatim — no token-injection hook on the client). SVG responses serve
+ *     raw bytes with a restrictive CSP and no injected scripts. JSON responses
  *     302-redirect to the SPA `/pages/:id` route (the JSON renderer lives
  *     in the SPA, not the API — step-6/7).
  *   - `auth_mode === 'authed'`: returns 401. step-4 narrows this to also
@@ -52,14 +53,14 @@ const publicPageRoute = route({
   method: "get",
   path: "/p/{id}",
   pattern: ["p", null],
-  summary: "Render a page (HTML inline; JSON redirects to SPA)",
+  summary: "Render a page (HTML/SVG inline; JSON redirects to SPA)",
   tags: ["Pages"],
   params: z.object({ id: z.string() }),
   responses: {
     200: {
-      description: "Rendered HTML page",
+      description: "Rendered HTML page or raw SVG image",
       unstructured:
-        "Serves the page's raw agent-authored HTML body (SDK-injected) or, for ?print=1 on a JSON-content page, a standalone printable HTML document — not a JSON shape",
+        "Serves raw image/svg+xml bytes, the page's agent-authored HTML body (SDK-injected) or, for ?print=1 on a JSON-content page, a standalone printable HTML document — not a JSON shape",
     },
     302: { description: "Redirect to SPA for JSON content" },
     401: { description: "Page requires an authenticated session" },
@@ -593,6 +594,21 @@ export async function handlePagesPublic(
     return true;
   }
 
+  // SVG stays byte-for-byte intact, including when ?print=1 is supplied.
+  if (page.contentType === "image/svg+xml") {
+    const headers: Record<string, string> = {
+      "Content-Type": "image/svg+xml",
+      "Cache-Control": page.authMode === "public" ? "public, max-age=1800" : "private, no-store",
+      "X-Content-Type-Options": "nosniff",
+      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
+    };
+    if (inlineSetCookie) headers["Set-Cookie"] = inlineSetCookie;
+    res.writeHead(200, headers);
+    res.end(page.body);
+    await bumpViewCount(page.id);
+    return true;
+  }
+
   // `?print=1` — the SPA's "Export PDF" button opens the page in a new tab
   // with this flag so the page self-prints in the user's own browser (no
   // server-side headless browser). HTML pages get the auto-print snippet

package/src/http/pages.ts

@@ -33,7 +33,12 @@ import { issuePageSessionCookie } from "../utils/page-session";
 import { getRequestAuth } from "../utils/request-auth-context";
 import { resolveHttpFavoriteOwner } from "./favorite-owner";
 import { route } from "./route-def";
-import { BODY_TOO_LARGE, enforceContentLengthCap, jsonError } from "./utils";
+import {
+  BODY_TOO_LARGE,
+  enforceContentLengthCap,
+  isOriginAllowedForCredentials,
+  jsonError,
+} from "./utils";
 
 /**
  * Per-page body-size cap. Page bodies are stored as a TEXT column with no
@@ -370,9 +375,12 @@ const getPageVersionRoute = route({
 function applyLaunchCors(req: IncomingMessage, res: ServerResponse): void {
   const origin = (req.headers.origin as string | undefined) ?? "";
   if (origin) {
-    res.setHeader("Access-Control-Allow-Origin", origin);
     res.setHeader("Vary", "Origin");
-    res.setHeader("Access-Control-Allow-Credentials", "true");
+    // Cookie issuance always requires the hosted/dev or configured allowlist.
+    if (isOriginAllowedForCredentials(origin)) {
+      res.setHeader("Access-Control-Allow-Origin", origin);
+      res.setHeader("Access-Control-Allow-Credentials", "true");
+    }
   }
   res.setHeader("Access-Control-Allow-Methods", "POST, OPTIONS");
   res.setHeader("Access-Control-Allow-Headers", "Authorization, Content-Type");

package/src/http/poll.ts

@@ -94,11 +94,14 @@ const PollTriggerAttachmentSchema = TaskAttachmentSchema.pick({
 // user's identity fields, or (when no `requestedByUserId` is recorded) just a
 // rendered `name` for the UNKNOWN-identity sentinel.
 const PollRequestedBySchema = UserSchema.pick({
+  id: true,
   name: true,
   email: true,
   role: true,
   notes: true,
 }).extend({
+  // Absent for the UNKNOWN-identity sentinel (Slack-only requester, no users row).
+  id: z.string().optional(),
   // Structured communication preferences from `users.metadata.comms`.
   comms: UserCommsPrefsSchema.optional(),
 });
@@ -195,6 +198,7 @@ async function buildTriggerRequestedBy(task: {
   const user = task.requestedByUserId ? await getUserById(task.requestedByUserId) : undefined;
   if (user) {
     return {
+      id: user.id,
       name: user.name,
       email: user.email,
       role: user.role,

package/src/http/repos.ts

@@ -8,7 +8,7 @@ import {
   updateSwarmRepo,
 } from "../be/db";
 import { emitIntegrationConnected } from "../telemetry";
-import { RepoGuidelinesSchema, RepoHooksSchema, SwarmRepoSchema } from "../types";
+import { RepoGuidelinesInputSchema, RepoHooksSchema, SwarmRepoSchema } from "../types";
 import { route } from "./route-def";
 import { json, jsonError } from "./utils";
 
@@ -58,7 +58,7 @@ const createRepo = route({
     defaultBranch: z.string().optional(),
     autoClone: z.boolean().optional(),
     hooks: RepoHooksSchema.optional(),
-    guidelines: RepoGuidelinesSchema.nullable().optional(),
+    guidelines: RepoGuidelinesInputSchema.nullable().optional(),
   }),
   responses: {
     201: { description: "Repo created", schema: SwarmRepoSchema },
@@ -81,7 +81,7 @@ const updateRepo = route({
     defaultBranch: z.string().optional(),
     autoClone: z.boolean().optional(),
     hooks: RepoHooksSchema.nullable().optional(),
-    guidelines: RepoGuidelinesSchema.nullable().optional(),
+    guidelines: RepoGuidelinesInputSchema.nullable().optional(),
   }),
   responses: {
     200: { description: "Repo updated", schema: SwarmRepoSchema },