;
export type EntityType = EntityLabel["entityType"];
diff --git a/packages/core/src/generated/lexicon-records.ts b/packages/core/src/generated/lexicon-records.ts
index a60e47a..76fbc8c 100644
--- a/packages/core/src/generated/lexicon-records.ts
+++ b/packages/core/src/generated/lexicon-records.ts
@@ -107,6 +107,8 @@ export interface SphereLabelRecord {
subject: string;
/** Label names assigned to the entity. Replaces any previous set. */
labels: string[];
+ /** datetime */
+ updatedAt?: string;
}
export interface SphereMemberRecord {
diff --git a/packages/core/src/sphere/index.ts b/packages/core/src/sphere/index.ts
index 6ea0af5..d9fd3ec 100644
--- a/packages/core/src/sphere/index.ts
+++ b/packages/core/src/sphere/index.ts
@@ -18,6 +18,8 @@ export {
getLabelsForEntities,
setEntityLabels,
resolveLabelIdsByName,
+ getOrCreateLabelRkey,
+ upsertLabelRkey,
} from "./label-operations.ts";
export type { LabelInfo } from "./label-operations.ts";
export { setEntityLabelsSchema } from "./schemas.ts";
diff --git a/packages/core/src/sphere/label-operations.ts b/packages/core/src/sphere/label-operations.ts
index 74bcd11..a7983e5 100644
--- a/packages/core/src/sphere/label-operations.ts
+++ b/packages/core/src/sphere/label-operations.ts
@@ -1,6 +1,6 @@
import { eq, and, max, inArray, asc, count } from "../db/drizzle.ts";
import { getDb } from "../db/index.ts";
-import { sphereLabels, entityLabels } from "../db/schema/index.ts";
+import { sphereLabels, entityLabels, labelPdsRecords } from "../db/schema/index.ts";
import type { SphereLabel, EntityType } from "../db/schema/index.ts";
import { generateRkey } from "../pds.ts";
@@ -134,6 +134,49 @@ export function getLabelsForEntities(
return result;
}
+/** Get or create a stable rkey for a user's label PDS record on an entity. */
+export function getOrCreateLabelRkey(
+ entityId: string,
+ entityType: EntityType,
+ actorDid: string,
+): string {
+ const db = getDb();
+ const existing = db
+ .select({ rkey: labelPdsRecords.rkey })
+ .from(labelPdsRecords)
+ .where(
+ and(
+ eq(labelPdsRecords.entityId, entityId),
+ eq(labelPdsRecords.entityType, entityType),
+ eq(labelPdsRecords.actorDid, actorDid),
+ ),
+ )
+ .get();
+
+ if (existing) return existing.rkey;
+
+ const rkey = generateRkey();
+ db.insert(labelPdsRecords).values({ entityId, entityType, actorDid, rkey }).run();
+ return rkey;
+}
+
+/** Save a label PDS record rkey received from the network. */
+export function upsertLabelRkey(
+ entityId: string,
+ entityType: EntityType,
+ actorDid: string,
+ rkey: string,
+): void {
+ getDb()
+ .insert(labelPdsRecords)
+ .values({ entityId, entityType, actorDid, rkey })
+ .onConflictDoUpdate({
+ target: [labelPdsRecords.entityId, labelPdsRecords.entityType, labelPdsRecords.actorDid],
+ set: { rkey },
+ })
+ .run();
+}
+
/** Replace all labels for an entity with the given label IDs.
* Validates that every label belongs to the specified sphere. */
export function setEntityLabels(
diff --git a/packages/core/src/sphere/operations.ts b/packages/core/src/sphere/operations.ts
index 5645f91..a0d689f 100644
--- a/packages/core/src/sphere/operations.ts
+++ b/packages/core/src/sphere/operations.ts
@@ -2,6 +2,7 @@ import { eq, and, like } from "drizzle-orm";
import { getDb } from "../db/index.ts";
import { spheres, sphereMembers, spherePermissions } from "../db/schema/index.ts";
import { parseAtUri } from "../indexer/uri.ts";
+import { tidToDate } from "../pds.ts";
import { ROLES } from "../permissions/roles.ts";
import { checkPermission } from "../permissions/check.ts";
@@ -302,7 +303,8 @@ export type LabelHandler = (
subjectUri: string,
labelNames: string[],
actorDid: string,
- tid: string,
+ rkey: string,
+ updatedAt: string,
) => boolean;
const labelHandlers: LabelHandler[] = [];
@@ -319,9 +321,10 @@ export function indexLabelAssignment(
): void {
const subjectUri = record.subject as string;
const labels = record.labels as string[];
+ const updatedAt = (record.updatedAt as string) ?? tidToDate(rkey);
if (!subjectUri || !Array.isArray(labels)) return;
for (const handler of labelHandlers) {
- if (handler(subjectUri, labels, did, rkey)) return;
+ if (handler(subjectUri, labels, did, rkey, updatedAt)) return;
}
}
diff --git a/packages/feature-requests/src/api/requests.ts b/packages/feature-requests/src/api/requests.ts
index fcdf0d7..4221ebf 100644
--- a/packages/feature-requests/src/api/requests.ts
+++ b/packages/feature-requests/src/api/requests.ts
@@ -21,6 +21,7 @@ import {
getLabelsForEntities,
setEntityLabels,
setEntityLabelsSchema,
+ getOrCreateLabelRkey,
} from "@exosphere/core/sphere";
const COLLECTION = "site.exosphere.featureRequest.entry";
@@ -201,14 +202,19 @@ app.post("/", requireAuth, requirePermission("feature-requests", "create"), asyn
// Write label PDS record if labels were set and entity has a PDS URI
if (pdsUri && labels.length > 0) {
const session = c.var.session;
- const labelTid = generateRkey();
- const labelPdsUri = await putPdsRecord(session, LABEL_COLLECTION, labelTid, {
+ const now = new Date().toISOString();
+ const labelRkey = getOrCreateLabelRkey(id, "feature-request", did);
+ const labelPdsUri = await putPdsRecord(session, LABEL_COLLECTION, labelRkey, {
subject: pdsUri,
labels: labels.map((l) => l.name),
+ updatedAt: now,
});
if (labelPdsUri) {
const db = getDb();
- db.update(featureRequests).set({ labelTid }).where(eq(featureRequests.id, id)).run();
+ db.update(featureRequests)
+ .set({ labelUpdatedAt: now })
+ .where(eq(featureRequests.id, id))
+ .run();
}
}
@@ -438,16 +444,21 @@ app.post("/:id/labels", requireAuth, async (c) => {
setEntityLabels(sphereId, id, "feature-request", parsed.data.labelIds);
const labels = getLabelsForEntities([id], "feature-request").get(id) ?? [];
- // Write label PDS record
+ // Write label PDS record (reuse existing rkey if this user already wrote one)
if (c.var.sphereVisibility === "public" && existing.pdsUri) {
const session = c.var.session;
- const labelTid = generateRkey();
- const labelPdsUri = await putPdsRecord(session, LABEL_COLLECTION, labelTid, {
+ const now = new Date().toISOString();
+ const labelRkey = getOrCreateLabelRkey(id, "feature-request", did);
+ const labelPdsUri = await putPdsRecord(session, LABEL_COLLECTION, labelRkey, {
subject: existing.pdsUri,
labels: labels.map((l) => l.name),
+ updatedAt: now,
});
if (labelPdsUri) {
- db.update(featureRequests).set({ labelTid }).where(eq(featureRequests.id, id)).run();
+ db.update(featureRequests)
+ .set({ labelUpdatedAt: now })
+ .where(eq(featureRequests.id, id))
+ .run();
}
}
diff --git a/packages/feature-requests/src/db/schema.ts b/packages/feature-requests/src/db/schema.ts
index 5e4d29e..eba02fc 100644
--- a/packages/feature-requests/src/db/schema.ts
+++ b/packages/feature-requests/src/db/schema.ts
@@ -29,7 +29,7 @@ export const featureRequests = sqliteTable(
pdsUri: text("pds_uri"),
hiddenAt: text("hidden_at"),
moderatedBy: text("moderated_by"),
- labelTid: text("label_tid"),
+ labelUpdatedAt: text("label_updated_at"),
updatedAt: text("updated_at")
.notNull()
.default(sql`(datetime('now'))`),
diff --git a/packages/feature-requests/src/indexer.ts b/packages/feature-requests/src/indexer.ts
index 9452e31..8a79a1b 100644
--- a/packages/feature-requests/src/indexer.ts
+++ b/packages/feature-requests/src/indexer.ts
@@ -6,6 +6,7 @@ import {
getActiveMemberRole,
setEntityLabels,
resolveLabelIdsByName,
+ upsertLabelRkey,
} from "@exosphere/core/sphere";
import { checkPermission } from "@exosphere/core/permissions";
import { getDb } from "@exosphere/core/db";
@@ -38,7 +39,7 @@ const STATUS_COLLECTION = "site.exosphere.featureRequest.status";
registerModerationHandler(handleFeatureRequestModeration);
// Register label handler: resolve label PDS records targeting feature requests
-registerLabelHandler((subjectUri, labelNames, actorDid, tid) => {
+registerLabelHandler((subjectUri, labelNames, actorDid, rkey, updatedAt) => {
const parsed = parseAtUri(subjectUri);
if (!parsed || parsed.collection !== COLLECTION) return false;
@@ -48,15 +49,15 @@ registerLabelHandler((subjectUri, labelNames, actorDid, tid) => {
id: featureRequests.id,
sphereId: featureRequests.sphereId,
authorDid: featureRequests.authorDid,
- labelTid: featureRequests.labelTid,
+ labelUpdatedAt: featureRequests.labelUpdatedAt,
})
.from(featureRequests)
.where(eq(featureRequests.id, parsed.rkey))
.get();
if (!fr) return false;
- // TID-based ordering: skip if we already have a newer label record
- if (fr.labelTid && fr.labelTid >= tid) return true;
+ // Timestamp-based ordering: skip if we already have a newer label record
+ if (fr.labelUpdatedAt && fr.labelUpdatedAt >= updatedAt) return true;
// Permission check: author can always set labels, otherwise need changeStatus
if (fr.authorDid !== actorDid) {
@@ -66,7 +67,11 @@ registerLabelHandler((subjectUri, labelNames, actorDid, tid) => {
const labelIds = resolveLabelIdsByName(fr.sphereId, labelNames);
setEntityLabels(fr.sphereId, fr.id, "feature-request", labelIds);
- db.update(featureRequests).set({ labelTid: tid }).where(eq(featureRequests.id, fr.id)).run();
+ upsertLabelRkey(fr.id, "feature-request", actorDid, rkey);
+ db.update(featureRequests)
+ .set({ labelUpdatedAt: updatedAt })
+ .where(eq(featureRequests.id, fr.id))
+ .run();
return true;
});
diff --git a/packages/feature-requests/src/types.ts b/packages/feature-requests/src/types.ts
index ef1c082..949039d 100644
--- a/packages/feature-requests/src/types.ts
+++ b/packages/feature-requests/src/types.ts
@@ -1,10 +1,6 @@
export type { FeatureRequest, FeatureRequestComment, FeatureRequestStatus } from "./db/schema.ts";
export type { Status, SettableStatus } from "./schemas/feature-request.ts";
-export {
- statuses,
- settableStatuses,
- statusLabels,
-} from "./schemas/feature-request.ts";
+export { statuses, settableStatuses, statusLabels } from "./schemas/feature-request.ts";
import type { FeatureRequest, FeatureRequestComment } from "./db/schema.ts";
import type { LabelInfo } from "@exosphere/core/sphere";
diff --git a/packages/kanban/src/api/tasks.ts b/packages/kanban/src/api/tasks.ts
index 437796a..b1e2c50 100644
--- a/packages/kanban/src/api/tasks.ts
+++ b/packages/kanban/src/api/tasks.ts
@@ -32,6 +32,7 @@ import {
getLabelsForEntities,
setEntityLabels,
setEntityLabelsSchema,
+ getOrCreateLabelRkey,
} from "@exosphere/core/sphere";
const COLLECTION = "site.exosphere.kanban.entry";
@@ -220,14 +221,16 @@ app.post("/", requireAuth, requirePermission(MODULE, "create"), async (c) => {
// Write label PDS record if labels were set and entity has a PDS URI
if (pdsUri && labels.length > 0) {
const session = c.var.session;
- const labelTid = generateRkey();
- const labelPdsUri = await putPdsRecord(session, LABEL_COLLECTION, labelTid, {
+ const now = new Date().toISOString();
+ const labelRkey = getOrCreateLabelRkey(id, "kanban-task", did);
+ const labelPdsUri = await putPdsRecord(session, LABEL_COLLECTION, labelRkey, {
subject: pdsUri,
labels: labels.map((l) => l.name),
+ updatedAt: now,
});
if (labelPdsUri) {
const db = getDb();
- db.update(kanbanTasks).set({ labelTid }).where(eq(kanbanTasks.id, id)).run();
+ db.update(kanbanTasks).set({ labelUpdatedAt: now }).where(eq(kanbanTasks.id, id)).run();
}
}
@@ -616,16 +619,18 @@ app.post("/:id/labels", requireAuth, async (c) => {
setEntityLabels(sphereId, id, "kanban-task", parsed.data.labelIds);
const labels = getLabelsForEntities([id], "kanban-task").get(id) ?? [];
- // Write label PDS record
+ // Write label PDS record (reuse existing rkey if this user already wrote one)
if (c.var.sphereVisibility === "public" && existing.pdsUri) {
const session = c.var.session;
- const labelTid = generateRkey();
- const labelPdsUri = await putPdsRecord(session, LABEL_COLLECTION, labelTid, {
+ const now = new Date().toISOString();
+ const labelRkey = getOrCreateLabelRkey(id, "kanban-task", did);
+ const labelPdsUri = await putPdsRecord(session, LABEL_COLLECTION, labelRkey, {
subject: existing.pdsUri,
labels: labels.map((l) => l.name),
+ updatedAt: now,
});
if (labelPdsUri) {
- db.update(kanbanTasks).set({ labelTid }).where(eq(kanbanTasks.id, id)).run();
+ db.update(kanbanTasks).set({ labelUpdatedAt: now }).where(eq(kanbanTasks.id, id)).run();
}
}
diff --git a/packages/kanban/src/db/schema.ts b/packages/kanban/src/db/schema.ts
index 54caaed..571cb35 100644
--- a/packages/kanban/src/db/schema.ts
+++ b/packages/kanban/src/db/schema.ts
@@ -40,7 +40,7 @@ export const kanbanTasks = sqliteTable(
pdsUri: text("pds_uri"),
hiddenAt: text("hidden_at"),
moderatedBy: text("moderated_by"),
- labelTid: text("label_tid"),
+ labelUpdatedAt: text("label_updated_at"),
updatedAt: text("updated_at")
.notNull()
.default(sql`(datetime('now'))`),
diff --git a/packages/kanban/src/indexer.ts b/packages/kanban/src/indexer.ts
index e5f028e..05553bf 100644
--- a/packages/kanban/src/indexer.ts
+++ b/packages/kanban/src/indexer.ts
@@ -6,6 +6,7 @@ import {
getActiveMemberRole,
setEntityLabels,
resolveLabelIdsByName,
+ upsertLabelRkey,
} from "@exosphere/core/sphere";
import { checkPermission } from "@exosphere/core/permissions";
import { getDb } from "@exosphere/core/db";
@@ -32,7 +33,7 @@ const STATUS_COLLECTION = "site.exosphere.kanban.status";
registerModerationHandler(handleKanbanModeration);
// Register label handler: resolve label PDS records targeting kanban tasks
-registerLabelHandler((subjectUri, labelNames, actorDid, tid) => {
+registerLabelHandler((subjectUri, labelNames, actorDid, rkey, updatedAt) => {
const parsed = parseAtUri(subjectUri);
if (!parsed || parsed.collection !== COLLECTION) return false;
@@ -42,15 +43,15 @@ registerLabelHandler((subjectUri, labelNames, actorDid, tid) => {
id: kanbanTasks.id,
sphereId: kanbanTasks.sphereId,
authorDid: kanbanTasks.authorDid,
- labelTid: kanbanTasks.labelTid,
+ labelUpdatedAt: kanbanTasks.labelUpdatedAt,
})
.from(kanbanTasks)
.where(eq(kanbanTasks.id, parsed.rkey))
.get();
if (!task) return false;
- // TID-based ordering: skip if we already have a newer label record
- if (task.labelTid && task.labelTid >= tid) return true;
+ // Timestamp-based ordering: skip if we already have a newer label record
+ if (task.labelUpdatedAt && task.labelUpdatedAt >= updatedAt) return true;
// Permission check: author can always set labels, otherwise need manageTasks
if (task.authorDid !== actorDid) {
@@ -60,7 +61,11 @@ registerLabelHandler((subjectUri, labelNames, actorDid, tid) => {
const labelIds = resolveLabelIdsByName(task.sphereId, labelNames);
setEntityLabels(task.sphereId, task.id, "kanban-task", labelIds);
- db.update(kanbanTasks).set({ labelTid: tid }).where(eq(kanbanTasks.id, task.id)).run();
+ upsertLabelRkey(task.id, "kanban-task", actorDid, rkey);
+ db.update(kanbanTasks)
+ .set({ labelUpdatedAt: updatedAt })
+ .where(eq(kanbanTasks.id, task.id))
+ .run();
return true;
});
diff --git a/packages/kanban/src/ui/components/column-manager.tsx b/packages/kanban/src/ui/components/column-manager.tsx
index fb6cdcb..b6bec55 100644
--- a/packages/kanban/src/ui/components/column-manager.tsx
+++ b/packages/kanban/src/ui/components/column-manager.tsx
@@ -156,81 +156,81 @@ export function ColumnManager({
- {editingId.value === col.id ? (
- (editLabel.value = (e.target as HTMLInputElement).value)}
- onKeyDown={(e) => {
- if (e.key === "Enter") handleRename(col.id);
- if (e.key === "Escape") editingId.value = null;
- }}
- autoFocus
- />
- ) : (
-
- {col.label} ({col.slug})
-
- )}
+ {editingId.value === col.id ? (
+ (editLabel.value = (e.target as HTMLInputElement).value)}
+ onKeyDown={(e) => {
+ if (e.key === "Enter") handleRename(col.id);
+ if (e.key === "Escape") editingId.value = null;
+ }}
+ autoFocus
+ />
+ ) : (
+
+ {col.label} ({col.slug})
+
+ )}
- {editingId.value === col.id ? (
- <>
+ {editingId.value === col.id ? (
+ <>
+
+
+
+ ) : (
+ <>
+
+ {columns.length > 1 && (
+
+ )}
+
+ )}
+
+
+ {deletingId.value === col.id && (
+
+ Move tasks to:
+
-
)}
-
- {deletingId.value === col.id && (
-
- Move tasks to:
-
-
-
-
- )}
-
))}
{dropIndex.value === columns.length && }
diff --git a/packages/kanban/src/ui/ui.css.ts b/packages/kanban/src/ui/ui.css.ts
index 28676ac..d8c31f5 100644
--- a/packages/kanban/src/ui/ui.css.ts
+++ b/packages/kanban/src/ui/ui.css.ts
@@ -155,7 +155,6 @@ export const detailContent = style({
gap: vars.space.xl,
});
-
export const titleRow = style({
display: "flex",
alignItems: "center",