@undefineds.co/models 0.2.38 → 0.2.39

package/README.md

@@ -163,14 +163,13 @@ Contact
   entity: Agent context-root URI
 
 Agent
-  id: /.data/agents/__secretary__/index.ttl#this
-  root: /.data/agents/__secretary__/
-  meta: /.data/agents/__secretary__/.meta
+  root: /agents/__secretary__/
+  meta: /agents/__secretary__/.meta
 ```
 
 External people, services, or bots may appear as Contacts without being LinX
 Agents. If something is modeled as an executable LinX Agent, the Agent resource
-identity is `index.ttl#this` inside the context-root container.
+identity is the context-root container itself.
 
 ## Resource Ownership
 
@@ -204,7 +203,7 @@ Representative paths:
 /.data/chat/{chatId}/index.ttl#this
 /.data/chat/{chatId}/index.ttl#{threadId}
 /.data/chat/{chatId}/{yyyy}/{MM}/{dd}/messages.ttl#{messageId}
-/.data/agents/{agentId}/index.ttl#this
+/agents/{agentId}/
 /.data/sessions/{yyyy}/{MM}/{dd}/{sessionId}.ttl
 /settings/providers/{providerId}.ttl
 /settings/providers/{providerId}.ttl#{modelId}

package/dist/agent.schema.js

@@ -1,8 +1,7 @@
 import { boolean, object, podTable, string, integer, timestamp, text, real, uri, id } from "@undefineds.co/drizzle-solid";
 import { UDFS, DCTerms, FOAF, VCARD } from "./namespaces.js";
-import { agentResourceId } from "./resource-identity.js";
 export const agentResource = podTable("agent", {
-    id: id("id").default((key) => agentResourceId(key)),
+    id: id("id").default("{key}/"),
     name: string("name").predicate(FOAF.name).notNull(),
     description: text("description").predicate(DCTerms.description),
     avatarUrl: uri("avatarUrl").predicate(VCARD.hasPhoto),
@@ -30,8 +29,8 @@ export const agentResource = podTable("agent", {
     updatedAt: timestamp("updatedAt").predicate(DCTerms.modified).notNull().defaultNow(),
     deletedAt: timestamp("deletedAt").predicate(UDFS.deletedAt),
 }, {
-    base: '/.data/agents/',
-    sparqlEndpoint: '/.data/agents/-/sparql',
+    base: '/agents/',
+    sparqlEndpoint: '/agents/-/sparql',
     type: FOAF.Agent,
     namespace: UDFS,
 });

package/dist/chat.repository.d.ts

@@ -1,73 +1,12 @@
-export declare const chatRepository: import("@undefineds.co/drizzle-solid/dist/core/repository").PodRepositoryDescriptor<import("@undefineds.co/drizzle-solid/dist/core/schema").PodTableWithColumns<import("@undefineds.co/drizzle-solid/dist/core/schema").ResolvedColumns<{
-    id: import("@undefineds.co/drizzle-solid/dist/core/schema").PodStringColumn<false, false>;
-    title: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, true, false>;
-    description: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, false, false>;
-    avatarUrl: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
-    author: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
-    status: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, true, true>;
-    starred: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"boolean", null, false, true>;
-    muted: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"boolean", null, false, true>;
-    unreadCount: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"integer", null, false, true>;
-    contact: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
-    participants: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"array", "uri", false, false>;
-    metadata: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"object", null, false, false>;
-    lastActiveAt: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"datetime", null, false, false>;
-    lastMessage: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
-    lastMessagePreview: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, false, false>;
-    createdAt: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"datetime", null, true, true>;
-    updatedAt: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"datetime", null, true, true>;
-}>>, {
+import { definePodRepository } from './repository';
+import { chatResource, type ChatRow, type ChatInsert, type ChatUpdate } from './chat.schema';
+export declare function buildChatRepositoryTarget(chatIdOrRef: string): {
     id: string;
-    title: string;
-    description: string;
-    avatarUrl: string;
-    author: string;
-    status: string;
-    starred: boolean;
-    muted: boolean;
-    unreadCount: number;
-    contact: string;
-    participants: string[];
-    metadata: Record<string, unknown>;
-    lastActiveAt: Date;
-    lastMessage: string;
-    lastMessagePreview: string;
-    createdAt: Date;
-    updatedAt: Date;
-}, {
-    title: string;
-    id?: string | undefined;
-    description?: string | undefined;
-    avatarUrl?: string | undefined;
-    author?: string | undefined;
-    status?: string | undefined;
-    starred?: boolean | undefined;
-    muted?: boolean | undefined;
-    unreadCount?: number | undefined;
-    contact?: string | undefined;
-    participants?: string[] | undefined;
-    metadata?: Record<string, unknown> | undefined;
-    lastActiveAt?: Date | undefined;
-    lastMessage?: string | undefined;
-    lastMessagePreview?: string | undefined;
-    createdAt?: Date | undefined;
-    updatedAt?: Date | undefined;
-}, {
-    id?: string | null | undefined;
-    title?: string | undefined;
-    description?: string | null | undefined;
-    avatarUrl?: string | null | undefined;
-    author?: string | null | undefined;
-    status?: string | undefined;
-    starred?: boolean | null | undefined;
-    muted?: boolean | null | undefined;
-    unreadCount?: number | null | undefined;
-    contact?: string | null | undefined;
-    participants?: string[] | null | undefined;
-    metadata?: Record<string, unknown> | null | undefined;
-    lastActiveAt?: Date | null | undefined;
-    lastMessage?: string | null | undefined;
-    lastMessagePreview?: string | null | undefined;
-    createdAt?: Date | undefined;
-    updatedAt?: Date | undefined;
-}, Record<string, unknown>>;
+};
+export declare function buildChatRepositoryIri(webIdOrPodUrl: string, chatIdOrRef: string): string;
+export declare function readChatRepositoryId(chatRef: string | null | undefined): string | null;
+export declare const chatRepository: ReturnType<typeof definePodRepository<typeof chatResource, ChatRow, ChatInsert, ChatUpdate>> & {
+    target: typeof buildChatRepositoryTarget;
+    iri: typeof buildChatRepositoryIri;
+    idFromRef: typeof readChatRepositoryId;
+};

package/dist/chat.repository.js

@@ -1,8 +1,23 @@
 import { definePodRepository } from './repository.js';
 import { chatResource } from './chat.schema.js';
+import { extractChatIdFromChatRef } from './chat.utils.js';
+export function buildChatRepositoryTarget(chatIdOrRef) {
+    return {
+        id: extractChatIdFromChatRef(chatIdOrRef) ?? chatIdOrRef,
+    };
+}
+export function buildChatRepositoryIri(webIdOrPodUrl, chatIdOrRef) {
+    return chatResource.buildIri(webIdOrPodUrl, buildChatRepositoryTarget(chatIdOrRef));
+}
+export function readChatRepositoryId(chatRef) {
+    return extractChatIdFromChatRef(chatRef);
+}
 export const chatRepository = definePodRepository({
     namespace: 'chat',
     resource: chatResource,
     searchableFields: ['title', 'description'],
     defaultSort: { field: 'lastActiveAt', direction: 'desc' },
 });
+chatRepository.target = buildChatRepositoryTarget;
+chatRepository.iri = buildChatRepositoryIri;
+chatRepository.idFromRef = readChatRepositoryId;

package/dist/chat.schema.d.ts

@@ -27,6 +27,7 @@ export interface ChatMetadata {
  */
 export declare const chatResource: import("@undefineds.co/drizzle-solid/dist/core/schema").PodTableWithColumns<import("@undefineds.co/drizzle-solid/dist/core/schema").ResolvedColumns<{
     id: import("@undefineds.co/drizzle-solid/dist/core/schema").PodStringColumn<false, false>;
+    rdfType: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"array", "uri", true, true>;
     title: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, true, false>;
     description: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, false, false>;
     avatarUrl: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
@@ -46,6 +47,7 @@ export declare const chatResource: import("@undefineds.co/drizzle-solid/dist/cor
 }>>;
 export declare const chatTable: import("@undefineds.co/drizzle-solid/dist/core/schema").PodTableWithColumns<import("@undefineds.co/drizzle-solid/dist/core/schema").ResolvedColumns<{
     id: import("@undefineds.co/drizzle-solid/dist/core/schema").PodStringColumn<false, false>;
+    rdfType: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"array", "uri", true, true>;
     title: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, true, false>;
     description: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, false, false>;
     avatarUrl: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;

package/dist/chat.schema.js

@@ -1,5 +1,5 @@
 import { boolean, object, podTable, string, text, timestamp, uri, id, integer } from '@undefineds.co/drizzle-solid';
-import { UDFS, DCTerms, SCHEMA, MEETING, WF } from './namespaces.js';
+import { UDFS, DCTerms, SCHEMA, MEETING, WF, RDF, SIOC } from './namespaces.js';
 export const ChatStatus = {
     ACTIVE: 'active',
     ARCHIVED: 'archived',
@@ -24,6 +24,9 @@ export const ChatStatus = {
  */
 export const chatResource = podTable('chats', {
     id: id('id').default('{key}/index.ttl#this'),
+    // Resource config writes mee:LongChat; keep sioc:Container explicit so
+    // thread.parent can use sioc:has_parent for Chat and Task containers.
+    rdfType: uri('rdfType').array().predicate(RDF.type).notNull().default([SIOC.Container]),
     // Display
     title: string('title').predicate(DCTerms.title).notNull(),
     description: string('description').predicate(DCTerms.description),

package/dist/chat.utils.d.ts

@@ -13,4 +13,3 @@ export declare function buildChatTargetRef(chatIdOrRef: string): string;
 export declare function extractThreadIdFromThreadRef(threadRef: string | null | undefined): string | null;
 export declare function extractChatThreadRef(uri: string | null | undefined): ChatThreadRef;
 export declare function extractChatTargetRef(uri: string | null | undefined): ChatTargetRef;
-export declare function resolveThreadChatId(thread: Pick<Record<string, unknown>, 'chat'> | null | undefined): string | null;

package/dist/chat.utils.js

@@ -72,6 +72,3 @@ export function extractChatTargetRef(uri) {
     }
     return { chatId: null, threadId: null, messageId: null };
 }
-export function resolveThreadChatId(thread) {
-    return extractChatIdFromChatRef(typeof thread?.chat === 'string' ? thread.chat : null);
-}

package/dist/fixtures/contracts-chat-contact.js

@@ -12,7 +12,7 @@ export const fixtureContactAgentWorkspace = {
     name: 'Secretary@linx',
     rdfType: ContactClass.AGENT,
     contactType: 'agent',
-    entity: 'https://pod.example/.data/agents/__secretary__/index.ttl#this',
+    entity: 'https://pod.example/agents/__secretary__/',
     isPublic: false,
 };
 export const fixtureChatDirectAI = {
@@ -28,7 +28,7 @@ export const fixtureChatDirectAI = {
 };
 export const fixtureThreadDirectAI = {
     id: 'thread-001',
-    chat: 'https://pod.example/.data/chat/chat-direct-ai-1/index.ttl#this',
+    parent: 'https://pod.example/.data/chat/chat-direct-ai-1/index.ttl#this',
     title: 'Main thread',
     starred: false,
     workspace: 'https://pod.example/.data/agent-workspaces/secretary/ws-main/',

package/dist/index.d.ts

@@ -7,9 +7,8 @@ export { ContactGender, contactResource, contactTable, ContactClass, ContactType
 export { contactRepository } from './contact.repository';
 export { ChatStatus, chatResource, chatTable, type ChatMetadata, type ChatMemberRole, type ChatStatusType, type ChatRow, type ChatInsert, type ChatUpdate, } from './chat.schema';
 export { chatRepository } from './chat.repository';
-export { buildChatTargetRef, extractChatIdFromChatRef, extractChatTargetRef, extractChatThreadRef, extractThreadIdFromThreadRef, resolveThreadChatId, toTimestamp, type ChatTargetRef, type ChatThreadRef, } from './chat.utils';
+export { buildChatTargetRef, extractChatIdFromChatRef, extractChatTargetRef, extractChatThreadRef, extractThreadIdFromThreadRef, toTimestamp, type ChatTargetRef, type ChatThreadRef, } from './chat.utils';
 export { buildModelResourceId, buildModelResourceIri, buildModelResourceIriForDatabase, resolveModelResourceIri, resolveModelResourceIriForDatabase, type ModelResourceTarget, } from './resource-refs';
-export { agentHomeDirFromResourceId, agentHomePathFromResourceId, agentKeyFromResourceRef, agentKeyFromResourceId, agentResourceId, asBaseRelativeResourceId, asResourceIri, requireRowResourceId, type BaseRelativeResourceId, type ResourceIri, } from './resource-identity';
 export { ThreadStatus, threadResource, threadTable, type ThreadStatusType, type ThreadRow, type ThreadInsert, type ThreadUpdate, } from './thread.schema';
 export { threadRepository } from './thread.repository';
 export { MessageRole, MessageStatus, messageResource, messageTable, type MessageRoleType, type MessageStatusType, type MessageRow, type MessageInsert, type MessageUpdate, } from './message.schema';

package/dist/index.js

@@ -19,9 +19,8 @@ export { contactRepository } from './contact.repository.js';
 // Chat & Message - 聊天和消息
 export { ChatStatus, chatResource, chatTable, } from './chat.schema.js';
 export { chatRepository } from './chat.repository.js';
-export { buildChatTargetRef, extractChatIdFromChatRef, extractChatTargetRef, extractChatThreadRef, extractThreadIdFromThreadRef, resolveThreadChatId, toTimestamp, } from './chat.utils.js';
+export { buildChatTargetRef, extractChatIdFromChatRef, extractChatTargetRef, extractChatThreadRef, extractThreadIdFromThreadRef, toTimestamp, } from './chat.utils.js';
 export { buildModelResourceId, buildModelResourceIri, buildModelResourceIriForDatabase, resolveModelResourceIri, resolveModelResourceIriForDatabase, } from './resource-refs.js';
-export { agentHomeDirFromResourceId, agentHomePathFromResourceId, agentKeyFromResourceRef, agentKeyFromResourceId, agentResourceId, asBaseRelativeResourceId, asResourceIri, requireRowResourceId, } from './resource-identity.js';
 export { ThreadStatus, threadResource, threadTable, } from './thread.schema.js';
 export { threadRepository } from './thread.repository.js';
 export { MessageRole, MessageStatus, messageResource, messageTable, } from './message.schema.js';

package/dist/message.repository.d.ts

@@ -1,8 +1,7 @@
 export declare const messageRepository: import("@undefineds.co/drizzle-solid/dist/core/repository").PodRepositoryDescriptor<import("@undefineds.co/drizzle-solid/dist/core/schema").PodTableWithColumns<import("@undefineds.co/drizzle-solid/dist/core/schema").ResolvedColumns<{
     id: import("@undefineds.co/drizzle-solid/dist/core/schema").PodStringColumn<false, false>;
-    scope: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
     chat: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
-    thread: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
+    thread: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, true, false>;
     maker: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
     role: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, true, true>;
     content: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, true, false>;
@@ -24,7 +23,6 @@ export declare const messageRepository: import("@undefineds.co/drizzle-solid/dis
     updatedAt: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"datetime", null, false, false>;
 }>>, {
     id: string;
-    scope: string;
     chat: string;
     thread: string;
     maker: string;
@@ -47,11 +45,10 @@ export declare const messageRepository: import("@undefineds.co/drizzle-solid/dis
     createdAt: Date;
     updatedAt: Date;
 }, {
+    thread: string;
     content: string;
     id?: string | undefined;
-    scope?: string | undefined;
     chat?: string | undefined;
-    thread?: string | undefined;
     maker?: string | undefined;
     role?: string | undefined;
     richContent?: string | undefined;
@@ -72,9 +69,8 @@ export declare const messageRepository: import("@undefineds.co/drizzle-solid/dis
     updatedAt?: Date | undefined;
 }, {
     id?: string | null | undefined;
-    scope?: string | null | undefined;
     chat?: string | null | undefined;
-    thread?: string | null | undefined;
+    thread?: string | undefined;
     maker?: string | null | undefined;
     role?: string | undefined;
     content?: string | undefined;

package/dist/message.schema.d.ts

@@ -15,13 +15,13 @@ export declare const MessageStatus: {
  * Message resource (aligned with xpod).
  *
  * Product semantics:
- * - Message belongs to a neutral product scope: usually a Chat, sometimes a
- *   Task/thread execution timeline.
+ * - Message belongs to a Thread timeline. Chat messages also keep the Chat
+ *   relation for Solid Chat compatibility and chat-bucketed storage.
  * - Chat remains the Solid Chat compatibility relation. When present, the
  *   message is written under the Chat message bucket and projected through
  *   wf:message.
- * - Thread is optional and appears when a message participates in an explicit
- *   AI/task/branch timeline.
+ * - Task ownership is derived through message.thread -> thread.parent. Do not
+ *   duplicate it as a custom Message scope relation.
  *
  * Storage structure:
  * - Location: /.data/chat/{chat|id}/{yyyy}/{MM}/{dd}/messages.ttl#{id}
@@ -30,9 +30,8 @@ export declare const MessageStatus: {
  */
 export declare const messageResource: import("@undefineds.co/drizzle-solid/dist/core/schema").PodTableWithColumns<import("@undefineds.co/drizzle-solid/dist/core/schema").ResolvedColumns<{
     id: import("@undefineds.co/drizzle-solid/dist/core/schema").PodStringColumn<false, false>;
-    scope: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
     chat: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
-    thread: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
+    thread: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, true, false>;
     maker: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
     role: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, true, true>;
     content: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, true, false>;
@@ -55,9 +54,8 @@ export declare const messageResource: import("@undefineds.co/drizzle-solid/dist/
 }>>;
 export declare const messageTable: import("@undefineds.co/drizzle-solid/dist/core/schema").PodTableWithColumns<import("@undefineds.co/drizzle-solid/dist/core/schema").ResolvedColumns<{
     id: import("@undefineds.co/drizzle-solid/dist/core/schema").PodStringColumn<false, false>;
-    scope: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
     chat: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
-    thread: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
+    thread: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, true, false>;
     maker: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
     role: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, true, true>;
     content: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, true, false>;

package/dist/message.schema.js

@@ -18,13 +18,13 @@ export const MessageStatus = {
  * Message resource (aligned with xpod).
  *
  * Product semantics:
- * - Message belongs to a neutral product scope: usually a Chat, sometimes a
- *   Task/thread execution timeline.
+ * - Message belongs to a Thread timeline. Chat messages also keep the Chat
+ *   relation for Solid Chat compatibility and chat-bucketed storage.
  * - Chat remains the Solid Chat compatibility relation. When present, the
  *   message is written under the Chat message bucket and projected through
  *   wf:message.
- * - Thread is optional and appears when a message participates in an explicit
- *   AI/task/branch timeline.
+ * - Task ownership is derived through message.thread -> thread.parent. Do not
+ *   duplicate it as a custom Message scope relation.
  *
  * Storage structure:
  * - Location: /.data/chat/{chat|id}/{yyyy}/{MM}/{dd}/messages.ttl#{id}
@@ -34,9 +34,7 @@ export const MessageStatus = {
 export const messageResource = podTable('chat_message', {
     id: id('id').default((key, row) => (renderDefaultIdTemplate(row?.chat
         ? 'chat/{chat.key}/{yyyy}/{MM}/{dd}/messages.ttl#{key}'
-        : row?.thread
-            ? '{thread.dir}/{yyyy}/{MM}/{dd}/messages.ttl#{key}'
-            : '{scope.dir}/{yyyy}/{MM}/{dd}/messages.ttl#{key}', {
+        : '{thread.dir}/{yyyy}/{MM}/{dd}/messages.ttl#{key}', {
         key: resourceKey(key, 'msg'),
         row,
         links: {
@@ -44,15 +42,13 @@ export const messageResource = podTable('chat_message', {
             thread: threadResource,
         },
     }))),
-    // Canonical product owner scope. The object can be a Chat, Task, Thread, or future command surface.
-    scope: uri('scope').predicate(UDFS.inScope),
     // Solid Chat compatibility relation. In RDF this is an inverse link: <chat> wf:message <message>.
     chat: uri('chat').predicate(WF.message).inverse().link(chatResource),
-    // Optional Thread relation. In RDF this is an inverse Solid Chat/SIOC link: <thread> sioc:has_member <message>.
-    thread: uri('thread').predicate(SIOC.has_member).inverse().link(threadResource),
+    // Timeline relation. In RDF this is an inverse Solid Chat/SIOC link: <thread> sioc:has_member <message>.
+    thread: uri('thread').predicate(SIOC.has_member).inverse().notNull().link(threadResource),
     // maker is the entity URI of the message author:
     // - User: their WebID (https://user.pod/profile/card#me)
-    // - AI: Agent URI (/.data/agents/{id}/index.ttl#this)
+    // - AI: Agent URI (/agents/{id}/)
     // - External: Contact URI (/.data/contacts/{id}.ttl#this)
     // No reference() constraint - accepts any valid URI.
     maker: uri('maker').predicate(FOAF.maker),

package/dist/namespaces.js

@@ -58,6 +58,7 @@ export const SCHEMA = createNamespace('schema', 'http://schema.org/', {
     url: 'url',
 });
 export const SIOC = createNamespace('sioc', 'http://rdfs.org/sioc/ns#', {
+    Container: 'Container',
     Post: 'Post',
     Thread: 'Thread',
     Forum: 'Forum',
@@ -132,7 +133,6 @@ export const UDFS = createNamespace('udfs', 'https://undefineds.co/ns#', {
     sortKey: 'sortKey',
     hasThread: 'hasThread',
     inThread: 'inThread',
-    inScope: 'inScope',
     participants: 'participants',
     message: 'message',
     messageContent: 'messageContent',

package/dist/schema.d.ts

@@ -80,6 +80,7 @@ export declare const solidResources: {
     }>>;
     chatResource: import("@undefineds.co/drizzle-solid/dist/core/schema").PodTableWithColumns<import("@undefineds.co/drizzle-solid/dist/core/schema").ResolvedColumns<{
         id: import("@undefineds.co/drizzle-solid/dist/core/schema").PodStringColumn<false, false>;
+        rdfType: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"array", "uri", true, true>;
         title: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, true, false>;
         description: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, false, false>;
         avatarUrl: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
@@ -116,9 +117,7 @@ export declare const solidResources: {
     }>>;
     threadResource: import("@undefineds.co/drizzle-solid/dist/core/schema").PodTableWithColumns<import("@undefineds.co/drizzle-solid/dist/core/schema").ResolvedColumns<{
         id: import("@undefineds.co/drizzle-solid/dist/core/schema").PodStringColumn<false, false>;
-        scope: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
-        chat: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
-        task: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
+        parent: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, true, false>;
         title: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, false, false>;
         status: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, true, true>;
         starred: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"boolean", null, false, true>;
@@ -129,9 +128,8 @@ export declare const solidResources: {
     }>>;
     messageResource: import("@undefineds.co/drizzle-solid/dist/core/schema").PodTableWithColumns<import("@undefineds.co/drizzle-solid/dist/core/schema").ResolvedColumns<{
         id: import("@undefineds.co/drizzle-solid/dist/core/schema").PodStringColumn<false, false>;
-        scope: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
         chat: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
-        thread: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
+        thread: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, true, false>;
         maker: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
         role: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, true, true>;
         content: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, true, false>;
@@ -154,6 +152,7 @@ export declare const solidResources: {
     }>>;
     taskResource: import("@undefineds.co/drizzle-solid/dist/core/schema").PodTableWithColumns<import("@undefineds.co/drizzle-solid/dist/core/schema").ResolvedColumns<{
         id: import("@undefineds.co/drizzle-solid/dist/core/schema").PodStringColumn<false, false>;
+        rdfType: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"array", "uri", true, true>;
         title: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, false, false>;
         instruction: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, true, false>;
         prompt: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, false, false>;
@@ -592,6 +591,7 @@ export declare const solidSchema: {
     }>>;
     chatTable: import("@undefineds.co/drizzle-solid/dist/core/schema").PodTableWithColumns<import("@undefineds.co/drizzle-solid/dist/core/schema").ResolvedColumns<{
         id: import("@undefineds.co/drizzle-solid/dist/core/schema").PodStringColumn<false, false>;
+        rdfType: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"array", "uri", true, true>;
         title: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, true, false>;
         description: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, false, false>;
         avatarUrl: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
@@ -628,9 +628,7 @@ export declare const solidSchema: {
     }>>;
     threadTable: import("@undefineds.co/drizzle-solid/dist/core/schema").PodTableWithColumns<import("@undefineds.co/drizzle-solid/dist/core/schema").ResolvedColumns<{
         id: import("@undefineds.co/drizzle-solid/dist/core/schema").PodStringColumn<false, false>;
-        scope: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
-        chat: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
-        task: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
+        parent: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, true, false>;
         title: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, false, false>;
         status: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, true, true>;
         starred: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"boolean", null, false, true>;
@@ -641,9 +639,8 @@ export declare const solidSchema: {
     }>>;
     messageTable: import("@undefineds.co/drizzle-solid/dist/core/schema").PodTableWithColumns<import("@undefineds.co/drizzle-solid/dist/core/schema").ResolvedColumns<{
         id: import("@undefineds.co/drizzle-solid/dist/core/schema").PodStringColumn<false, false>;
-        scope: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
         chat: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
-        thread: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
+        thread: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, true, false>;
         maker: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
         role: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, true, true>;
         content: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, true, false>;
@@ -666,6 +663,7 @@ export declare const solidSchema: {
     }>>;
     taskTable: import("@undefineds.co/drizzle-solid/dist/core/schema").PodTableWithColumns<import("@undefineds.co/drizzle-solid/dist/core/schema").ResolvedColumns<{
         id: import("@undefineds.co/drizzle-solid/dist/core/schema").PodStringColumn<false, false>;
+        rdfType: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"array", "uri", true, true>;
         title: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, false, false>;
         instruction: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, true, false>;
         prompt: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, false, false>;

package/dist/skill.schema.js

@@ -1,8 +1,6 @@
 import { boolean, id, object, podTable, string, timestamp, uri } from '@undefineds.co/drizzle-solid';
 import { agentResource } from './agent.schema.js';
 import { DCTerms, UDFS } from './namespaces.js';
-import { resourceKey } from './resource-id-defaults.js';
-import { agentKeyFromResourceRef } from './resource-identity.js';
 /**
  * Skill binding resource.
  *
@@ -10,10 +8,7 @@ import { agentKeyFromResourceRef } from './resource-identity.js';
  * binding and lightweight load metadata; it does not duplicate full skill text.
  */
 export const skillResource = podTable('skill', {
-    id: id('id').default((key, row) => {
-        const agentRef = typeof row?.agent === 'string' ? row.agent : '';
-        return `${agentKeyFromResourceRef(agentRef)}/skills/${resourceKey(key, 'skill')}/`;
-    }),
+    id: id('id').default('{agent.key}/skills/{key}/'),
     agent: uri('agent').predicate(UDFS.agent).notNull().link(agentResource),
     root: uri('root').predicate(UDFS.root),
     name: string('name').predicate(UDFS.name).notNull(),
@@ -27,8 +22,8 @@ export const skillResource = podTable('skill', {
     createdAt: timestamp('createdAt').predicate(DCTerms.created).notNull().defaultNow(),
     updatedAt: timestamp('updatedAt').predicate(DCTerms.modified).notNull().defaultNow(),
 }, {
-    base: '/.data/agents/',
-    sparqlEndpoint: '/.data/agents/-/sparql',
+    base: '/agents/',
+    sparqlEndpoint: '/agents/-/sparql',
     type: UDFS.Skill,
     namespace: UDFS,
 });

package/dist/task.schema.d.ts

@@ -17,6 +17,7 @@ export declare const TaskStatus: {
  */
 export declare const taskResource: import("@undefineds.co/drizzle-solid/dist/core/schema").PodTableWithColumns<import("@undefineds.co/drizzle-solid/dist/core/schema").ResolvedColumns<{
     id: import("@undefineds.co/drizzle-solid/dist/core/schema").PodStringColumn<false, false>;
+    rdfType: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"array", "uri", true, true>;
     title: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, false, false>;
     instruction: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, true, false>;
     prompt: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, false, false>;
@@ -33,6 +34,7 @@ export declare const taskResource: import("@undefineds.co/drizzle-solid/dist/cor
 }>>;
 export declare const taskTable: import("@undefineds.co/drizzle-solid/dist/core/schema").PodTableWithColumns<import("@undefineds.co/drizzle-solid/dist/core/schema").ResolvedColumns<{
     id: import("@undefineds.co/drizzle-solid/dist/core/schema").PodStringColumn<false, false>;
+    rdfType: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"array", "uri", true, true>;
     title: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, false, false>;
     instruction: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, true, false>;
     prompt: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, false, false>;

package/dist/task.schema.js

@@ -1,5 +1,5 @@
 import { id, object, podTable, string, text, timestamp, uri } from '@undefineds.co/drizzle-solid';
-import { DCTerms, UDFS } from './namespaces.js';
+import { DCTerms, RDF, SIOC, UDFS } from './namespaces.js';
 export const TaskStatus = {
     OPEN: 'open',
     READY: 'ready',
@@ -18,6 +18,9 @@ export const TaskStatus = {
  */
 export const taskResource = podTable('task', {
     id: id('id').default('index.ttl#{key}'),
+    // Resource config writes udfs:Task; keep sioc:Container explicit so
+    // task-owned threads can use the same sioc:has_parent relation as chats.
+    rdfType: uri('rdfType').array().predicate(RDF.type).notNull().default([SIOC.Container]),
     title: string('title').predicate(DCTerms.title),
     instruction: text('instruction').predicate(UDFS.instruction).notNull(),
     prompt: text('prompt').predicate(UDFS.prompt),

package/dist/thread.repository.d.ts

@@ -1,49 +1,20 @@
-export declare const threadRepository: import("@undefineds.co/drizzle-solid/dist/core/repository").PodRepositoryDescriptor<import("@undefineds.co/drizzle-solid/dist/core/schema").PodTableWithColumns<import("@undefineds.co/drizzle-solid/dist/core/schema").ResolvedColumns<{
-    id: import("@undefineds.co/drizzle-solid/dist/core/schema").PodStringColumn<false, false>;
-    scope: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
-    chat: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
-    task: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
-    title: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, false, false>;
-    status: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, true, true>;
-    starred: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"boolean", null, false, true>;
-    workspace: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
-    metadata: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"object", null, false, false>;
-    createdAt: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"datetime", null, true, true>;
-    updatedAt: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"datetime", null, true, true>;
-}>>, {
-    id: string;
-    scope: string;
-    chat: string;
-    task: string;
-    title: string;
-    status: string;
-    starred: boolean;
-    workspace: string;
-    metadata: Record<string, unknown>;
-    createdAt: Date;
-    updatedAt: Date;
-}, {
-    id?: string | undefined;
-    scope?: string | undefined;
-    chat?: string | undefined;
-    task?: string | undefined;
-    title?: string | undefined;
-    status?: string | undefined;
-    starred?: boolean | undefined;
-    workspace?: string | undefined;
-    metadata?: Record<string, unknown> | undefined;
-    createdAt?: Date | undefined;
-    updatedAt?: Date | undefined;
-}, {
-    id?: string | null | undefined;
-    scope?: string | null | undefined;
-    chat?: string | null | undefined;
-    task?: string | null | undefined;
-    title?: string | null | undefined;
-    status?: string | undefined;
-    starred?: boolean | null | undefined;
-    workspace?: string | null | undefined;
-    metadata?: Record<string, unknown> | null | undefined;
-    createdAt?: Date | undefined;
-    updatedAt?: Date | undefined;
-}, Record<string, unknown>>;
+import { definePodRepository } from './repository';
+import { threadResource, type ThreadRow, type ThreadInsert, type ThreadUpdate } from './thread.schema';
+export interface ChatThreadTarget extends Record<string, unknown> {
+    parent: string;
+    id?: string;
+}
+export declare function buildChatThreadTarget(chatIdOrRef: string, threadIdOrRef?: string): ChatThreadTarget;
+export declare function extractChatIdFromThread(row: Pick<ThreadRow, 'parent'> | null | undefined): string | null;
+export declare function readThreadRepositoryChatId(threadRef: string | null | undefined): string | null;
+export declare function readThreadRepositoryId(threadRef: string | null | undefined): string | null;
+export declare function buildChatThreadIri(webIdOrPodUrl: string, chatIdOrRef: string, threadId: string): string;
+export declare function buildChatThreadResourceId(chatIdOrRef: string, threadIdOrRef: string): string;
+export declare const threadRepository: ReturnType<typeof definePodRepository<typeof threadResource, ThreadRow, ThreadInsert, ThreadUpdate>> & {
+    targetForChat: typeof buildChatThreadTarget;
+    iriForChat: typeof buildChatThreadIri;
+    idForChat: typeof buildChatThreadResourceId;
+    chatId: typeof extractChatIdFromThread;
+    chatIdFromRef: typeof readThreadRepositoryChatId;
+    idFromRef: typeof readThreadRepositoryId;
+};

package/dist/thread.repository.js

@@ -1,8 +1,39 @@
 import { definePodRepository } from './repository.js';
 import { threadResource } from './thread.schema.js';
+import { buildChatTargetRef, extractChatIdFromChatRef, extractChatThreadRef, extractThreadIdFromThreadRef, } from './chat.utils.js';
+export function buildChatThreadTarget(chatIdOrRef, threadIdOrRef) {
+    const parsedThread = extractChatThreadRef(threadIdOrRef);
+    const chatRef = parsedThread.chatId ?? chatIdOrRef;
+    const threadId = parsedThread.threadId ?? extractThreadIdFromThreadRef(threadIdOrRef) ?? threadIdOrRef;
+    return {
+        ...(threadId ? { id: threadId } : {}),
+        parent: buildChatTargetRef(chatRef),
+    };
+}
+export function extractChatIdFromThread(row) {
+    return extractChatIdFromChatRef(row?.parent);
+}
+export function readThreadRepositoryChatId(threadRef) {
+    return extractChatThreadRef(threadRef).chatId;
+}
+export function readThreadRepositoryId(threadRef) {
+    return extractThreadIdFromThreadRef(threadRef);
+}
+export function buildChatThreadIri(webIdOrPodUrl, chatIdOrRef, threadId) {
+    return threadResource.buildIri(webIdOrPodUrl, buildChatThreadTarget(chatIdOrRef, threadId));
+}
+export function buildChatThreadResourceId(chatIdOrRef, threadIdOrRef) {
+    return threadResource.buildId(buildChatThreadTarget(chatIdOrRef, threadIdOrRef));
+}
 export const threadRepository = definePodRepository({
     namespace: 'thread',
     resource: threadResource,
     searchableFields: ['title'],
     defaultSort: { field: 'updatedAt', direction: 'desc' },
 });
+threadRepository.targetForChat = buildChatThreadTarget;
+threadRepository.iriForChat = buildChatThreadIri;
+threadRepository.idForChat = buildChatThreadResourceId;
+threadRepository.chatId = extractChatIdFromThread;
+threadRepository.chatIdFromRef = readThreadRepositoryChatId;
+threadRepository.idFromRef = readThreadRepositoryId;

package/dist/thread.schema.d.ts

@@ -8,16 +8,16 @@ export declare const ThreadStatus: {
  * Thread resource.
  *
  * Product semantics:
- * - Thread is the implicit concrete timeline/place under exactly one surface:
- *   Chat for conversation timelines, or Task for task execution timelines.
- * - `scope` is the neutral LinX ownership relation for that surface. When the
- *   scope is a Chat, also write `chat` so Solid Chat clients can keep using
- *   sioc:has_parent. When the scope is a Task, also write `task` for workflow
- *   indexes.
+ * - Thread is the implicit concrete timeline/place under exactly one parent
+ *   container: Chat for conversation timelines, or Task for task execution
+ *   timelines.
+ * - `parent` uses sioc:has_parent for both Chat and Task. Chat and Task are
+ *   both modeled as sioc:Container, so Thread does not need parallel chat/task
+ *   ownership fields.
  * - AI product runtime sessions map to Thread when they represent a concrete
  *   conversation timeline/place/run.
- * - Thread carries workspace/place relations and runtime metadata. Chat only
- *   identifies the counterpart/conversation object.
+ * - Thread carries workspace/place relations and runtime metadata. The parent
+ *   container identifies the command surface/counterpart.
  * - Product/runtime-specific ids should stay in metadata as `runtimeSessionId`,
  *   `runtime`, etc. Do not name the generic thread id `piSessionId`.
  *
@@ -33,9 +33,7 @@ export declare const ThreadStatus: {
  */
 export declare const threadResource: import("@undefineds.co/drizzle-solid/dist/core/schema").PodTableWithColumns<import("@undefineds.co/drizzle-solid/dist/core/schema").ResolvedColumns<{
     id: import("@undefineds.co/drizzle-solid/dist/core/schema").PodStringColumn<false, false>;
-    scope: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
-    chat: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
-    task: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
+    parent: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, true, false>;
     title: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, false, false>;
     status: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, true, true>;
     starred: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"boolean", null, false, true>;
@@ -46,9 +44,7 @@ export declare const threadResource: import("@undefineds.co/drizzle-solid/dist/c
 }>>;
 export declare const threadTable: import("@undefineds.co/drizzle-solid/dist/core/schema").PodTableWithColumns<import("@undefineds.co/drizzle-solid/dist/core/schema").ResolvedColumns<{
     id: import("@undefineds.co/drizzle-solid/dist/core/schema").PodStringColumn<false, false>;
-    scope: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
-    chat: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
-    task: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, false, false>;
+    parent: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"uri", null, true, false>;
     title: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, false, false>;
     status: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"string", null, true, true>;
     starred: import("@undefineds.co/drizzle-solid/dist/core/schema").ColumnBuilder<"boolean", null, false, true>;

package/dist/thread.schema.js

@@ -1,7 +1,5 @@
 import { uri, boolean, object, podTable, string, timestamp, id, renderDefaultIdTemplate } from '@undefineds.co/drizzle-solid';
 import { UDFS, DCTerms, SIOC } from './namespaces.js';
-import { chatResource } from './chat.schema.js';
-import { taskResource } from './task.schema.js';
 import { resourceKey } from './resource-id-defaults.js';
 export const ThreadStatus = {
     ACTIVE: 'active',
@@ -12,16 +10,16 @@ export const ThreadStatus = {
  * Thread resource.
  *
  * Product semantics:
- * - Thread is the implicit concrete timeline/place under exactly one surface:
- *   Chat for conversation timelines, or Task for task execution timelines.
- * - `scope` is the neutral LinX ownership relation for that surface. When the
- *   scope is a Chat, also write `chat` so Solid Chat clients can keep using
- *   sioc:has_parent. When the scope is a Task, also write `task` for workflow
- *   indexes.
+ * - Thread is the implicit concrete timeline/place under exactly one parent
+ *   container: Chat for conversation timelines, or Task for task execution
+ *   timelines.
+ * - `parent` uses sioc:has_parent for both Chat and Task. Chat and Task are
+ *   both modeled as sioc:Container, so Thread does not need parallel chat/task
+ *   ownership fields.
  * - AI product runtime sessions map to Thread when they represent a concrete
  *   conversation timeline/place/run.
- * - Thread carries workspace/place relations and runtime metadata. Chat only
- *   identifies the counterpart/conversation object.
+ * - Thread carries workspace/place relations and runtime metadata. The parent
+ *   container identifies the command surface/counterpart.
  * - Product/runtime-specific ids should stay in metadata as `runtimeSessionId`,
  *   `runtime`, etc. Do not name the generic thread id `piSessionId`.
  *
@@ -36,24 +34,14 @@ export const ThreadStatus = {
  *   container URI here and store portable metadata with that container/resource.
  */
 export const threadResource = podTable('thread', {
-    id: id('id').default((key, row) => (renderDefaultIdTemplate(row?.chat
-        ? 'chat/{chat.key}/index.ttl#{key}'
-        : row?.task
-            ? 'task/{task.key}/index.ttl#{key}'
-            : '{scope.dir}/index.ttl#{key}', {
-        key: resourceKey(key, 'thread'),
-        row,
-        links: {
-            chat: chatResource,
-            task: taskResource,
-        },
-    }))),
-    // Canonical product owner surface. The object can be a Chat, Task, or future command surface.
-    scope: uri('scope').predicate(UDFS.inScope),
-    // Solid Chat compatibility owner for conversation timelines. Do not set together with `task`.
-    chat: uri('chat').predicate(SIOC.has_parent).link(chatResource),
-    // Workflow compatibility/index owner for task execution timelines. Do not set together with `chat`.
-    task: uri('task').predicate(UDFS.task).link(taskResource),
+    id: id('id').default((key, row) => {
+        return renderDefaultIdTemplate('{parent.dir}/index.ttl#{key}', {
+            key: resourceKey(key, 'thread'),
+            row,
+        });
+    }),
+    // Parent command surface/container. Chat and Task are both sioc:Container.
+    parent: uri('parent').predicate(SIOC.has_parent).notNull(),
     // Display / state
     title: string('title').predicate(DCTerms.title),
     status: string('status').predicate(UDFS.status).notNull().default(ThreadStatus.ACTIVE),

package/dist/vocab/chat.vocab.d.ts

@@ -1,5 +1,6 @@
 /** Chat channel vocab (thin place/container). */
 export declare const ChatBaseVocab: {
+    readonly rdfType: string;
     readonly title: string;
     readonly description: string;
     readonly avatarUrl: string;

package/dist/vocab/chat.vocab.js

@@ -1,6 +1,7 @@
-import { DCTerms, SCHEMA, UDFS, WF } from '../namespaces.js';
+import { DCTerms, RDF, SCHEMA, UDFS, WF } from '../namespaces.js';
 /** Chat channel vocab (thin place/container). */
 export const ChatBaseVocab = {
+    rdfType: RDF.type,
     // Display
     title: DCTerms.title,
     description: DCTerms.description,

package/dist/vocab/message.vocab.d.ts

@@ -1,5 +1,4 @@
 export declare const MessageVocab: {
-    readonly scope: string;
     readonly thread: string;
     readonly chat: string;
     readonly maker: string;

package/dist/vocab/message.vocab.js

@@ -1,7 +1,5 @@
 import { DCTerms, FOAF, SCHEMA, SIOC, UDFS, WF } from '../namespaces.js';
 export const MessageVocab = {
-    // Existing
-    scope: UDFS.inScope,
     thread: SIOC.has_member,
     chat: WF.message,
     maker: FOAF.maker,

package/dist/vocab/thread.vocab.d.ts

@@ -1,7 +1,5 @@
 export declare const ThreadVocab: {
-    readonly scope: string;
-    readonly chat: string;
-    readonly task: string;
+    readonly parent: string;
     readonly title: string;
     readonly starred: string;
     readonly metadata: string;

package/dist/vocab/thread.vocab.js

@@ -1,8 +1,6 @@
 import { DCTerms, SIOC, UDFS } from '../namespaces.js';
 export const ThreadVocab = {
-    scope: UDFS.inScope,
-    chat: SIOC.has_parent,
-    task: UDFS.task,
+    parent: SIOC.has_parent,
     title: DCTerms.title,
     starred: UDFS.favorite,
     metadata: UDFS.metadata,

package/dist/vocab/workflow.vocab.d.ts

@@ -1,4 +1,5 @@
 export declare const TaskVocab: {
+    readonly rdfType: string;
     readonly title: string;
     readonly instruction: string;
     readonly prompt: string;

package/dist/vocab/workflow.vocab.js

@@ -1,5 +1,6 @@
-import { AS, DCTerms, SCHEMA, UDFS } from '../namespaces.js';
+import { AS, DCTerms, RDF, SCHEMA, UDFS } from '../namespaces.js';
 export const TaskVocab = {
+    rdfType: RDF.type,
     title: DCTerms.title,
     instruction: UDFS.instruction,
     prompt: UDFS.prompt,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@undefineds.co/models",
-  "version": "0.2.38",
+  "version": "0.2.39",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",

package/skills/solid-modeling/SKILL.md

@@ -138,7 +138,7 @@ Use full URI relation fields:
 message.chat
 message.thread
 message.replyTo
-thread.chat
+thread.parent
 run.thread
 run.task
 ```
@@ -148,7 +148,7 @@ Avoid persisted relation fields such as:
 ```ts
 message.chatId
 message.threadId
-thread.chatId
+thread.parentId
 ```
 
 unless they are intentionally opaque literal protocol fields, not RDF links.
@@ -165,6 +165,15 @@ threadRepository.listByChatId(db, { chatId })
 These helpers should derive canonical Pod IRIs or base-relative ids internally.
 Do not force UI/CLI callers to manually construct Pod IRIs in every query.
 
+When an application needs to group, filter, or address records through a linked
+relation, push that need into the owning `models` repository/helper first. For
+example, app code should call a `threadRepository.targetForChat(...)` or
+`threadRepository.chatId(row)` style API instead of parsing
+`thread.parent` strings locally. If the same relation-target operation appears
+across multiple resources, then promote it down into `drizzle-solid` as a
+generic ORM helper. Do not add resource-specific `extractXFromY` parsing
+helpers in product shells.
+
 ## Chat, Task, Thread, Message, Run, Step
 
 Use these concepts consistently across products:
@@ -173,11 +182,10 @@ Use these concepts consistently across products:
   user is talking with.
 - `Task`: task-style command surface, parallel to Chat. It describes recurring,
   triggered, or one-off task intent.
-- `Thread`: implicit concrete timeline/place under exactly one command surface:
-  Chat for conversation timelines, or Task for task execution timelines.
-- `Message`: human/runtime communication item in a command scope. It usually
-  belongs to a Chat, but task/runtime messages may belong to a Task or Thread
-  scope without inventing a Chat.
+- `Thread`: implicit concrete timeline/place under exactly one parent
+  container. Chat and Task are both `sioc:Container`.
+- `Message`: human/runtime communication item in a Thread. Chat messages also
+  keep the Chat relation for Solid Chat compatibility.
 - `Run`: one concrete execution attempt by an Agent Runtime.
 - `RunStep`: append-only execution facts for a Run.
 
@@ -191,17 +199,17 @@ Align with graph semantics:
 
 | Concept | Preferred RDF direction | Typical predicate |
 |---|---|---|
-| resource belongs to command scope | `resource -> scope` | `udfs:inScope` |
 | chat contains message | `chat -> message` | `wf:message` / project vocabulary |
-| chat owns thread | `thread -> chat` | `sioc:has_parent` for compatibility |
+| thread parent container | `thread -> chat-or-task` | `sioc:has_parent` |
 | thread contains message | `thread -> message` | `sioc:has_member` or equivalent |
 | reply points to original | `replyMessage -> originalMessage` | `sioc:has_reply` / project predicate |
 | author/maker | `message -> maker` | `foaf:maker` |
 
-Use `udfs:inScope` for LinX product semantics when a Thread or Message can
-belong to either Chat or Task. Preserve Solid Chat compatibility by also writing
-`sioc:has_parent` for Chat-scoped Threads and `wf:message` for Chat-scoped
-Messages. Do not stretch Solid Chat predicates to mean Task ownership.
+Use `sioc:has_parent` as the canonical Thread parent relation. Chat and Task
+resources must be modeled as `sioc:Container`, so Thread does not need parallel
+`chat`, `task`, or custom `scope` ownership fields. Preserve Solid Chat
+compatibility with `wf:message` for Chat-contained Messages and
+`sioc:has_member` for Thread-contained Messages.
 
 When inverse predicates are supported, use them for read/write symmetry. If the
 ORM cannot safely express the inverse write, put the relation writer in the

package/dist/resource-identity.d.ts

@@ -1,19 +0,0 @@
-declare const baseRelativeResourceIdBrand: unique symbol;
-declare const resourceIriBrand: unique symbol;
-export type BaseRelativeResourceId = string & {
-    readonly [baseRelativeResourceIdBrand]: 'BaseRelativeResourceId';
-};
-export type ResourceIri = string & {
-    readonly [resourceIriBrand]: 'ResourceIri';
-};
-export declare function asBaseRelativeResourceId(value: string, label?: string): BaseRelativeResourceId;
-export declare function asResourceIri(value: string, label?: string): ResourceIri;
-export declare function requireRowResourceId(row: {
-    id?: string | null;
-} | null | undefined, label?: string): BaseRelativeResourceId;
-export declare function agentResourceId(key?: string | null): BaseRelativeResourceId;
-export declare function agentKeyFromResourceId(resourceId: string): string;
-export declare function agentKeyFromResourceRef(resourceRef: string): string;
-export declare function agentHomeDirFromResourceId(resourceId: string): BaseRelativeResourceId;
-export declare function agentHomePathFromResourceId(resourceId: string): string;
-export {};

package/dist/resource-identity.js

@@ -1,68 +0,0 @@
-const ABSOLUTE_IRI = /^[a-zA-Z][a-zA-Z\d+.-]*:/;
-const AGENT_RESOURCE_ID = /^([A-Za-z0-9_.-]+)\/index\.ttl#this$/;
-const AGENT_KEY = /^[A-Za-z0-9_.-]+$/;
-export function asBaseRelativeResourceId(value, label = 'Resource id') {
-    if (typeof value !== 'string' || value.trim().length === 0) {
-        throw new Error(`${label} must be a non-empty base-relative resource id.`);
-    }
-    const normalized = value.trim();
-    if (ABSOLUTE_IRI.test(normalized) || normalized.startsWith('/') || normalized.startsWith('//')) {
-        throw new Error(`${label} must be a base-relative resource id.`);
-    }
-    return normalized;
-}
-export function asResourceIri(value, label = 'Resource IRI') {
-    if (typeof value !== 'string' || value.trim().length === 0) {
-        throw new Error(`${label} must be a non-empty resource IRI.`);
-    }
-    const normalized = value.trim();
-    if (!ABSOLUTE_IRI.test(normalized)) {
-        throw new Error(`${label} must be a full resource IRI.`);
-    }
-    return normalized;
-}
-export function requireRowResourceId(row, label = 'Pod row') {
-    if (!row || typeof row.id !== 'string' || row.id.trim().length === 0) {
-        throw new Error(`${label} row is missing row.id.`);
-    }
-    return asBaseRelativeResourceId(row.id, `${label} row.id`);
-}
-function defaultAgentKey() {
-    return `agent_${Math.random().toString(36).slice(2, 12)}`;
-}
-export function agentResourceId(key) {
-    const raw = typeof key === 'string' ? key.trim() : '';
-    const value = raw || defaultAgentKey();
-    if (AGENT_RESOURCE_ID.test(value)) {
-        return asBaseRelativeResourceId(value, 'Agent resource id');
-    }
-    if (!AGENT_KEY.test(value)) {
-        throw new Error('Agent key must be a local key using letters, numbers, dot, underscore, or dash.');
-    }
-    return asBaseRelativeResourceId(`${value}/index.ttl#this`, 'Agent resource id');
-}
-export function agentKeyFromResourceId(resourceId) {
-    const id = asBaseRelativeResourceId(resourceId, 'Agent resource id');
-    const match = id.match(AGENT_RESOURCE_ID);
-    if (!match?.[1]) {
-        throw new Error('Agent resource id must use {agentKey}/index.ttl#this.');
-    }
-    return match[1];
-}
-export function agentKeyFromResourceRef(resourceRef) {
-    if (typeof resourceRef !== 'string' || resourceRef.trim().length === 0) {
-        throw new Error('Agent resource ref must be a non-empty Agent id or IRI.');
-    }
-    const normalized = resourceRef.trim();
-    const iriMatch = normalized.match(/\/\.data\/agents\/([A-Za-z0-9_.-]+)\/index\.ttl#this$/);
-    if (iriMatch?.[1]) {
-        return iriMatch[1];
-    }
-    return agentKeyFromResourceId(normalized);
-}
-export function agentHomeDirFromResourceId(resourceId) {
-    return asBaseRelativeResourceId(`${agentKeyFromResourceId(resourceId)}/`, 'Agent home dir');
-}
-export function agentHomePathFromResourceId(resourceId) {
-    return `/.data/agents/${agentKeyFromResourceId(resourceId)}/`;
-}