agent-relay-server 0.32.4 → 0.33.1

package/src/db/mappers.ts

@@ -0,0 +1,397 @@
+import { Database } from "bun:sqlite";
+import { randomUUID } from "node:crypto";
+import { isRecord, stringValue, isMechanicalMessageKind } from "agent-relay-sdk";
+import { ORCHESTRATOR_PROTOCOL_VERSION, VERSION } from "../config.ts";
+import { parseJson } from "../utils";
+import { isLiveIsolatedWorkspace } from "../workspace-phase";
+import {
+  CONTRACT_REQUIREMENTS,
+  contractCompatibility,
+  parseRuntimeCapabilities,
+  parseRuntimeContracts,
+  parseRuntimePackage,
+  type RuntimeContracts,
+} from "../contracts";
+import { STALE_TTL_MS, DAY_MS, CLAIM_LEASE_MS, POOL_CLAIM_LEASE_MS, WORKSPACE_MERGE_LEASE_MS } from "../config";
+import { matchAgents } from "../agent-ref";
+import { parseStringArray } from "./agents.ts";
+import { artifactId } from "./artifacts.ts";
+import type {
+  AgentCard,
+  ActivityEvent,
+  ActivityEventInput,
+  AgentKind,
+  AgentSessionGuard,
+  Artifact,
+  ArtifactBlob,
+  ArtifactKind,
+  ArtifactLink,
+  ArtifactSensitivity,
+  ArtifactVisibility,
+  AttachmentRef,
+  ChannelBinding,
+  ChannelBindingMode,
+  ChannelRouteTarget,
+  ChatHistoryImport,
+  ChatHistoryImportEntry,
+  ChannelSummary,
+  ChannelTargetHealth,
+  CreatePairInput,
+  HealthCheck,
+  HealthReport,
+  ManagedAgent,
+  ManagedSessionExitDiagnostics,
+  Message,
+  MessageDeliveryAttempt,
+  MessageDeliveryStatus,
+  Orchestrator,
+  OrchestratorHealth,
+  OrchestratorRuntimeInput,
+  OrchestratorStatus,
+  OrchestratorUpgradeState,
+  PairActionInput,
+  PairMessageInput,
+  PairSession,
+  PairStatus,
+  RegisterAgentInput,
+  ReplyObligation,
+  RegisterOrchestratorInput,
+  SendMessageInput,
+  PollQuery,
+  SpawnApprovalMode,
+  SpawnProvider,
+  Task,
+  TaskEvent,
+  TaskSeverity,
+  TaskStatus,
+  IntegrationEventInput,
+  IntegrationSummary,
+  IntegrationTaskStats,
+  InboxDraft,
+  InboxState,
+  InboxThreadState,
+  ContextSnapshot,
+  ContextState,
+  ProviderCapabilities,
+  TaskStatusInput,
+  WorkspaceMetadata,
+  WorkspaceRecord,
+  WorkspaceStatus,
+} from "../types";
+
+export const REACTION_EMOJI_ALIASES: Record<string, string> = {
+  "+1": "👍",
+  ":+1:": "👍",
+  "thumbsup": "👍",
+  ":thumbsup:": "👍",
+  "thumbs-up": "👍",
+  ":thumbs-up:": "👍",
+  "thumbs_up": "👍",
+  ":thumbs_up:": "👍",
+  "thumb_up": "👍",
+  ":thumb_up:": "👍",
+  "like": "👍",
+  ":like:": "👍",
+  "heart": "❤️",
+  ":heart:": "❤️",
+  "redheart": "❤️",
+  "red_heart": "❤️",
+  ":red_heart:": "❤️",
+  "check": "✅",
+  ":check:": "✅",
+  "checkmark": "✅",
+  ":checkmark:": "✅",
+  "white_check_mark": "✅",
+  ":white_check_mark:": "✅",
+  "eyes": "👀",
+  ":eyes:": "👀",
+};
+
+export function normalizeReactionEmoji(value: string): string {
+  const trimmed = value.trim();
+  return REACTION_EMOJI_ALIASES[trimmed.toLowerCase()] ?? trimmed;
+}
+
+export function rowToAgent(row: any): AgentCard {
+  return {
+    id: row.id,
+    name: row.name,
+    kind: row.kind ?? "provider",
+    label: row.label ?? undefined,
+    tags: parseStringArray(row.tags),
+    machine: row.machine ?? undefined,
+    rig: row.rig ?? undefined,
+    capabilities: parseStringArray(row.capabilities),
+    ready: row.ready === 1,
+    status: row.status,
+    instanceId: row.instance_id ?? undefined,
+    epoch: typeof row.epoch === "number" ? row.epoch : 0,
+    providerCapabilities: parseJson<ProviderCapabilities | undefined>(row.provider_capabilities, undefined),
+    context: parseJson<ContextState | undefined>(row.context_state, undefined),
+    meta: parseJson(row.meta, {}),
+    spawnedBy: row.spawned_by ?? undefined,
+    lastSeen: row.last_seen,
+    createdAt: row.created_at,
+  };
+}
+
+export function rowToContextSnapshot(row: any): ContextSnapshot {
+  const context = parseJson<ContextState>(row.context_state, {
+    utilization: row.utilization,
+    lifecycleState: row.lifecycle_state,
+    warmTopics: [],
+    activeMemories: [],
+    tasksSinceCompact: 0,
+    lastUpdatedAt: row.captured_at,
+    source: row.source,
+    confidence: row.confidence,
+  });
+  return {
+    id: row.id,
+    agentId: row.agent_id,
+    context,
+    utilization: row.utilization,
+    lifecycleState: row.lifecycle_state,
+    tokensUsed: row.tokens_used ?? undefined,
+    tokensMax: row.tokens_max ?? undefined,
+    source: row.source,
+    confidence: row.confidence,
+    capturedAt: row.captured_at,
+  };
+}
+
+export function rowToMessage(row: any): Message {
+  return {
+    id: row.id,
+    from: row.from_agent,
+    to: row.to_target,
+    kind: row.kind ?? "chat",
+    channel: row.channel ?? undefined,
+    subject: row.subject ?? undefined,
+    body: row.body,
+    threadId: row.thread_id ?? undefined,
+    replyTo: row.reply_to ?? undefined,
+    // Default (true) stays absent to match the `claimable` idiom and keep notification-free
+    // messages byte-identical on the wire; only an explicit notification surfaces false (#283).
+    replyExpected: row.reply_expected === 0 ? false : undefined,
+    claimable: row.claimable === 1 ? true : undefined,
+    claimedBy: row.claimed_by ?? undefined,
+    claimedAt: row.claimed_at ?? undefined,
+    claimExpiresAt: row.claim_expires_at ?? undefined,
+    idempotencyKey: row.idempotency_key ?? undefined,
+    deliveryStatus: row.delivery_status ?? "pending",
+    deliveryAttempts: row.delivery_attempts ?? 0,
+    deliveryLastError: row.delivery_last_error ?? undefined,
+    deliveryNextRetryAt: row.delivery_next_retry_at ?? undefined,
+    deliveryPoisonReason: row.delivery_poison_reason ?? undefined,
+    deliveryUpdatedAt: row.delivery_updated_at ?? undefined,
+    queuedAt: row.queued_at ?? undefined,
+    maxAgeSeconds: row.max_age_seconds ?? undefined,
+    resolvedToAgent: row.resolved_to_agent ?? undefined,
+    payload: parseJson(row.payload ?? "{}", {}),
+    meta: parseJson(row.meta, {}),
+    reactions: parseJson(row.reactions_json ?? "[]", []),
+    readBy: parseJson(row.read_by_agents ?? "[]", []),
+    createdAt: row.created_at,
+    occurredAt: row.occurred_at ?? undefined,
+  };
+}
+
+export function rowToArtifactBlob(row: any): ArtifactBlob {
+  return {
+    digest: row.digest,
+    storageUri: row.storage_uri,
+    mediaType: row.media_type,
+    size: row.size,
+    createdAt: row.created_at,
+  };
+}
+
+export function rowToArtifactLink(row: any): ArtifactLink {
+  return {
+    id: row.id,
+    artifactId: row.artifact_id,
+    entityType: row.entity_type,
+    entityId: row.entity_id,
+    role: row.role ?? undefined,
+    title: row.title ?? undefined,
+    createdBy: row.created_by,
+    createdAt: row.created_at,
+  };
+}
+
+export function rowToArtifact(row: any, links?: ArtifactLink[]): Artifact {
+  return {
+    id: row.id,
+    blobDigest: row.blob_digest,
+    mediaType: row.media_type,
+    kind: row.kind ?? "other",
+    filename: row.filename ?? undefined,
+    size: row.size,
+    digest: row.blob_digest,
+    visibility: row.visibility ?? "project",
+    sensitivity: row.sensitivity ?? "normal",
+    createdBy: row.created_by,
+    createdAt: row.created_at,
+    expiresAt: row.expires_at ?? undefined,
+    metadata: parseJson(row.metadata, {}),
+    ...(links ? { links } : {}),
+    url: `/api/artifacts/${encodeURIComponent(row.id)}/content`,
+  };
+}
+
+export function rowToMessageDeliveryAttempt(row: any): MessageDeliveryAttempt {
+  return {
+    id: row.id,
+    messageId: row.message_id,
+    agentId: row.agent_id ?? undefined,
+    action: row.action,
+    status: row.status,
+    error: row.error ?? undefined,
+    nextRetryAt: row.next_retry_at ?? undefined,
+    poisonReason: row.poison_reason ?? undefined,
+    createdAt: row.created_at,
+  };
+}
+
+export function rowToTask(row: any): Task {
+  return {
+    id: row.id,
+    source: row.source,
+    title: row.title,
+    body: row.body,
+    severity: row.severity as TaskSeverity,
+    status: row.status as TaskStatus,
+    target: row.target,
+    channel: row.channel ?? undefined,
+    dedupeKey: row.dedupe_key ?? undefined,
+    externalUrl: row.external_url ?? undefined,
+    occurrenceCount: row.occurrence_count,
+    claimedBy: row.claimed_by ?? undefined,
+    claimedAt: row.claimed_at ?? undefined,
+    claimExpiresAt: row.claim_expires_at ?? undefined,
+    messageId: row.message_id ?? undefined,
+    result: row.result ?? undefined,
+    metadata: parseJson(row.metadata, {}),
+    createdAt: row.created_at,
+    updatedAt: row.updated_at,
+    lastSeenAt: row.last_seen_at,
+  };
+}
+
+export function rowToTaskEvent(row: any): TaskEvent {
+  return {
+    id: row.id,
+    taskId: row.task_id,
+    source: row.source,
+    type: row.type,
+    severity: row.severity as TaskSeverity,
+    title: row.title,
+    body: row.body,
+    metadata: parseJson(row.metadata, {}),
+    createdAt: row.created_at,
+  };
+}
+
+export function rowToPair(row: any): PairSession {
+  return {
+    id: row.id,
+    requesterId: row.requester_id,
+    targetId: row.target_id,
+    status: row.status as PairStatus,
+    objective: row.objective ?? undefined,
+    createdAt: row.created_at,
+    updatedAt: row.updated_at,
+    expiresAt: row.expires_at,
+    acceptedAt: row.accepted_at ?? undefined,
+    endedAt: row.ended_at ?? undefined,
+    endedBy: row.ended_by ?? undefined,
+    lastMessageAt: row.last_message_at ?? undefined,
+    meta: parseJson(row.meta, {}),
+  };
+}
+
+export function rowToInboxThreadState(row: any): InboxThreadState {
+  return {
+    operatorId: row.operator_id,
+    peerId: row.peer_id,
+    readCursorMessageId: row.read_cursor_message_id ?? undefined,
+    archivedAtMessageId: row.archived_at_message_id ?? undefined,
+    updatedAt: row.updated_at,
+  };
+}
+
+export function rowToInboxDraft(row: any): InboxDraft {
+  return {
+    operatorId: row.operator_id,
+    peerId: row.peer_id,
+    body: row.body,
+    subject: row.subject ?? undefined,
+    channel: row.channel ?? undefined,
+    updatedAt: row.updated_at,
+  };
+}
+
+export function rowToChatHistoryImport(row: any, entries: ChatHistoryImportEntry[]): ChatHistoryImport {
+  return {
+    id: row.id,
+    targetAgentId: row.target_agent_id ?? undefined,
+    targetSpawnRequestId: row.target_spawn_request_id ?? undefined,
+    sourcePeerId: row.source_peer_id,
+    sourceAgentId: row.source_agent_id ?? undefined,
+    sourceThreadId: row.source_thread_id ?? undefined,
+    sourceAgentLabel: row.source_agent_label ?? undefined,
+    importedBy: row.imported_by,
+    importedAt: row.imported_at,
+    entries,
+  };
+}
+
+export function rowToChatHistoryImportEntry(row: any): ChatHistoryImportEntry {
+  const message = parseJson<Message>(row.message_snapshot, {} as Message);
+  return {
+    position: row.position,
+    originalMessageId: row.original_message_id,
+    originalFrom: row.original_from,
+    originalTo: row.original_to,
+    originalCreatedAt: row.original_created_at,
+    message,
+  };
+}
+
+export function rowToActivityEvent(row: any): ActivityEvent {
+  return {
+    id: row.id,
+    operatorId: row.operator_id ?? undefined,
+    clientId: row.client_id ?? undefined,
+    kind: row.kind,
+    title: row.title,
+    body: row.body ?? undefined,
+    meta: row.meta_text ?? undefined,
+    icon: row.icon ?? undefined,
+    view: row.view ?? undefined,
+    peer: row.peer_id ?? undefined,
+    messageId: row.message_id ?? undefined,
+    pairId: row.pair_id ?? undefined,
+    taskId: row.task_id ?? undefined,
+    agentId: row.agent_id ?? undefined,
+    metadata: parseJson(row.metadata, {}),
+    createdAt: row.created_at,
+  };
+}
+
+
+export const MSG_SELECT = `SELECT m.*, (
+  SELECT json_group_array(agent_id) FROM message_reads WHERE message_id = m.id
+) AS read_by_agents, (
+  SELECT json_group_array(json_object(
+    'messageId', message_id,
+    'actorId', actor_id,
+    'emoji', emoji,
+    'createdAt', created_at,
+    'updatedAt', updated_at
+  )) FROM message_reactions WHERE message_id = m.id
+) AS reactions_json FROM messages m`;
+
+// --- Agents ---
+

package/src/db/merge-lease.ts

@@ -0,0 +1,160 @@
+import { Database } from "bun:sqlite";
+import { randomUUID } from "node:crypto";
+import { isRecord, stringValue, isMechanicalMessageKind } from "agent-relay-sdk";
+import { ORCHESTRATOR_PROTOCOL_VERSION, VERSION } from "../config.ts";
+import { parseJson } from "../utils";
+import { isLiveIsolatedWorkspace } from "../workspace-phase";
+import {
+  CONTRACT_REQUIREMENTS,
+  contractCompatibility,
+  parseRuntimeCapabilities,
+  parseRuntimeContracts,
+  parseRuntimePackage,
+  type RuntimeContracts,
+} from "../contracts";
+import { STALE_TTL_MS, DAY_MS, CLAIM_LEASE_MS, POOL_CLAIM_LEASE_MS, WORKSPACE_MERGE_LEASE_MS } from "../config";
+import { matchAgents } from "../agent-ref";
+import { getDb } from "./connection.ts";
+import type {
+  AgentCard,
+  ActivityEvent,
+  ActivityEventInput,
+  AgentKind,
+  AgentSessionGuard,
+  Artifact,
+  ArtifactBlob,
+  ArtifactKind,
+  ArtifactLink,
+  ArtifactSensitivity,
+  ArtifactVisibility,
+  AttachmentRef,
+  ChannelBinding,
+  ChannelBindingMode,
+  ChannelRouteTarget,
+  ChatHistoryImport,
+  ChatHistoryImportEntry,
+  ChannelSummary,
+  ChannelTargetHealth,
+  CreatePairInput,
+  HealthCheck,
+  HealthReport,
+  ManagedAgent,
+  ManagedSessionExitDiagnostics,
+  Message,
+  MessageDeliveryAttempt,
+  MessageDeliveryStatus,
+  Orchestrator,
+  OrchestratorHealth,
+  OrchestratorRuntimeInput,
+  OrchestratorStatus,
+  OrchestratorUpgradeState,
+  PairActionInput,
+  PairMessageInput,
+  PairSession,
+  PairStatus,
+  RegisterAgentInput,
+  ReplyObligation,
+  RegisterOrchestratorInput,
+  SendMessageInput,
+  PollQuery,
+  SpawnApprovalMode,
+  SpawnProvider,
+  Task,
+  TaskEvent,
+  TaskSeverity,
+  TaskStatus,
+  IntegrationEventInput,
+  IntegrationSummary,
+  IntegrationTaskStats,
+  InboxDraft,
+  InboxState,
+  InboxThreadState,
+  ContextSnapshot,
+  ContextState,
+  ProviderCapabilities,
+  TaskStatusInput,
+  WorkspaceMetadata,
+  WorkspaceRecord,
+  WorkspaceStatus,
+} from "../types";
+
+// --- Per-repo merge serialization lease (issue #157) -----------------------
+
+export interface MergeLeaseRecord {
+  repoRoot: string;
+  workspaceId: string;
+  commandId?: string;
+  holder?: string;
+  acquiredAt: number;
+  expiresAt: number;
+}
+
+export function rowToMergeLease(row: any): MergeLeaseRecord {
+  return {
+    repoRoot: row.repo_root,
+    workspaceId: row.workspace_id,
+    commandId: row.command_id ?? undefined,
+    holder: row.holder ?? undefined,
+    acquiredAt: row.acquired_at,
+    expiresAt: row.expires_at,
+  };
+}
+
+export function getMergeLease(repoRoot: string): MergeLeaseRecord | null {
+  const row = getDb().query("SELECT * FROM workspace_merge_leases WHERE repo_root = ?").get(repoRoot) as any;
+  return row ? rowToMergeLease(row) : null;
+}
+
+export function listMergeLeases(): MergeLeaseRecord[] {
+  return (getDb().query("SELECT * FROM workspace_merge_leases ORDER BY acquired_at DESC").all() as any[]).map(rowToMergeLease);
+}
+
+export function releaseExpiredMergeLeases(now: number = Date.now()): string[] {
+  const expired = getDb().query("SELECT repo_root FROM workspace_merge_leases WHERE expires_at <= ?").all(now) as Array<{ repo_root: string }>;
+  if (!expired.length) return [];
+  getDb().query("DELETE FROM workspace_merge_leases WHERE expires_at <= ?").run(now);
+  return expired.map((r) => r.repo_root);
+}
+
+// Atomically acquire the per-repo merge lease. Succeeds if no live lease is held
+// for the repo (or the existing one has expired). Serialized via getDb().transaction
+// so two concurrent merge requests for the same repo can't both win.
+export function acquireMergeLease(
+  repoRoot: string,
+  workspaceId: string,
+  holder?: string,
+): { ok: true; lease: MergeLeaseRecord } | { ok: false; lease: MergeLeaseRecord } {
+  return getDb().transaction(() => {
+    const now = Date.now();
+    const existing = getMergeLease(repoRoot);
+    if (existing && existing.expiresAt > now) return { ok: false as const, lease: existing };
+    const expiresAt = now + WORKSPACE_MERGE_LEASE_MS;
+    getDb().query(`
+      INSERT INTO workspace_merge_leases (repo_root, workspace_id, command_id, holder, acquired_at, expires_at)
+      VALUES (?, ?, NULL, ?, ?, ?)
+      ON CONFLICT(repo_root) DO UPDATE SET
+        workspace_id = excluded.workspace_id, command_id = NULL, holder = excluded.holder,
+        acquired_at = excluded.acquired_at, expires_at = excluded.expires_at
+    `).run(repoRoot, workspaceId, holder ?? null, now, expiresAt);
+    return { ok: true as const, lease: getMergeLease(repoRoot)! };
+  })();
+}
+
+// Attach the dispatched command id to a held lease so it can be released by
+// command id when the merge settles.
+export function setMergeLeaseCommand(repoRoot: string, commandId: string): void {
+  getDb().query("UPDATE workspace_merge_leases SET command_id = ? WHERE repo_root = ?").run(commandId, repoRoot);
+}
+
+// Release a merge lease. Guard by commandId/workspaceId when known so a stale
+// release can't drop a newer lease for the same repo.
+export function releaseMergeLease(opts: { repoRoot?: string; commandId?: string; workspaceId?: string }): boolean {
+  const where: string[] = [];
+  const params: string[] = [];
+  if (opts.repoRoot) { where.push("repo_root = ?"); params.push(opts.repoRoot); }
+  if (opts.commandId) { where.push("command_id = ?"); params.push(opts.commandId); }
+  if (opts.workspaceId) { where.push("workspace_id = ?"); params.push(opts.workspaceId); }
+  if (!where.length) return false;
+  return getDb().query(`DELETE FROM workspace_merge_leases WHERE ${where.join(" AND ")}`).run(...params).changes > 0;
+}
+