bopodev-db 0.1.32 → 0.1.34

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
 
-> bopodev-db@0.1.32 build /Users/danielkrusenstrahle/Documents/Projects/Monorepo/bopohq/packages/db
+> bopodev-db@0.1.34 build /Users/danielkrusenstrahle/Documents/Projects/Monorepo/bopodev/packages/db
 > tsc -p tsconfig.json --emitDeclarationOnly
 

package/.turbo/turbo-lint.log

@@ -1,4 +1,4 @@
 
-> bopodev-db@0.1.15 lint /Users/danielkrusenstrahle/Documents/Projects/Monorepo/bopohq/packages/db
+> bopodev-db@0.1.28 lint /Users/danielkrusenstrahle/Documents/Projects/Monorepo/bopodev/packages/db
 > tsc -p tsconfig.json --noEmit
 

package/.turbo/turbo-typecheck.log

@@ -1,4 +1,4 @@
 
-> bopodev-db@0.1.30 typecheck /Users/danielkrusenstrahle/Documents/Projects/Monorepo/bopohq/packages/db
+> bopodev-db@0.1.20 typecheck /Users/danielkrusenstrahle/Documents/Projects/Monorepo/bopodev/packages/db
 > tsc -p tsconfig.json --noEmit
 

package/dist/repositories/helpers.d.ts

@@ -14,3 +14,17 @@ export declare function assertTemplateBelongsToCompany(db: BopoDb, companyId: st
 export declare function compactUpdate<T extends Record<string, unknown>>(input: T): {
     [k: string]: unknown;
 };
+type GoalLevel = "company" | "project" | "agent";
+/**
+ * Validates level ↔ projectId and optional parent_goal_id tree rules:
+ * - company: projectId must be null; parent must be company-level (or absent).
+ * - project: projectId required; parent must be company-level or absent.
+ * - agent: parent absent, company-level, or project-level with same projectId as child (child projectId required in that case).
+ */
+export declare function assertValidGoalHierarchy(db: BopoDb, companyId: string, input: {
+    id?: string;
+    level: GoalLevel;
+    projectId: string | null;
+    parentGoalId: string | null;
+}): Promise<void>;
+export {};

package/dist/repositories/legacy.d.ts

@@ -566,9 +566,9 @@ export declare function createGoal(db: BopoDb, input: {
     title: string;
     description?: string;
 }): Promise<{
+    projectId: string | null;
+    parentGoalId: string | null;
     companyId: string;
-    projectId?: string | null;
-    parentGoalId?: string | null;
     ownerAgentId?: string | null;
     level: "company" | "project" | "agent";
     title: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bopodev-db",
-  "version": "0.1.32",
+  "version": "0.1.34",
   "license": "MIT",
   "type": "module",
   "main": "src/index.ts",

package/src/migrations/0008_goals_parent_goal_fk.sql

@@ -0,0 +1 @@
+ALTER TABLE "goals" ADD CONSTRAINT "goals_parent_goal_id_goals_id_fk" FOREIGN KEY ("parent_goal_id") REFERENCES "goals"("id") ON DELETE SET NULL;

package/src/migrations/meta/_journal.json

@@ -57,6 +57,13 @@
       "when": 1743200000000,
       "tag": "0007_cost_ledger_company_assistant",
       "breakpoints": true
+    },
+    {
+      "idx": 8,
+      "version": "7",
+      "when": 1743300000000,
+      "tag": "0008_goals_parent_goal_fk",
+      "breakpoints": true
     }
   ]
 }

package/src/repositories/helpers.ts

@@ -102,3 +102,113 @@ export async function assertTemplateBelongsToCompany(db: BopoDb, companyId: stri
 export function compactUpdate<T extends Record<string, unknown>>(input: T) {
   return Object.fromEntries(Object.entries(input).filter(([, value]) => value !== undefined));
 }
+
+const GOAL_PARENT_CHAIN_MAX_DEPTH = 32;
+
+type GoalLevel = "company" | "project" | "agent";
+
+/** Walk parent_goal_id upward; detects cycles and whether `selfId` appears (would make self an ancestor of the parent). */
+async function walkGoalParentChain(
+  db: BopoDb,
+  companyId: string,
+  startParentId: string,
+  selfId: string | undefined
+) {
+  const visited = new Set<string>();
+  let current: string | null = startParentId;
+  let depth = 0;
+  while (current && depth < GOAL_PARENT_CHAIN_MAX_DEPTH) {
+    if (selfId && current === selfId) {
+      throw new RepositoryValidationError("Goal cannot be its own ancestor.");
+    }
+    if (visited.has(current)) {
+      throw new RepositoryValidationError("Parent goal chain contains a cycle.");
+    }
+    visited.add(current);
+    const [row] = await db
+      .select({ parentGoalId: goals.parentGoalId })
+      .from(goals)
+      .where(and(eq(goals.companyId, companyId), eq(goals.id, current)))
+      .limit(1);
+    current = row?.parentGoalId?.trim() ? row.parentGoalId : null;
+    depth += 1;
+  }
+  if (current && depth >= GOAL_PARENT_CHAIN_MAX_DEPTH) {
+    throw new RepositoryValidationError("Parent goal chain exceeds maximum depth.");
+  }
+}
+
+/**
+ * Validates level ↔ projectId and optional parent_goal_id tree rules:
+ * - company: projectId must be null; parent must be company-level (or absent).
+ * - project: projectId required; parent must be company-level or absent.
+ * - agent: parent absent, company-level, or project-level with same projectId as child (child projectId required in that case).
+ */
+export async function assertValidGoalHierarchy(
+  db: BopoDb,
+  companyId: string,
+  input: {
+    id?: string;
+    level: GoalLevel;
+    projectId: string | null;
+    parentGoalId: string | null;
+  }
+) {
+  const level = input.level;
+  const projectId = input.projectId?.trim() ? input.projectId.trim() : null;
+  const parentGoalId = input.parentGoalId?.trim() ? input.parentGoalId.trim() : null;
+
+  if (level === "company" && projectId) {
+    throw new RepositoryValidationError("Company goals cannot be scoped to a project.");
+  }
+  if (level === "project" && !projectId) {
+    throw new RepositoryValidationError("Project goals must have a project.");
+  }
+
+  if (!parentGoalId) {
+    return;
+  }
+
+  const [parent] = await db
+    .select({
+      id: goals.id,
+      level: goals.level,
+      projectId: goals.projectId
+    })
+    .from(goals)
+    .where(and(eq(goals.companyId, companyId), eq(goals.id, parentGoalId)))
+    .limit(1);
+
+  if (!parent) {
+    throw new RepositoryValidationError("Parent goal not found for company.");
+  }
+
+  const pLevel = parent.level as GoalLevel;
+  if (pLevel !== "company" && pLevel !== "project") {
+    throw new RepositoryValidationError("Parent goal must be company or project level.");
+  }
+
+  if (level === "company") {
+    if (pLevel !== "company") {
+      throw new RepositoryValidationError("Company goals may only have a company-level parent.");
+    }
+  } else if (level === "project") {
+    if (pLevel !== "company") {
+      throw new RepositoryValidationError("Project goals may only have a company-level parent.");
+    }
+  } else {
+    // agent
+    if (pLevel === "company") {
+      // ok
+    } else if (pLevel === "project") {
+      const parentPid = parent.projectId?.trim() ? parent.projectId : null;
+      if (!parentPid || parentPid !== projectId) {
+        throw new RepositoryValidationError(
+          "Agent goals with a project parent must use the same project as the parent goal."
+        );
+      }
+    }
+  }
+
+  await walkGoalParentChain(db, companyId, parentGoalId, input.id);
+}

package/src/repositories/legacy.ts

@@ -29,11 +29,11 @@ import {
 } from "../schema";
 import {
   assertAgentBelongsToCompany,
-  assertGoalBelongsToCompany,
   assertIssueGoalsAssignable,
   assertIssueBelongsToCompany,
   assertProjectBelongsToCompany,
   assertTemplateBelongsToCompany,
+  assertValidGoalHierarchy,
   compactUpdate,
   RepositoryValidationError
 } from "./helpers";
@@ -946,11 +946,15 @@ export async function createGoal(
     description?: string;
   }
 ) {
-  if (input.projectId) {
-    await assertProjectBelongsToCompany(db, input.companyId, input.projectId);
-  }
-  if (input.parentGoalId) {
-    await assertGoalBelongsToCompany(db, input.companyId, input.parentGoalId);
+  const projectId = input.projectId?.trim() ? input.projectId.trim() : null;
+  const parentGoalId = input.parentGoalId?.trim() ? input.parentGoalId.trim() : null;
+  await assertValidGoalHierarchy(db, input.companyId, {
+    level: input.level,
+    projectId,
+    parentGoalId
+  });
+  if (projectId) {
+    await assertProjectBelongsToCompany(db, input.companyId, projectId);
   }
   if (input.ownerAgentId) {
     await assertAgentBelongsToCompany(db, input.companyId, input.ownerAgentId);
@@ -959,14 +963,14 @@ export async function createGoal(
   await db.insert(goals).values({
     id,
     companyId: input.companyId,
-    projectId: input.projectId ?? null,
-    parentGoalId: input.parentGoalId ?? null,
+    projectId,
+    parentGoalId,
     ownerAgentId: input.ownerAgentId?.trim() ? input.ownerAgentId.trim() : null,
     level: input.level,
     title: input.title,
     description: input.description ?? null
   });
-  return { id, ...input };
+  return { id, ...input, projectId, parentGoalId };
 }
 
 export async function listGoals(db: BopoDb, companyId: string) {
@@ -987,14 +991,37 @@ export async function updateGoal(
     status?: string;
   }
 ) {
-  if (input.projectId) {
-    await assertProjectBelongsToCompany(db, input.companyId, input.projectId);
+  const [existing] = await db
+    .select({
+      level: goals.level,
+      projectId: goals.projectId,
+      parentGoalId: goals.parentGoalId
+    })
+    .from(goals)
+    .where(and(eq(goals.companyId, input.companyId), eq(goals.id, input.id)))
+    .limit(1);
+  if (!existing) {
+    return null;
   }
-  if (input.parentGoalId) {
-    await assertGoalBelongsToCompany(db, input.companyId, input.parentGoalId);
+
+  const effectiveLevel = (input.level ?? existing.level) as "company" | "project" | "agent";
+  const effectiveProjectId = input.projectId !== undefined ? input.projectId : existing.projectId;
+  const effectiveProjectIdNorm = effectiveProjectId?.trim() ? effectiveProjectId.trim() : null;
+  const effectiveParent =
+    input.parentGoalId !== undefined ? input.parentGoalId : existing.parentGoalId;
+  const effectiveParentNorm = effectiveParent?.trim() ? effectiveParent.trim() : null;
+
+  await assertValidGoalHierarchy(db, input.companyId, {
+    id: input.id,
+    level: effectiveLevel,
+    projectId: effectiveProjectIdNorm,
+    parentGoalId: effectiveParentNorm
+  });
+  if (effectiveProjectIdNorm) {
+    await assertProjectBelongsToCompany(db, input.companyId, effectiveProjectIdNorm);
   }
-  if (input.ownerAgentId) {
-    await assertAgentBelongsToCompany(db, input.companyId, input.ownerAgentId);
+  if (input.ownerAgentId?.trim()) {
+    await assertAgentBelongsToCompany(db, input.companyId, input.ownerAgentId.trim());
   }
   const [goal] = await db
     .update(goals)

package/src/schema.ts

@@ -1,4 +1,5 @@
 import { sql } from "drizzle-orm";
+import type { AnyPgColumn } from "drizzle-orm/pg-core";
 import { boolean, integer, numeric, pgTable, primaryKey, text, timestamp } from "drizzle-orm/pg-core";
 
 export const companies = pgTable("companies", {
@@ -52,7 +53,7 @@ export const goals = pgTable("goals", {
     .notNull()
     .references(() => companies.id, { onDelete: "cascade" }),
   projectId: text("project_id").references(() => projects.id, { onDelete: "set null" }),
-  parentGoalId: text("parent_goal_id"),
+  parentGoalId: text("parent_goal_id").references((): AnyPgColumn => goals.id, { onDelete: "set null" }),
   /** 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(),