@deeplake/hivemind 0.7.50 → 0.7.51

package/cursor/bundle/pre-tool-use.js

@@ -98,13 +98,10 @@ function loadConfig() {
     sessionsTableName: process.env.HIVEMIND_SESSIONS_TABLE ?? "sessions",
     skillsTableName: process.env.HIVEMIND_SKILLS_TABLE ?? "skills",
     // Defaults match the table name written into the SQL — keep aligned
-    // with RULES_COLUMNS / TASKS_COLUMNS / TASK_EVENTS_COLUMNS in
-    // deeplake-schema.ts and with the e2e test-org override convention
-    // (memory_test / sessions_test → goals_test, etc.) documented in
-    // CLAUDE.md.
+    // with RULES_COLUMNS in deeplake-schema.ts and with the e2e test-org
+    // override convention (memory_test / sessions_test → goals_test, etc.)
+    // documented in CLAUDE.md.
     rulesTableName: process.env.HIVEMIND_RULES_TABLE ?? "hivemind_rules",
-    tasksTableName: process.env.HIVEMIND_TASKS_TABLE ?? "hivemind_tasks",
-    taskEventsTableName: process.env.HIVEMIND_TASK_EVENTS_TABLE ?? "hivemind_task_events",
     // Goals + KPIs (refined design — VFS path classifier maps
     //   memory/goal/<user>/<status>/<uuid>.md → hivemind_goals row
     //   memory/kpi/<uuid>/<kpi_id>.md → hivemind_kpis row
@@ -226,32 +223,6 @@ var RULES_COLUMNS = Object.freeze([
   { name: "agent", sql: "TEXT NOT NULL DEFAULT 'manual'" },
   { name: "plugin_version", sql: "TEXT NOT NULL DEFAULT ''" }
 ]);
-var TASKS_COLUMNS = Object.freeze([
-  { name: "id", sql: "TEXT NOT NULL DEFAULT ''" },
-  { name: "task_id", sql: "TEXT NOT NULL DEFAULT ''" },
-  { name: "text", sql: "TEXT NOT NULL DEFAULT ''" },
-  { name: "scope", sql: "TEXT NOT NULL DEFAULT 'me'" },
-  { name: "status", sql: "TEXT NOT NULL DEFAULT 'active'" },
-  { name: "assigned_to", sql: "TEXT NOT NULL DEFAULT ''" },
-  { name: "assigned_by", sql: "TEXT NOT NULL DEFAULT ''" },
-  { name: "kpis", sql: "JSONB" },
-  { name: "version", sql: "BIGINT NOT NULL DEFAULT 1" },
-  { name: "created_at", sql: "TEXT NOT NULL DEFAULT ''" },
-  { name: "agent", sql: "TEXT NOT NULL DEFAULT 'manual'" },
-  { name: "plugin_version", sql: "TEXT NOT NULL DEFAULT ''" }
-]);
-var TASK_EVENTS_COLUMNS = Object.freeze([
-  { name: "id", sql: "TEXT NOT NULL DEFAULT ''" },
-  { name: "task_id", sql: "TEXT NOT NULL DEFAULT ''" },
-  { name: "task_version", sql: "BIGINT NOT NULL DEFAULT 1" },
-  { name: "kpi_id", sql: "TEXT NOT NULL DEFAULT ''" },
-  { name: "value", sql: "BIGINT NOT NULL DEFAULT 0" },
-  { name: "note", sql: "TEXT NOT NULL DEFAULT ''" },
-  { name: "source", sql: "TEXT NOT NULL DEFAULT 'user'" },
-  { name: "agent", sql: "TEXT NOT NULL DEFAULT ''" },
-  { name: "ts", sql: "TEXT NOT NULL DEFAULT ''" },
-  { name: "plugin_version", sql: "TEXT NOT NULL DEFAULT ''" }
-]);
 var GOALS_COLUMNS = Object.freeze([
   { name: "id", sql: "TEXT NOT NULL DEFAULT ''" },
   { name: "goal_id", sql: "TEXT NOT NULL DEFAULT ''" },
@@ -317,8 +288,6 @@ validateSchema("MEMORY_COLUMNS", MEMORY_COLUMNS);
 validateSchema("SESSIONS_COLUMNS", SESSIONS_COLUMNS);
 validateSchema("SKILLS_COLUMNS", SKILLS_COLUMNS);
 validateSchema("RULES_COLUMNS", RULES_COLUMNS);
-validateSchema("TASKS_COLUMNS", TASKS_COLUMNS);
-validateSchema("TASK_EVENTS_COLUMNS", TASK_EVENTS_COLUMNS);
 validateSchema("GOALS_COLUMNS", GOALS_COLUMNS);
 validateSchema("KPIS_COLUMNS", KPIS_COLUMNS);
 validateSchema("CODEBASE_COLUMNS", CODEBASE_COLUMNS);
@@ -938,46 +907,6 @@ var DeeplakeApi = class {
     await this.healSchema(safe, RULES_COLUMNS);
     await this.ensureLookupIndex(safe, "rule_id_version", `("rule_id", "version")`);
   }
-  /**
-   * Create the tasks table.
-   *
-   * Same write pattern as rules + skills. `kpis` is a nullable JSONB
-   * column with the agent's KPI metadata; KPI current values come from
-   * `task_events` (SUM(value)), not this snapshot.
-   */
-  async ensureTasksTable(name) {
-    const safe = sqlIdent(name);
-    const tables = await this.listTables();
-    if (!tables.includes(safe)) {
-      log3(`table "${safe}" not found, creating`);
-      await this.createTableWithRetry(buildCreateTableSql(safe, TASKS_COLUMNS), safe);
-      log3(`table "${safe}" created`);
-      if (!tables.includes(safe))
-        this._tablesCache = [...tables, safe];
-    }
-    await this.healSchema(safe, TASKS_COLUMNS);
-    await this.ensureLookupIndex(safe, "task_id_version", `("task_id", "version")`);
-  }
-  /**
-   * Create the task-events table.
-   *
-   * Append-only. Every INSERT is a fresh row; never UPDATE. KPI current
-   * value is `SUM(value) WHERE task_id=? AND kpi_id=?`. Index on
-   * (task_id, kpi_id) is the canonical aggregation key.
-   */
-  async ensureTaskEventsTable(name) {
-    const safe = sqlIdent(name);
-    const tables = await this.listTables();
-    if (!tables.includes(safe)) {
-      log3(`table "${safe}" not found, creating`);
-      await this.createTableWithRetry(buildCreateTableSql(safe, TASK_EVENTS_COLUMNS), safe);
-      log3(`table "${safe}" created`);
-      if (!tables.includes(safe))
-        this._tablesCache = [...tables, safe];
-    }
-    await this.healSchema(safe, TASK_EVENTS_COLUMNS);
-    await this.ensureLookupIndex(safe, "task_id_kpi_id", `("task_id", "kpi_id")`);
-  }
   /**
    * Create the goals table.
    *

package/cursor/bundle/session-end.js

@@ -65,13 +65,10 @@ function loadConfig() {
     sessionsTableName: process.env.HIVEMIND_SESSIONS_TABLE ?? "sessions",
     skillsTableName: process.env.HIVEMIND_SKILLS_TABLE ?? "skills",
     // Defaults match the table name written into the SQL — keep aligned
-    // with RULES_COLUMNS / TASKS_COLUMNS / TASK_EVENTS_COLUMNS in
-    // deeplake-schema.ts and with the e2e test-org override convention
-    // (memory_test / sessions_test → goals_test, etc.) documented in
-    // CLAUDE.md.
+    // with RULES_COLUMNS in deeplake-schema.ts and with the e2e test-org
+    // override convention (memory_test / sessions_test → goals_test, etc.)
+    // documented in CLAUDE.md.
     rulesTableName: process.env.HIVEMIND_RULES_TABLE ?? "hivemind_rules",
-    tasksTableName: process.env.HIVEMIND_TASKS_TABLE ?? "hivemind_tasks",
-    taskEventsTableName: process.env.HIVEMIND_TASK_EVENTS_TABLE ?? "hivemind_task_events",
     // Goals + KPIs (refined design — VFS path classifier maps
     //   memory/goal/<user>/<status>/<uuid>.md → hivemind_goals row
     //   memory/kpi/<uuid>/<kpi_id>.md → hivemind_kpis row

package/cursor/bundle/session-start.js

@@ -122,13 +122,10 @@ function loadConfig() {
     sessionsTableName: process.env.HIVEMIND_SESSIONS_TABLE ?? "sessions",
     skillsTableName: process.env.HIVEMIND_SKILLS_TABLE ?? "skills",
     // Defaults match the table name written into the SQL — keep aligned
-    // with RULES_COLUMNS / TASKS_COLUMNS / TASK_EVENTS_COLUMNS in
-    // deeplake-schema.ts and with the e2e test-org override convention
-    // (memory_test / sessions_test → goals_test, etc.) documented in
-    // CLAUDE.md.
+    // with RULES_COLUMNS in deeplake-schema.ts and with the e2e test-org
+    // override convention (memory_test / sessions_test → goals_test, etc.)
+    // documented in CLAUDE.md.
     rulesTableName: process.env.HIVEMIND_RULES_TABLE ?? "hivemind_rules",
-    tasksTableName: process.env.HIVEMIND_TASKS_TABLE ?? "hivemind_tasks",
-    taskEventsTableName: process.env.HIVEMIND_TASK_EVENTS_TABLE ?? "hivemind_task_events",
     // Goals + KPIs (refined design — VFS path classifier maps
     //   memory/goal/<user>/<status>/<uuid>.md → hivemind_goals row
     //   memory/kpi/<uuid>/<kpi_id>.md → hivemind_kpis row
@@ -164,6 +161,9 @@ function log(tag, msg) {
 function sqlStr(value) {
   return value.replace(/\\/g, "\\\\").replace(/'/g, "''").replace(/\0/g, "").replace(/[\x01-\x08\x0b\x0c\x0e-\x1f\x7f]/g, "");
 }
+function sqlLike(value) {
+  return sqlStr(value).replace(/%/g, "\\%").replace(/_/g, "\\_");
+}
 function sqlIdent(name) {
   if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(name)) {
     throw new Error(`Invalid SQL identifier: ${JSON.stringify(name)}`);
@@ -238,32 +238,6 @@ var RULES_COLUMNS = Object.freeze([
   { name: "agent", sql: "TEXT NOT NULL DEFAULT 'manual'" },
   { name: "plugin_version", sql: "TEXT NOT NULL DEFAULT ''" }
 ]);
-var TASKS_COLUMNS = Object.freeze([
-  { name: "id", sql: "TEXT NOT NULL DEFAULT ''" },
-  { name: "task_id", sql: "TEXT NOT NULL DEFAULT ''" },
-  { name: "text", sql: "TEXT NOT NULL DEFAULT ''" },
-  { name: "scope", sql: "TEXT NOT NULL DEFAULT 'me'" },
-  { name: "status", sql: "TEXT NOT NULL DEFAULT 'active'" },
-  { name: "assigned_to", sql: "TEXT NOT NULL DEFAULT ''" },
-  { name: "assigned_by", sql: "TEXT NOT NULL DEFAULT ''" },
-  { name: "kpis", sql: "JSONB" },
-  { name: "version", sql: "BIGINT NOT NULL DEFAULT 1" },
-  { name: "created_at", sql: "TEXT NOT NULL DEFAULT ''" },
-  { name: "agent", sql: "TEXT NOT NULL DEFAULT 'manual'" },
-  { name: "plugin_version", sql: "TEXT NOT NULL DEFAULT ''" }
-]);
-var TASK_EVENTS_COLUMNS = Object.freeze([
-  { name: "id", sql: "TEXT NOT NULL DEFAULT ''" },
-  { name: "task_id", sql: "TEXT NOT NULL DEFAULT ''" },
-  { name: "task_version", sql: "BIGINT NOT NULL DEFAULT 1" },
-  { name: "kpi_id", sql: "TEXT NOT NULL DEFAULT ''" },
-  { name: "value", sql: "BIGINT NOT NULL DEFAULT 0" },
-  { name: "note", sql: "TEXT NOT NULL DEFAULT ''" },
-  { name: "source", sql: "TEXT NOT NULL DEFAULT 'user'" },
-  { name: "agent", sql: "TEXT NOT NULL DEFAULT ''" },
-  { name: "ts", sql: "TEXT NOT NULL DEFAULT ''" },
-  { name: "plugin_version", sql: "TEXT NOT NULL DEFAULT ''" }
-]);
 var GOALS_COLUMNS = Object.freeze([
   { name: "id", sql: "TEXT NOT NULL DEFAULT ''" },
   { name: "goal_id", sql: "TEXT NOT NULL DEFAULT ''" },
@@ -329,8 +303,6 @@ validateSchema("MEMORY_COLUMNS", MEMORY_COLUMNS);
 validateSchema("SESSIONS_COLUMNS", SESSIONS_COLUMNS);
 validateSchema("SKILLS_COLUMNS", SKILLS_COLUMNS);
 validateSchema("RULES_COLUMNS", RULES_COLUMNS);
-validateSchema("TASKS_COLUMNS", TASKS_COLUMNS);
-validateSchema("TASK_EVENTS_COLUMNS", TASK_EVENTS_COLUMNS);
 validateSchema("GOALS_COLUMNS", GOALS_COLUMNS);
 validateSchema("KPIS_COLUMNS", KPIS_COLUMNS);
 validateSchema("CODEBASE_COLUMNS", CODEBASE_COLUMNS);
@@ -932,46 +904,6 @@ var DeeplakeApi = class {
     await this.healSchema(safe, RULES_COLUMNS);
     await this.ensureLookupIndex(safe, "rule_id_version", `("rule_id", "version")`);
   }
-  /**
-   * Create the tasks table.
-   *
-   * Same write pattern as rules + skills. `kpis` is a nullable JSONB
-   * column with the agent's KPI metadata; KPI current values come from
-   * `task_events` (SUM(value)), not this snapshot.
-   */
-  async ensureTasksTable(name) {
-    const safe = sqlIdent(name);
-    const tables = await this.listTables();
-    if (!tables.includes(safe)) {
-      log3(`table "${safe}" not found, creating`);
-      await this.createTableWithRetry(buildCreateTableSql(safe, TASKS_COLUMNS), safe);
-      log3(`table "${safe}" created`);
-      if (!tables.includes(safe))
-        this._tablesCache = [...tables, safe];
-    }
-    await this.healSchema(safe, TASKS_COLUMNS);
-    await this.ensureLookupIndex(safe, "task_id_version", `("task_id", "version")`);
-  }
-  /**
-   * Create the task-events table.
-   *
-   * Append-only. Every INSERT is a fresh row; never UPDATE. KPI current
-   * value is `SUM(value) WHERE task_id=? AND kpi_id=?`. Index on
-   * (task_id, kpi_id) is the canonical aggregation key.
-   */
-  async ensureTaskEventsTable(name) {
-    const safe = sqlIdent(name);
-    const tables = await this.listTables();
-    if (!tables.includes(safe)) {
-      log3(`table "${safe}" not found, creating`);
-      await this.createTableWithRetry(buildCreateTableSql(safe, TASK_EVENTS_COLUMNS), safe);
-      log3(`table "${safe}" created`);
-      if (!tables.includes(safe))
-        this._tablesCache = [...tables, safe];
-    }
-    await this.healSchema(safe, TASK_EVENTS_COLUMNS);
-    await this.ensureLookupIndex(safe, "task_id_kpi_id", `("task_id", "kpi_id")`);
-  }
   /**
    * Create the goals table.
    *
@@ -1058,187 +990,10 @@ function normalize(row) {
   };
 }
 
-// dist/src/tasks/write.js
-import { randomUUID as randomUUID4 } from "node:crypto";
-
-// dist/src/tasks/kpi-validator.js
-function parseKpis(raw) {
-  if (raw == null || raw === "")
-    return [];
-  let arr;
-  if (typeof raw === "string") {
-    try {
-      arr = JSON.parse(raw);
-    } catch {
-      return [];
-    }
-  } else {
-    arr = raw;
-  }
-  if (!Array.isArray(arr))
-    return [];
-  const out = [];
-  for (const item of arr) {
-    const kpi = validateOne(item);
-    if (kpi)
-      out.push(kpi);
-  }
-  return out;
-}
-function validateOne(item) {
-  if (!isObject(item))
-    return null;
-  const kpi_id = safeStr(item.kpi_id);
-  const name = safeStr(item.name);
-  const target = num(item.target);
-  const unit = safeStr(item.unit);
-  const generated_by = safeStr(item.generated_by);
-  const generated_at = isoStr(item.generated_at);
-  if (kpi_id === null || name === null || target === null || unit === null || generated_by === null || generated_at === null) {
-    return null;
-  }
-  if (!Number.isInteger(target) || target <= 0) {
-    return null;
-  }
-  const out = {
-    kpi_id,
-    name,
-    target,
-    unit,
-    generated_by,
-    generated_at
-  };
-  const current = num(item.current);
-  if (current !== null)
-    out.current = current;
-  return out;
-}
-function isObject(v) {
-  return typeof v === "object" && v !== null && !Array.isArray(v);
-}
-function str(v) {
-  if (typeof v !== "string" || v.length === 0)
-    return null;
-  return v;
-}
-function safeStr(v) {
-  const s = str(v);
-  if (s === null)
-    return null;
-  if (/[\r\n\u2028\u2029\u0085]/.test(s))
-    return null;
-  return s;
-}
-function num(v) {
-  if (typeof v !== "number" || !Number.isFinite(v))
-    return null;
-  return v;
-}
-function isoStr(v) {
-  const s = safeStr(v);
-  if (s === null)
-    return null;
-  if (!/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?(Z|[+-]\d{2}:?\d{2})?$/.test(s)) {
-    return null;
-  }
-  return s;
-}
-
-// dist/src/tasks/read.js
-var SELECT_COLS2 = "id, task_id, text, scope, status, assigned_to, assigned_by, kpis, version, created_at, agent, plugin_version";
-async function listTasks(query, tableName, opts = {}) {
-  const safe = sqlIdent(tableName);
-  const rows = await query(`SELECT ${SELECT_COLS2} FROM "${safe}" ORDER BY version DESC, created_at DESC, id DESC`);
-  const latest = /* @__PURE__ */ new Map();
-  for (const r of rows) {
-    const row = normalize2(r);
-    if (!row)
-      continue;
-    if (!latest.has(row.task_id))
-      latest.set(row.task_id, row);
-  }
-  const scope = opts.scope ?? "all";
-  const status = opts.status ?? "active";
-  const current = opts.current_user;
-  const filtered = [...latest.values()].filter((row) => {
-    if (status !== "all" && row.status !== status)
-      return false;
-    if (scope === "mine") {
-      if (!current)
-        return false;
-      return row.assigned_to === current;
-    }
-    if (scope === "me") {
-      if (!current)
-        return false;
-      return row.scope === "me" && row.assigned_to === current;
-    }
-    if (scope === "team")
-      return row.scope === "team";
-    return true;
-  });
-  filtered.sort((a, b) => b.created_at.localeCompare(a.created_at) || b.id.localeCompare(a.id));
-  return filtered.slice(0, opts.limit ?? 10);
-}
-function normalize2(row) {
-  const vRaw = row.version;
-  const version = typeof vRaw === "number" ? vRaw : typeof vRaw === "string" ? Number(vRaw) : NaN;
-  if (!Number.isFinite(version))
-    return null;
-  return {
-    id: String(row.id ?? ""),
-    task_id: String(row.task_id ?? ""),
-    text: String(row.text ?? ""),
-    scope: String(row.scope ?? ""),
-    status: String(row.status ?? ""),
-    assigned_to: String(row.assigned_to ?? ""),
-    assigned_by: String(row.assigned_by ?? ""),
-    kpis: parseKpis(row.kpis),
-    version,
-    created_at: String(row.created_at ?? ""),
-    agent: String(row.agent ?? ""),
-    plugin_version: String(row.plugin_version ?? "")
-  };
-}
-
-// dist/src/events/append.js
-import { randomUUID as randomUUID5 } from "node:crypto";
-
-// dist/src/events/aggregate.js
-async function computeAllForTasks(query, tableName, taskIds) {
-  if (taskIds.length === 0)
-    return {};
-  const safe = sqlIdent(tableName);
-  const inList = taskIds.map((id) => `'${sqlStr(id)}'`).join(", ");
-  const rows = await query(`SELECT task_id, kpi_id, SUM(value) AS total FROM "${safe}" WHERE task_id IN (${inList}) GROUP BY task_id, kpi_id`);
-  const out = {};
-  for (const row of rows) {
-    const tid = typeof row.task_id === "string" ? row.task_id : "";
-    const kid = typeof row.kpi_id === "string" ? row.kpi_id : "";
-    if (!tid || !kid)
-      continue;
-    if (!out[tid])
-      out[tid] = {};
-    out[tid][kid] = normalizeTotal(row.total);
-  }
-  return out;
-}
-function normalizeTotal(raw) {
-  if (raw == null)
-    return 0;
-  if (typeof raw === "number")
-    return Number.isFinite(raw) ? raw : 0;
-  if (typeof raw === "string") {
-    const n = Number(raw);
-    return Number.isFinite(n) ? n : 0;
-  }
-  return 0;
-}
-
 // dist/src/hooks/shared/context-renderer.js
 async function renderContextBlock(query, input, opts = {}) {
   const maxRules = opts.maxRules ?? 10;
-  const maxTasks = opts.maxTasks ?? 10;
+  const maxGoals = opts.maxGoals ?? 10;
   const log7 = opts.log ?? (() => {
   });
   try {
@@ -1252,79 +1007,54 @@ async function renderContextBlock(query, input, opts = {}) {
       const rmsg = rulesErr instanceof Error ? rulesErr.message : String(rulesErr);
       log7(`render-context-block: rules unavailable (continuing): ${rmsg}`);
     }
-    let teamTasks = [];
-    let myTasks = [];
+    let goals = [];
     try {
-      teamTasks = await listTasks(query, input.tasksTable, {
-        scope: "team",
-        status: "active",
-        limit: Math.max(maxTasks * 4, maxTasks + 1)
-      });
-      myTasks = await listTasks(query, input.tasksTable, {
-        scope: "me",
-        status: "active",
-        current_user: input.currentUser,
-        limit: Math.max(maxTasks * 4, maxTasks + 1)
+      goals = await listOpenGoals(query, input.goalsTable, input.currentUser, {
+        limit: Math.max(maxGoals * 4, maxGoals + 1)
       });
-    } catch (tasksErr) {
-      const tmsg = tasksErr instanceof Error ? tasksErr.message : String(tasksErr);
-      log7(`render-context-block: tasks unavailable (continuing): ${tmsg}`);
+    } catch (goalsErr) {
+      const gmsg = goalsErr instanceof Error ? goalsErr.message : String(goalsErr);
+      log7(`render-context-block: goals unavailable (continuing): ${gmsg}`);
     }
-    const visibleTasks = mergeAndDedupTasks(teamTasks, myTasks);
     const rulesShown = rules.slice(0, maxRules);
     const rulesHidden = Math.max(0, rules.length - maxRules);
-    const tasksShown = visibleTasks.slice(0, maxTasks);
-    const tasksHidden = Math.max(0, visibleTasks.length - maxTasks);
-    const taskIds = tasksShown.map((t) => t.task_id);
-    let totals = {};
-    try {
-      totals = await computeAllForTasks(query, input.taskEventsTable, taskIds);
-    } catch (aggErr) {
-      const aggMsg = aggErr instanceof Error ? aggErr.message : String(aggErr);
-      log7(`render-context-block: aggregate failed (continuing with 0/target): ${aggMsg}`);
-    }
-    return formatBlock({
-      rules: rulesShown,
-      rulesHidden,
-      tasks: tasksShown,
-      tasksHidden,
-      totals,
-      currentUser: input.currentUser
-    });
+    const goalsShown = goals.slice(0, maxGoals);
+    const goalsHidden = Math.max(0, goals.length - maxGoals);
+    return formatBlock({ rules: rulesShown, rulesHidden, goals: goalsShown, goalsHidden });
   } catch (e) {
     const msg = e instanceof Error ? e.message : String(e);
     log7(`render-context-block: ${msg}`);
     return "";
   }
 }
-function mergeAndDedupTasks(teamTasks, myTasks) {
-  const winner = /* @__PURE__ */ new Map();
-  for (const t of [...teamTasks, ...myTasks]) {
-    const prev = winner.get(t.task_id);
-    if (!prev) {
-      winner.set(t.task_id, t);
+async function listOpenGoals(query, goalsTable, currentUser, opts = {}) {
+  const limit = opts.limit ?? 40;
+  const safe = sqlIdent(goalsTable);
+  const fullUser = currentUser.trim();
+  const shortUser = fullUser.split("@")[0] ?? fullUser;
+  const fullEq = sqlStr(fullUser);
+  const shortEq = sqlStr(shortUser);
+  const shortLike = sqlLike(shortUser);
+  const sql = `SELECT goal_id, owner, status, content FROM "${safe}" g1 WHERE (owner = '${fullEq}' OR owner = '${shortEq}' OR owner LIKE '${shortLike}@%') AND status IN ('opened', 'in_progress') AND version = (SELECT MAX(version) FROM "${safe}" g2 WHERE g2.goal_id = g1.goal_id) ORDER BY status ASC, created_at DESC LIMIT ${limit}`;
+  const rows = await query(sql);
+  const out = [];
+  for (const r of rows) {
+    const ownerNorm = String(r["owner"] ?? "").trim();
+    const ownerShort = ownerNorm.split("@")[0] ?? ownerNorm;
+    if (ownerNorm !== fullUser && ownerNorm !== shortUser && ownerShort !== shortUser) {
       continue;
     }
-    if (t.version > prev.version) {
-      winner.set(t.task_id, t);
-    } else if (t.version === prev.version && t.created_at > prev.created_at) {
-      winner.set(t.task_id, t);
-    }
+    out.push({
+      goal_id: String(r["goal_id"] ?? ""),
+      status: String(r["status"] ?? ""),
+      content: String(r["content"] ?? "")
+    });
   }
-  const merged = [...winner.values()];
-  merged.sort((a, b) => {
-    const aMe = a.scope === "me" ? 0 : 1;
-    const bMe = b.scope === "me" ? 0 : 1;
-    if (aMe !== bMe)
-      return aMe - bMe;
-    return b.created_at.localeCompare(a.created_at);
-  });
-  return merged;
+  return out;
 }
 function formatBlock(input) {
-  if (input.rules.length === 0 && input.tasks.length === 0) {
+  if (input.rules.length === 0 && input.goals.length === 0)
     return "";
-  }
   const lines = [];
   if (input.rules.length > 0) {
     lines.push(`=== HIVEMIND RULES (${input.rules.length} active) ===`);
@@ -1336,41 +1066,42 @@ function formatBlock(input) {
     }
     lines.push("");
   }
-  if (input.tasks.length > 0) {
-    lines.push(`=== HIVEMIND TASKS (${input.tasks.length} active) ===`);
-    for (const t of input.tasks) {
-      lines.push(formatTaskLine(t, input.totals[t.task_id] ?? {}, input.currentUser));
+  if (input.goals.length > 0) {
+    const inProgress = input.goals.filter((g) => g.status === "in_progress").length;
+    const opened = input.goals.filter((g) => g.status === "opened").length;
+    lines.push(`=== HIVEMIND GOALS (${inProgress} in_progress, ${opened} opened) ===`);
+    for (const g of input.goals) {
+      const firstLine = sanitizeForInject(firstNonEmptyLine(g.content));
+      const tag = g.status === "in_progress" ? "[in_progress]" : "[opened]     ";
+      lines.push(`${tag} ${g.goal_id}: ${firstLine}`);
     }
-    if (input.tasksHidden > 0) {
-      lines.push(`(${input.tasksHidden} more \u2014 run 'hivemind tasks list' to see all)`);
+    if (input.goalsHidden > 0) {
+      lines.push(`(${input.goalsHidden} more \u2014 run 'hivemind goal list --mine' to see all)`);
     }
     lines.push("");
   }
   lines.push("=== HIVEMIND HOW-TO ===");
-  lines.push("- Rules above are team principles. Treat any action that would violate one as a critical error and surface it to the user before proceeding.");
-  lines.push("- Tasks above are your current work. Use 'hivemind tasks progress <task-id> <kpi-id> --value N' to record progress on a KPI.");
-  lines.push("- Run 'hivemind rules list' / 'hivemind tasks list' for the full inventories beyond what's shown here.");
+  if (input.rules.length > 0) {
+    lines.push("- Rules above are team principles. Treat any action that would violate one as a critical error and surface it to the user before proceeding.");
+  }
+  if (input.goals.length > 0) {
+    lines.push("- Goals above are your current open work items. Move a goal forward by `mv`-ing its file between memory/goal/<user>/{opened,in_progress,closed}/ (claude-code/codex) or `hivemind goal progress <goal_id> <status>` (cursor/hermes/pi).");
+  }
+  lines.push("- Run 'hivemind rules list' / 'hivemind goal list --mine' for the full inventories beyond what's shown here.");
   return lines.join("\n");
 }
-function formatTaskLine(task, kpiTotals, currentUser) {
-  const tag = task.scope === "team" ? "[team]" : "[me]";
-  const highlight = task.scope === "team" && task.assigned_to === currentUser ? " \u2605YOU" : "";
-  const kpiSummary = formatKpiSummary(task.kpis, kpiTotals);
-  return `${tag} ${task.task_id}: ${sanitizeForInject(task.text)}${highlight}${kpiSummary}`;
+function firstNonEmptyLine(content) {
+  for (const raw of content.split(/\r?\n/)) {
+    const trimmed = raw.trim();
+    if (trimmed.length > 0)
+      return trimmed;
+  }
+  return "(empty)";
 }
 function sanitizeForInject(text) {
   return text.replace(LINE_TERMINATOR_RE, "\\n");
 }
 var LINE_TERMINATOR_RE = /\r\n?|[\n\u2028\u2029\u0085]/g;
-function formatKpiSummary(kpis, totals) {
-  if (kpis.length === 0)
-    return "";
-  const parts = kpis.map((k) => {
-    const current = totals[k.kpi_id] ?? 0;
-    return `${sanitizeForInject(k.name)}: ${current}/${k.target} ${sanitizeForInject(k.unit)}`;
-  });
-  return ` | ${parts.join(", ")}`;
-}
 
 // dist/src/cli/skillify-spec.js
 var SKILLIFY_COMMANDS = [
@@ -2332,7 +2063,7 @@ Commands (invoke via your Shell / terminal / Bash tool):
   hivemind kpi bump <goal_id> <kpi_id> <delta>
       Increment (positive int) or decrement (negative) the current value of one KPI.
 
-Workflow when the user expresses a goal:
+Workflow when the user expresses a goal OR a task / todo / work item (they are the same thing \u2014 the goals system absorbed the legacy hivemind tasks CLI):
   1. \`hivemind goal add "<short description>"\` \u2014 capture stdout as goal_id.
   2. ONLY if the user explicitly asks for KPIs: \`hivemind kpi add <goal_id> <slug> <target> <unit>\` per KPI.
   3. Tell the user the goal_id and that it is now visible to the team.
@@ -2437,7 +2168,7 @@ async function main() {
   const current = getInstalledVersion(__bundleDir, ".claude-plugin");
   const pluginVersion = current ?? "";
   const captureEnabled = process.env.HIVEMIND_CAPTURE !== "false";
-  let rulesTasksBlock = "";
+  let rulesBlock = "";
   if (creds?.token) {
     try {
       const config = loadConfig();
@@ -2453,10 +2184,9 @@ async function main() {
         } else {
           log6("placeholder + schema ensure skipped (HIVEMIND_CAPTURE=false)");
         }
-        rulesTasksBlock = await renderContextBlock((sql) => api.query(sql), {
+        rulesBlock = await renderContextBlock((sql) => api.query(sql), {
           rulesTable: config.rulesTableName,
-          tasksTable: config.tasksTableName,
-          taskEventsTable: config.taskEventsTableName,
+          goalsTable: config.goalsTableName,
           currentUser: config.userName
         }, { log: log6 });
       }
@@ -2481,9 +2211,9 @@ Not logged in to Deeplake. Run: hivemind login${localMinedNote}${versionNotice}`
   const baseWithGoals = creds?.token ? `${baseContext}
 
 ${GOALS_INSTRUCTIONS_CLI}` : baseContext;
-  const additionalContext = rulesTasksBlock ? `${baseWithGoals}
+  const additionalContext = rulesBlock ? `${baseWithGoals}
 
-${rulesTasksBlock}` : baseWithGoals;
+${rulesBlock}` : baseWithGoals;
   console.log(JSON.stringify({ additional_context: additionalContext }));
 }
 main().catch((e) => {