@undefineds.co/models 0.2.37 → 0.2.38

package/README.md

@@ -163,13 +163,14 @@ Contact
   entity: Agent context-root URI
 
 Agent
-  root: /agents/__secretary__/
-  meta: /agents/__secretary__/.meta
+  id: /.data/agents/__secretary__/index.ttl#this
+  root: /.data/agents/__secretary__/
+  meta: /.data/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 the context-root container itself.
+identity is `index.ttl#this` inside the context-root container.
 
 ## Resource Ownership
 
@@ -203,7 +204,7 @@ Representative paths:
 /.data/chat/{chatId}/index.ttl#this
 /.data/chat/{chatId}/index.ttl#{threadId}
 /.data/chat/{chatId}/{yyyy}/{MM}/{dd}/messages.ttl#{messageId}
-/agents/{agentId}/
+/.data/agents/{agentId}/index.ttl#this
 /.data/sessions/{yyyy}/{MM}/{dd}/{sessionId}.ttl
 /settings/providers/{providerId}.ttl
 /settings/providers/{providerId}.ttl#{modelId}

package/dist/agent.schema.js

@@ -1,7 +1,8 @@
 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}/"),
+    id: id("id").default((key) => agentResourceId(key)),
     name: string("name").predicate(FOAF.name).notNull(),
     description: text("description").predicate(DCTerms.description),
     avatarUrl: uri("avatarUrl").predicate(VCARD.hasPhoto),
@@ -29,8 +30,8 @@ export const agentResource = podTable("agent", {
     updatedAt: timestamp("updatedAt").predicate(DCTerms.modified).notNull().defaultNow(),
     deletedAt: timestamp("deletedAt").predicate(UDFS.deletedAt),
 }, {
-    base: '/agents/',
-    sparqlEndpoint: '/agents/-/sparql',
+    base: '/.data/agents/',
+    sparqlEndpoint: '/.data/agents/-/sparql',
     type: FOAF.Agent,
     namespace: UDFS,
 });

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/agents/__secretary__/',
+    entity: 'https://pod.example/.data/agents/__secretary__/index.ttl#this',
     isPublic: false,
 };
 export const fixtureChatDirectAI = {

package/dist/index.d.ts

@@ -9,6 +9,7 @@ export { ChatStatus, chatResource, chatTable, type ChatMetadata, type ChatMember
 export { chatRepository } from './chat.repository';
 export { buildChatTargetRef, extractChatIdFromChatRef, extractChatTargetRef, extractChatThreadRef, extractThreadIdFromThreadRef, resolveThreadChatId, 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

@@ -21,6 +21,7 @@ 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 { 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.schema.js

@@ -52,7 +52,7 @@ export const messageResource = podTable('chat_message', {
     thread: uri('thread').predicate(SIOC.has_member).inverse().link(threadResource),
     // maker is the entity URI of the message author:
     // - User: their WebID (https://user.pod/profile/card#me)
-    // - AI: Agent URI (/agents/{id}/)
+    // - AI: Agent URI (/.data/agents/{id}/index.ttl#this)
     // - External: Contact URI (/.data/contacts/{id}.ttl#this)
     // No reference() constraint - accepts any valid URI.
     maker: uri('maker').predicate(FOAF.maker),

package/dist/resource-identity.d.ts

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,68 @@
+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)}/`;
+}

package/dist/skill.schema.js

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

package/package.json

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