bopodev-db 0.1.28 → 0.1.29

package/src/repositories/helpers.ts

@@ -0,0 +1,104 @@
+import { and, eq } from "drizzle-orm";
+import type { BopoDb } from "../client";
+import { agents, goals, issues, projects, templates } from "../schema";
+
+export class RepositoryValidationError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = "RepositoryValidationError";
+  }
+}
+
+export async function assertProjectBelongsToCompany(db: BopoDb, companyId: string, projectId: string) {
+  const [project] = await db
+    .select({ id: projects.id })
+    .from(projects)
+    .where(and(eq(projects.companyId, companyId), eq(projects.id, projectId)))
+    .limit(1);
+  if (!project) {
+    throw new RepositoryValidationError("Project not found for company.");
+  }
+}
+
+export async function assertIssueBelongsToCompany(db: BopoDb, companyId: string, issueId: string) {
+  const [issue] = await db
+    .select({ id: issues.id })
+    .from(issues)
+    .where(and(eq(issues.companyId, companyId), eq(issues.id, issueId)))
+    .limit(1);
+  if (!issue) {
+    throw new RepositoryValidationError("Issue not found for company.");
+  }
+}
+
+export async function assertGoalBelongsToCompany(db: BopoDb, companyId: string, goalId: string) {
+  const [goal] = await db
+    .select({ id: goals.id })
+    .from(goals)
+    .where(and(eq(goals.companyId, companyId), eq(goals.id, goalId)))
+    .limit(1);
+  if (!goal) {
+    throw new RepositoryValidationError("Parent goal not found for company.");
+  }
+}
+
+/** Ensures a goal can be linked to an issue: same company; project-scoped goals must match the issue's project. */
+export async function assertIssueGoalAssignable(
+  db: BopoDb,
+  companyId: string,
+  issueProjectId: string,
+  goalId: string | null | undefined
+) {
+  if (!goalId) {
+    return;
+  }
+  const [goal] = await db
+    .select({ id: goals.id, projectId: goals.projectId })
+    .from(goals)
+    .where(and(eq(goals.companyId, companyId), eq(goals.id, goalId)))
+    .limit(1);
+  if (!goal) {
+    throw new RepositoryValidationError("Goal not found for company.");
+  }
+  if (goal.projectId && goal.projectId !== issueProjectId) {
+    throw new RepositoryValidationError("Goal is scoped to a different project than this issue.");
+  }
+}
+
+/** Validates each goal can be linked to an issue (same company; project goals must match issue project). */
+export async function assertIssueGoalsAssignable(
+  db: BopoDb,
+  companyId: string,
+  issueProjectId: string,
+  goalIds: string[]
+) {
+  for (const goalId of goalIds) {
+    await assertIssueGoalAssignable(db, companyId, issueProjectId, goalId);
+  }
+}
+
+export async function assertAgentBelongsToCompany(db: BopoDb, companyId: string, agentId: string) {
+  const [agent] = await db
+    .select({ id: agents.id })
+    .from(agents)
+    .where(and(eq(agents.companyId, companyId), eq(agents.id, agentId)))
+    .limit(1);
+  if (!agent) {
+    throw new RepositoryValidationError("Agent not found for company.");
+  }
+}
+
+export async function assertTemplateBelongsToCompany(db: BopoDb, companyId: string, templateId: string) {
+  const [template] = await db
+    .select({ id: templates.id })
+    .from(templates)
+    .where(and(eq(templates.companyId, companyId), eq(templates.id, templateId)))
+    .limit(1);
+  if (!template) {
+    throw new RepositoryValidationError("Template not found for company.");
+  }
+}
+
+export function compactUpdate<T extends Record<string, unknown>>(input: T) {
+  return Object.fromEntries(Object.entries(input).filter(([, value]) => value !== undefined));
+}

package/src/repositories/index.ts

@@ -0,0 +1,3 @@
+export * from "./helpers";
+export * from "./companies";
+export * from "./legacy";

package/src/{repositories.ts → repositories/legacy.ts}

@@ -1,6 +1,6 @@
 import { and, asc, desc, eq, gt, inArray, notInArray, sql } from "drizzle-orm";
 import { nanoid } from "nanoid";
-import type { BopoDb } from "./client";
+import type { BopoDb } from "../client";
 import {
   activityLogs,
   agents,
@@ -8,7 +8,6 @@ import {
   approvalInboxStates,
   approvalRequests,
   auditEvents,
-  companies,
   costLedger,
   goals,
   heartbeatRunQueue,
@@ -16,6 +15,7 @@ import {
   heartbeatRunMessages,
   issueAttachments,
   issueComments,
+  issueGoals,
   issues,
   pluginConfigs,
   pluginRuns,
@@ -26,100 +26,17 @@ import {
   templateVersions,
   templates,
   touchUpdatedAtSql
-} from "./schema";
-
-export class RepositoryValidationError extends Error {
-  constructor(message: string) {
-    super(message);
-    this.name = "RepositoryValidationError";
-  }
-}
-
-async function assertProjectBelongsToCompany(db: BopoDb, companyId: string, projectId: string) {
-  const [project] = await db
-    .select({ id: projects.id })
-    .from(projects)
-    .where(and(eq(projects.companyId, companyId), eq(projects.id, projectId)))
-    .limit(1);
-  if (!project) {
-    throw new RepositoryValidationError("Project not found for company.");
-  }
-}
-
-async function assertIssueBelongsToCompany(db: BopoDb, companyId: string, issueId: string) {
-  const [issue] = await db
-    .select({ id: issues.id })
-    .from(issues)
-    .where(and(eq(issues.companyId, companyId), eq(issues.id, issueId)))
-    .limit(1);
-  if (!issue) {
-    throw new RepositoryValidationError("Issue not found for company.");
-  }
-}
-
-async function assertGoalBelongsToCompany(db: BopoDb, companyId: string, goalId: string) {
-  const [goal] = await db
-    .select({ id: goals.id })
-    .from(goals)
-    .where(and(eq(goals.companyId, companyId), eq(goals.id, goalId)))
-    .limit(1);
-  if (!goal) {
-    throw new RepositoryValidationError("Parent goal not found for company.");
-  }
-}
-
-async function assertAgentBelongsToCompany(db: BopoDb, companyId: string, agentId: string) {
-  const [agent] = await db
-    .select({ id: agents.id })
-    .from(agents)
-    .where(and(eq(agents.companyId, companyId), eq(agents.id, agentId)))
-    .limit(1);
-  if (!agent) {
-    throw new RepositoryValidationError("Agent not found for company.");
-  }
-}
-
-async function assertTemplateBelongsToCompany(db: BopoDb, companyId: string, templateId: string) {
-  const [template] = await db
-    .select({ id: templates.id })
-    .from(templates)
-    .where(and(eq(templates.companyId, companyId), eq(templates.id, templateId)))
-    .limit(1);
-  if (!template) {
-    throw new RepositoryValidationError("Template not found for company.");
-  }
-}
-
-export async function createCompany(db: BopoDb, input: { name: string; mission?: string | null }) {
-  const id = nanoid(12);
-  await db.insert(companies).values({
-    id,
-    name: input.name,
-    mission: input.mission ?? null
-  });
-  return { id, ...input };
-}
-
-export async function listCompanies(db: BopoDb) {
-  return db.select().from(companies).orderBy(desc(companies.createdAt));
-}
-
-export async function updateCompany(
-  db: BopoDb,
-  input: { id: string; name?: string; mission?: string | null }
-) {
-  const [company] = await db
-    .update(companies)
-    .set(compactUpdate({ name: input.name, mission: input.mission }))
-    .where(eq(companies.id, input.id))
-    .returning();
-  return company ?? null;
-}
-
-export async function deleteCompany(db: BopoDb, id: string) {
-  const [deletedCompany] = await db.delete(companies).where(eq(companies.id, id)).returning({ id: companies.id });
-  return Boolean(deletedCompany);
-}
+} from "../schema";
+import {
+  assertAgentBelongsToCompany,
+  assertGoalBelongsToCompany,
+  assertIssueGoalsAssignable,
+  assertIssueBelongsToCompany,
+  assertProjectBelongsToCompany,
+  assertTemplateBelongsToCompany,
+  compactUpdate,
+  RepositoryValidationError
+} from "./helpers";
 
 export async function listProjects(db: BopoDb, companyId: string) {
   const rows = await db.select().from(projects).where(eq(projects.companyId, companyId)).orderBy(desc(projects.createdAt));
@@ -540,6 +457,46 @@ export async function listIssues(db: BopoDb, companyId: string, projectId?: stri
   return db.select().from(issues).where(where).orderBy(desc(issues.updatedAt));
 }
 
+export async function listIssueGoalIdsBatch(db: BopoDb, companyId: string, issueIds: string[]) {
+  const map = new Map<string, string[]>();
+  if (issueIds.length === 0) {
+    return map;
+  }
+  const rows = await db
+    .select({ issueId: issueGoals.issueId, goalId: issueGoals.goalId })
+    .from(issueGoals)
+    .where(and(eq(issueGoals.companyId, companyId), inArray(issueGoals.issueId, issueIds)));
+  for (const row of rows) {
+    const list = map.get(row.issueId) ?? [];
+    list.push(row.goalId);
+    map.set(row.issueId, list);
+  }
+  return map;
+}
+
+export async function syncIssueGoals(
+  db: BopoDb,
+  input: { companyId: string; issueId: string; projectId: string; goalIds: string[] }
+) {
+  const dedupedGoalIds = Array.from(new Set(input.goalIds.map((id) => id.trim()).filter((id) => id.length > 0)));
+  await assertIssueBelongsToCompany(db, input.companyId, input.issueId);
+  await assertIssueGoalsAssignable(db, input.companyId, input.projectId, dedupedGoalIds);
+
+  await db
+    .delete(issueGoals)
+    .where(and(eq(issueGoals.companyId, input.companyId), eq(issueGoals.issueId, input.issueId)));
+
+  if (dedupedGoalIds.length > 0) {
+    await db.insert(issueGoals).values(
+      dedupedGoalIds.map((goalId) => ({
+        issueId: input.issueId,
+        goalId,
+        companyId: input.companyId
+      }))
+    );
+  }
+}
+
 export async function getIssue(db: BopoDb, companyId: string, issueId: string) {
   const [row] = await db
     .select()
@@ -555,8 +512,10 @@ export async function createIssue(
     companyId: string;
     projectId: string;
     parentIssueId?: string | null;
+    goalIds?: string[];
     title: string;
     body?: string;
+    externalLink?: string | null;
     status?: string;
     priority?: string;
     assigneeAgentId?: string | null;
@@ -572,21 +531,35 @@ export async function createIssue(
     await assertAgentBelongsToCompany(db, input.companyId, input.assigneeAgentId);
   }
   const id = nanoid(12);
-  await db.insert(issues).values({
-    id,
-    companyId: input.companyId,
-    projectId: input.projectId,
-    parentIssueId: input.parentIssueId ?? null,
-    title: input.title,
-    body: input.body,
-    status: input.status ?? "todo",
-    priority: input.priority ?? "none",
-    assigneeAgentId: input.assigneeAgentId ?? null,
-    labelsJson: JSON.stringify(input.labels ?? []),
-    tagsJson: JSON.stringify(input.tags ?? [])
+  return await db.transaction(async (tx) => {
+    const [row] = await tx
+      .insert(issues)
+      .values({
+        id,
+        companyId: input.companyId,
+        projectId: input.projectId,
+        parentIssueId: input.parentIssueId ?? null,
+        title: input.title,
+        body: input.body,
+        externalLink: input.externalLink?.trim() ? input.externalLink.trim() : null,
+        status: input.status ?? "todo",
+        priority: input.priority ?? "none",
+        assigneeAgentId: input.assigneeAgentId ?? null,
+        labelsJson: JSON.stringify(input.labels ?? []),
+        tagsJson: JSON.stringify(input.tags ?? [])
+      })
+      .returning();
+    if (!row) {
+      throw new RepositoryValidationError("Failed to create issue.");
+    }
+    await syncIssueGoals(tx as unknown as BopoDb, {
+      companyId: input.companyId,
+      issueId: row.id,
+      projectId: input.projectId,
+      goalIds: input.goalIds ?? []
+    });
+    return row;
   });
-
-  return { id, ...input };
 }
 
 export async function updateIssue(
@@ -595,8 +568,10 @@ export async function updateIssue(
     companyId: string;
     id: string;
     projectId?: string;
+    goalIds?: string[];
     title?: string;
     body?: string | null;
+    externalLink?: string | null;
     status?: string;
     priority?: string;
     assigneeAgentId?: string | null;
@@ -604,6 +579,14 @@ export async function updateIssue(
     tags?: string[];
   }
 ) {
+  const [existing] = await db
+    .select()
+    .from(issues)
+    .where(and(eq(issues.companyId, input.companyId), eq(issues.id, input.id)))
+    .limit(1);
+  if (!existing) {
+    return null;
+  }
   if (input.projectId) {
     await assertProjectBelongsToCompany(db, input.companyId, input.projectId);
   }
@@ -617,6 +600,12 @@ export async function updateIssue(
         projectId: input.projectId,
         title: input.title,
         body: input.body,
+        externalLink:
+          input.externalLink === undefined
+            ? undefined
+            : input.externalLink?.trim()
+              ? input.externalLink.trim()
+              : null,
         status: input.status,
         priority: input.priority,
         assigneeAgentId: input.assigneeAgentId,
@@ -627,7 +616,32 @@ export async function updateIssue(
     )
     .where(and(eq(issues.companyId, input.companyId), eq(issues.id, input.id)))
     .returning();
-  return issue ?? null;
+  if (!issue) {
+    return null;
+  }
+  if (input.goalIds !== undefined) {
+    await syncIssueGoals(db, {
+      companyId: input.companyId,
+      issueId: issue.id,
+      projectId: issue.projectId,
+      goalIds: input.goalIds
+    });
+  } else if (input.projectId && input.projectId !== existing.projectId) {
+    const currentRows = await db
+      .select({ goalId: issueGoals.goalId })
+      .from(issueGoals)
+      .where(and(eq(issueGoals.companyId, input.companyId), eq(issueGoals.issueId, issue.id)));
+    const currentGoalIds = currentRows.map((row) => row.goalId);
+    if (currentGoalIds.length > 0) {
+      await syncIssueGoals(db, {
+        companyId: input.companyId,
+        issueId: issue.id,
+        projectId: issue.projectId,
+        goalIds: currentGoalIds
+      });
+    }
+  }
+  return issue;
 }
 
 export async function deleteIssue(db: BopoDb, companyId: string, id: string) {
@@ -922,6 +936,7 @@ export async function createGoal(
     companyId: string;
     projectId?: string | null;
     parentGoalId?: string | null;
+    ownerAgentId?: string | null;
     level: "company" | "project" | "agent";
     title: string;
     description?: string;
@@ -933,12 +948,16 @@ export async function createGoal(
   if (input.parentGoalId) {
     await assertGoalBelongsToCompany(db, input.companyId, input.parentGoalId);
   }
+  if (input.ownerAgentId) {
+    await assertAgentBelongsToCompany(db, input.companyId, input.ownerAgentId);
+  }
   const id = nanoid(12);
   await db.insert(goals).values({
     id,
     companyId: input.companyId,
     projectId: input.projectId ?? null,
     parentGoalId: input.parentGoalId ?? null,
+    ownerAgentId: input.ownerAgentId?.trim() ? input.ownerAgentId.trim() : null,
     level: input.level,
     title: input.title,
     description: input.description ?? null
@@ -957,6 +976,7 @@ export async function updateGoal(
     id: string;
     projectId?: string | null;
     parentGoalId?: string | null;
+    ownerAgentId?: string | null;
     level?: "company" | "project" | "agent";
     title?: string;
     description?: string | null;
@@ -969,12 +989,21 @@ export async function updateGoal(
   if (input.parentGoalId) {
     await assertGoalBelongsToCompany(db, input.companyId, input.parentGoalId);
   }
+  if (input.ownerAgentId) {
+    await assertAgentBelongsToCompany(db, input.companyId, input.ownerAgentId);
+  }
   const [goal] = await db
     .update(goals)
     .set(
       compactUpdate({
         projectId: input.projectId,
         parentGoalId: input.parentGoalId,
+        ownerAgentId:
+          input.ownerAgentId === undefined
+            ? undefined
+            : input.ownerAgentId?.trim()
+              ? input.ownerAgentId.trim()
+              : null,
         level: input.level,
         title: input.title,
         description: input.description,
@@ -1639,6 +1668,7 @@ export async function enqueueHeartbeatJob(
 }
 
 export async function claimNextHeartbeatJob(db: BopoDb, companyId: string) {
+  // Postgres-specific: CTE + NOT EXISTS + FOR UPDATE SKIP LOCKED + UPDATE FROM — kept as raw SQL for correct job claiming under concurrency.
   const result = await db.execute(sql`
     WITH candidate AS (
       SELECT q.id
@@ -1893,6 +1923,7 @@ export async function listHeartbeatRunMessagesForRuns(
   }
   const perRunLimit = Math.min(Math.max(input.perRunLimit ?? 60, 1), 500);
   const runIdValues = sql.join(runIds.map((runId) => sql`(${runId})`), sql`, `);
+  // Window functions (ROW_NUMBER) and VALUES-driven CTE — impractical to express purely with Drizzle’s query builder.
   const rankedRows = await db.execute(sql`
     WITH requested(run_id) AS (
       VALUES ${runIdValues}
@@ -2378,7 +2409,3 @@ export async function createTemplateInstall(
     .returning();
   return row ?? null;
 }
-
-function compactUpdate<T extends Record<string, unknown>>(input: T) {
-  return Object.fromEntries(Object.entries(input).filter(([, value]) => value !== undefined));
-}

package/src/schema.ts

@@ -53,6 +53,8 @@ export const goals = pgTable("goals", {
     .references(() => companies.id, { onDelete: "cascade" }),
   projectId: text("project_id").references(() => projects.id, { onDelete: "set null" }),
   parentGoalId: text("parent_goal_id"),
+  /** When set, this agent-level goal is included only for that agent's heartbeats; null = all agents. */
+  ownerAgentId: text("owner_agent_id"),
   level: text("level").notNull(),
   title: text("title").notNull(),
   description: text("description"),
@@ -114,12 +116,31 @@ export const issues = pgTable("issues", {
   assigneeAgentId: text("assignee_agent_id"),
   labelsJson: text("labels_json").notNull().default("[]"),
   tagsJson: text("tags_json").notNull().default("[]"),
+  /** Optional link to a PR, branch page, or other external tracker (GitHub/GitLab/etc.). */
+  externalLink: text("external_link"),
   isClaimed: boolean("is_claimed").notNull().default(false),
   claimedByHeartbeatRunId: text("claimed_by_heartbeat_run_id"),
   createdAt: timestamp("created_at", { mode: "date" }).defaultNow().notNull(),
   updatedAt: timestamp("updated_at", { mode: "date" }).defaultNow().notNull()
 });
 
+export const issueGoals = pgTable(
+  "issue_goals",
+  {
+    issueId: text("issue_id")
+      .notNull()
+      .references(() => issues.id, { onDelete: "cascade" }),
+    goalId: text("goal_id")
+      .notNull()
+      .references(() => goals.id, { onDelete: "cascade" }),
+    companyId: text("company_id")
+      .notNull()
+      .references(() => companies.id, { onDelete: "cascade" }),
+    createdAt: timestamp("created_at", { mode: "date" }).defaultNow().notNull()
+  },
+  (table) => [primaryKey({ columns: [table.issueId, table.goalId] })]
+);
+
 export const issueComments = pgTable("issue_comments", {
   id: text("id").primaryKey(),
   issueId: text("issue_id")
@@ -423,6 +444,7 @@ export const schema = {
   goals,
   agents,
   issues,
+  issueGoals,
   issueComments,
   issueAttachments,
   activityLogs,