@undefineds.co/xpod 0.3.48 → 0.3.50

package/dist/api/chatkit/pod-store.js

@@ -7,10 +7,10 @@ exports.PodChatKitStore = void 0;
  * 将 ChatKit 数据存储到 Solid Pod。
  *
  * 存储结构:
- * /.data/{chat|task}/{surfaceId}/
+ * /.data/{chat|task}/{parent-derived-id}/
  *   index.ttl
- *     #this                           # Chat (meeting:LongChat)
- *     #{threadId}                     # Thread (sioc:Thread)
+ *     #this                           # Chat parent (meeting:LongChat)
+ *     #{threadId}                     # Thread (sioc:Thread, sioc:has_parent)
  *   {yyyy}/{MM}/{dd}/messages.ttl     # Messages (meeting:Message)
  */
 const drizzle_solid_1 = require("@undefineds.co/drizzle-solid");
@@ -28,6 +28,8 @@ const model_1 = require("../../ai/schema/model");
 const tables_1 = require("../../credential/schema/tables");
 const types_2 = require("../../credential/schema/types");
 const models_1 = require("@undefineds.co/models");
+const reconciler_1 = require("../reconciler");
+const protocol_metadata_1 = require("../protocol-metadata");
 const schema = {
     chat: schema_1.Chat,
     thread: schema_1.Thread,
@@ -45,9 +47,8 @@ const schema = {
  * 数据模型映射：
  * - ChatKit thread = Thread (sioc:Thread)
  * - ChatKit thread item = Message (meeting:Message)
- * - ChatKit 协议里的 chat_id 在内部映射为 surfaceId
- *
- * 每个 Thread 属于一个 Chat 容器。默认使用 'default' Chat。
+ * - Thread 通过 sioc:has_parent 归属到 Chat 或 Task command surface。
+ * - ChatKit/API 的 opaque 字段不进入 Pod 持久 metadata；内部存储路径从 parent/id 派生。
  */
 class PodChatKitStore {
     constructor(options) {
@@ -55,6 +56,7 @@ class PodChatKitStore {
         // Track recently created message IDs to avoid SELECT cache timing issues
         this.recentlyCreatedIds = new Set();
         this.tokenEndpoint = options.tokenEndpoint;
+        this.serverGroupReconcilerService = options.serverGroupReconcilerService;
     }
     // =========================================================================
     // Private Helpers
@@ -337,17 +339,9 @@ class PodChatKitStore {
                 return { type: 'active' };
         }
     }
-    getCommandKindFromMetadata(metadata) {
-        return metadata?.commandKind === 'task' ? 'task' : 'chat';
-    }
-    getSurfaceIdFromMetadata(metadata) {
-        if (metadata && typeof metadata.surface_id === 'string') {
-            return metadata.surface_id;
-        }
-        if (metadata && typeof metadata.chat_id === 'string') {
-            return metadata.chat_id;
-        }
-        return PodChatKitStore.DEFAULT_CHAT_ID;
+    readMetadataString(metadata, key) {
+        const value = metadata?.[key];
+        return typeof value === 'string' && value.trim() ? value.trim() : undefined;
     }
     isBaseRelativeChatResourceId(value) {
         return typeof value === 'string'
@@ -361,6 +355,12 @@ class PodChatKitStore {
         }
         return `${chatId.replace(/^#/, '')}/index.ttl#this`;
     }
+    buildMessageParentResourceId(surface) {
+        if (surface.commandKind === 'task') {
+            return `task/index.ttl#${surface.surfaceId}`;
+        }
+        return `chat/${surface.surfaceId}/index.ttl#this`;
+    }
     chatSurfaceIdFromResourceId(chatId) {
         if (!chatId) {
             return undefined;
@@ -384,6 +384,136 @@ class PodChatKitStore {
         }
         return this.chatSurfaceIdFromResourceId(chat);
     }
+    commandSurfaceFromResourceRef(resource) {
+        if (!resource) {
+            return undefined;
+        }
+        const parseRef = (ref, hash) => {
+            const normalizedHash = hash?.startsWith('#') ? hash.slice(1) : hash;
+            const trimmed = ref.replace(/^\/+/, '');
+            const dataIndex = trimmed.indexOf('.data/');
+            const dataRef = dataIndex >= 0 ? trimmed.slice(dataIndex + '.data/'.length) : trimmed;
+            const [pathPart, fragmentPart] = dataRef.split('#', 2);
+            const fragment = decodeURIComponent(normalizedHash || fragmentPart || '');
+            let match = pathPart.match(/^chat\/([^/]+)\/index\.ttl$/);
+            if (match && (!fragment || fragment === 'this')) {
+                return {
+                    commandKind: 'chat',
+                    surfaceId: decodeURIComponent(match[1]),
+                };
+            }
+            match = pathPart.match(/^task\/index\.ttl$/);
+            if (match && fragment) {
+                return {
+                    commandKind: 'task',
+                    surfaceId: fragment,
+                };
+            }
+            match = pathPart.match(/^(chat|task)\/([^/]+)(?:\/|$)/);
+            if (match) {
+                return {
+                    commandKind: match[1] === 'task' ? 'task' : 'chat',
+                    surfaceId: decodeURIComponent(match[2]),
+                };
+            }
+            return undefined;
+        };
+        try {
+            const url = new URL(resource);
+            return parseRef(url.pathname, url.hash);
+        }
+        catch {
+            return parseRef(resource);
+        }
+    }
+    resolveTaskParentResource(taskRef, context) {
+        if (/^https?:\/\//.test(taskRef)) {
+            return taskRef;
+        }
+        if (taskRef.startsWith('task/')) {
+            return this.resolveDataResource(taskRef, context);
+        }
+        const podBaseUrl = this.ensurePodBaseUrlCache(context);
+        if (!podBaseUrl) {
+            throw new Error(`Cannot resolve Pod base URL for task parent: ${taskRef}`);
+        }
+        return (0, store_2.resolveTaskResource)(podBaseUrl, (0, store_2.buildTaskResourceId)(taskRef));
+    }
+    resolveExplicitThreadParentResource(parentRef, commandKind, context) {
+        if (/^https?:\/\//.test(parentRef)) {
+            return parentRef;
+        }
+        if (parentRef.startsWith('chat/') || parentRef.startsWith('task/')) {
+            return this.resolveDataResource(parentRef, context);
+        }
+        if (commandKind === 'task') {
+            return this.resolveTaskParentResource(parentRef, context);
+        }
+        return this.resolveDataResource(`chat/${parentRef}/index.ttl#this`, context);
+    }
+    resolveThreadParent(thread, context) {
+        const metadata = thread.metadata;
+        const explicitParent = thread.parent ?? this.readMetadataString(metadata, 'parent');
+        const taskRef = this.readMetadataString(metadata, 'task') ?? this.readMetadataString(metadata, 'taskId');
+        if (explicitParent) {
+            const derived = (0, types_1.getThreadParent)({ id: thread.id, parent: explicitParent });
+            const requestedCommandKind = derived?.kind ?? (taskRef ? 'task' : 'chat');
+            const parent = this.resolveExplicitThreadParentResource(explicitParent, requestedCommandKind, context);
+            const surface = this.commandSurfaceFromResourceRef(parent) ?? (derived
+                ? { commandKind: derived.kind, surfaceId: derived.key }
+                : undefined);
+            if (surface) {
+                return { ...surface, parent };
+            }
+            return {
+                commandKind: requestedCommandKind,
+                surfaceId: PodChatKitStore.DEFAULT_CHAT_ID,
+                parent,
+            };
+        }
+        if (taskRef) {
+            const parent = this.resolveTaskParentResource(taskRef, context);
+            const surface = this.commandSurfaceFromResourceRef(parent);
+            return {
+                commandKind: 'task',
+                surfaceId: surface?.surfaceId ?? (0, store_1.extractResourceLocalId)(taskRef),
+                parent,
+            };
+        }
+        const derived = (0, types_1.getThreadParent)(thread);
+        if (derived) {
+            const parent = this.resolveExplicitThreadParentResource(derived.parent, derived.kind, context);
+            const surface = this.commandSurfaceFromResourceRef(parent);
+            return {
+                commandKind: surface?.commandKind ?? derived.kind,
+                surfaceId: surface?.surfaceId ?? derived.key,
+                parent,
+            };
+        }
+        const parent = this.resolveDataResource(`chat/${PodChatKitStore.DEFAULT_CHAT_ID}/index.ttl#this`, context);
+        return {
+            commandKind: 'chat',
+            surfaceId: PodChatKitStore.DEFAULT_CHAT_ID,
+            parent,
+        };
+    }
+    threadStoredMetadata(metadata) {
+        if (!metadata) {
+            return undefined;
+        }
+        const stored = { ...metadata };
+        delete stored.parent;
+        delete stored.chat_id;
+        delete stored.commandKind;
+        delete stored.surface_id;
+        delete stored.conversationKind;
+        return Object.keys(stored).length > 0 ? stored : undefined;
+    }
+    mentionsFromUserMessageContent(content) {
+        return (0, reconciler_1.normalizeAgentUris)(content
+            .filter((entry) => entry.type === 'input_tag')
+            .map((entry) => entry.tag));
+    }
     /**
      * 确保 Chat 容器存在，如果不存在则创建
      */
@@ -405,6 +535,7 @@ class PodChatKitStore {
                 title: surfaceId === PodChatKitStore.DEFAULT_CHAT_ID ? 'Default Chat' : surfaceId,
                 author: webId || null,
                 status: 'active',
+                metadata: (0, reconciler_1.reconcilerCoordinationMetadata)('client'),
                 createdAt: now,
                 updatedAt: now,
             });
@@ -412,29 +543,28 @@ class PodChatKitStore {
         }
     }
     /**
-     * 将 ThreadRecord 转为 ThreadMetadata
-     * ChatKit 边界继续暴露 metadata.chat_id；内部同一值叫 surface_id。
+     * 将 ThreadRecord 转为 ThreadMetadata。
+     * Pod 中以 thread.parent 作为权威归属关系，metadata 只返回业务扩展字段。
      */
-    threadRecordToMetadata(record, chatResourceMap) {
-        const extra = this.parseJsonObject(record.metadata);
-        const commandKind = record.commandKind === 'task' || extra?.commandKind === 'task' ? 'task' : 'chat';
-        const surfaceId = record.surfaceId
-            || (typeof extra?.surface_id === 'string' ? extra.surface_id : undefined)
-            || (typeof extra?.chat_id === 'string' ? extra.chat_id : undefined)
-            || this.resolveChatSurfaceFromResource(record.chat, chatResourceMap, PodChatKitStore.DEFAULT_CHAT_ID);
+    threadRecordToMetadata(record) {
+        const extra = this.threadStoredMetadata(this.parseJsonObject(record.metadata));
+        const parent = record.parent
+            ?? (0, types_1.getThreadParent)({ id: record.id })?.parent
+            ?? (this.chatSurfaceIdFromResource(record.chat)
+                ? `chat/${this.chatSurfaceIdFromResource(record.chat)}/index.ttl#this`
+                : undefined);
+        const reconcilerOwner = (0, reconciler_1.normalizeReconcilerOwner)(extra?.reconcilerOwner, 'client');
+        const coordination = (0, reconciler_1.reconcilerCoordinationMetadata)(reconcilerOwner);
         return {
             id: record.id,
+            parent,
             title: record.title || undefined,
             status: this.stringToStatus(record.status),
             workspace: record.workspace || undefined,
+            ...coordination,
             created_at: record.createdAt ? Math.floor(new Date(record.createdAt).getTime() / 1000) : (0, types_1.nowTimestamp)(),
             updated_at: record.updatedAt ? Math.floor(new Date(record.updatedAt).getTime() / 1000) : (0, types_1.nowTimestamp)(),
-            metadata: {
-                ...(extra ?? {}),
-                chat_id: surfaceId,
-                commandKind,
-                surface_id: surfaceId,
-            },
+            metadata: extra,
         };
     }
     timestampToIso(timestamp) {
@@ -628,14 +758,11 @@ class PodChatKitStore {
     }
     runRecordToData(record) {
         const metadata = this.parseJsonObject(record.metadata);
-        const xpod = this.getXpodMetadata(metadata);
         return {
             id: record.id || '',
-            surfaceId: record.surfaceId || (typeof xpod?.surfaceId === 'string' ? xpod.surfaceId : 'default'),
             task: record.task || undefined,
             thread: record.thread || '',
             workspace: record.workspace || '',
-            commandKind: record.commandKind === 'task' || xpod?.commandKind === 'task' ? 'task' : 'chat',
             status: (record.status || 'queued'),
             runner: record.runner || '',
             prompt: record.prompt || undefined,
@@ -652,14 +779,13 @@ class PodChatKitStore {
             updatedAt: this.isoToTimestamp(record.updatedAt) ?? (0, types_1.nowTimestamp)(),
         };
     }
-    runStepRecordToData(record) {
+    runStepRecordToData(record, context) {
         const payload = this.parseJsonObject(record.payload) ?? this.parseJsonObject(record.data);
-        const xpod = this.getXpodMetadata(payload);
+        const runId = record.runId
+            || (record.run ? this.baseRelativeIdFromResource(record.run, context) : '');
         return {
             id: record.id || '',
-            commandKind: record.commandKind === 'task' || xpod?.commandKind === 'task' ? 'task' : 'chat',
-            surfaceId: record.surfaceId || (typeof xpod?.surfaceId === 'string' ? xpod.surfaceId : 'default'),
-            runId: record.runId || (typeof xpod?.runId === 'string' ? xpod.runId : ''),
+            runId,
             run: record.run || '',
             type: record.type || record.stepType || 'runtime.event',
             message: record.message || undefined,
@@ -672,7 +798,6 @@ class PodChatKitStore {
         const xpod = this.getXpodMetadata(metadata);
         return {
             id: record.id || '',
-            surfaceId: record.surfaceId || (typeof xpod?.surfaceId === 'string' ? xpod.surfaceId : 'default'),
             title: record.title || undefined,
             prompt: record.prompt || '',
             thread: record.thread || '',
@@ -734,48 +859,6 @@ class PodChatKitStore {
             };
         }
     }
-    /**
-     * 获取或构建 Chat resource -> surface id 的映射缓存。
-     * drizzle-solid 的 link(Chat) 字段返回完整资源引用，通过 Chat 的 @id 比对还原路径槽位。
-     */
-    async getChatResourceMap(context) {
-        if (context._chatResourceMap) {
-            return context._chatResourceMap;
-        }
-        const db = await this.getDb(context);
-        const map = new Map();
-        if (db) {
-            try {
-                const chats = await db.select().from(schema_1.Chat);
-                for (const c of chats) {
-                    const uri = c['@id'];
-                    const surfaceId = this.chatSurfaceIdFromResourceId(c.id) ?? c.id;
-                    if (uri)
-                        map.set(uri, surfaceId);
-                }
-            }
-            catch {
-                // ignore
-            }
-        }
-        context._chatResourceMap = map;
-        return map;
-    }
-    /**
-     * 从 Chat resource 还原 surface id。
-     * 优先通过 @id 映射；若调用方本来给的是裸 ID，则原样使用。
-     */
-    resolveChatSurfaceFromResource(chat, chatResourceMap, defaultSurfaceId) {
-        if (!chat)
-            return defaultSurfaceId;
-        const bare = chatResourceMap.get(chat);
-        if (bare)
-            return bare;
-        const parsed = this.chatSurfaceIdFromResource(chat);
-        if (parsed)
-            return parsed;
-        return chat.includes('/') ? defaultSurfaceId : chat;
-    }
     isAbsoluteHttpResource(value) {
         try {
             const url = new URL(value);
@@ -841,24 +924,7 @@ class PodChatKitStore {
                 thread: threadResource,
             };
         }
-        if (!('chat_id' in thread) || !thread.chat_id) {
-            throw new Error(`chat_id is required when thread_id "${threadRef}" is not a full thread resource id`);
-        }
-        const surfaceId = thread.chat_id;
-        const commandKind = 'chat';
-        const threadId = this.generateThreadResourceId({
-            key: threadRef,
-            commandKind,
-            surfaceId,
-        });
-        const threadResource = this.resolveDataResource(threadId, context);
-        this.cacheThreadSurfaceId(context, threadId, surfaceId);
-        return {
-            threadId,
-            commandKind,
-            surfaceId,
-            thread: threadResource,
-        };
+        throw new Error(`complete thread resource id is required, got "${threadRef}"`);
     }
     /**
      * 缓存 Thread -> surfaceId 映射
@@ -903,65 +969,27 @@ class PodChatKitStore {
         return binding?.[key]?.value ?? null;
     }
     async selectMessagesForThread(thread, context) {
-        await this.getDb(context);
-        const cachedFetch = this.getCachedFetch(context);
-        const podBaseUrl = this.getCachedPodBaseUrl(context);
-        if (!cachedFetch || !podBaseUrl) {
+        const db = await this.getDb(context);
+        if (!db) {
             return [];
         }
         const resolvedThread = await this.resolveThreadRef(thread, context);
-        const endpoint = `${podBaseUrl}/.data/chat/-/sparql`;
-        const query = `
-      PREFIX meeting: <http://www.w3.org/ns/pim/meeting#>
-      PREFIX sioc: <http://rdfs.org/sioc/ns#>
-      PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-      PREFIX dcterms: <http://purl.org/dc/terms/>
-      PREFIX udfs: <https://undefineds.co/ns#>
-      SELECT ?msg ?maker ?messageType ?legacyRole ?content ?messageStatus ?legacyStatus ?createdAt ?legacyCreatedAt ?toolName ?toolCallId ?metadata
-      WHERE {
-        <${resolvedThread.thread}> sioc:has_member ?msg .
-        ?msg a meeting:Message .
-        OPTIONAL { ?msg foaf:maker ?maker . }
-        OPTIONAL { ?msg udfs:messageType ?messageType . }
-        OPTIONAL { ?msg udfs:role ?legacyRole . }
-        OPTIONAL { ?msg sioc:content ?content . }
-        OPTIONAL { ?msg udfs:messageStatus ?messageStatus . }
-        OPTIONAL { ?msg udfs:status ?legacyStatus . }
-        OPTIONAL { ?msg dcterms:created ?createdAt . }
-        OPTIONAL { ?msg udfs:createdAt ?legacyCreatedAt . }
-        OPTIONAL { ?msg udfs:toolName ?toolName . }
-        OPTIONAL { ?msg udfs:toolCallId ?toolCallId . }
-        OPTIONAL { ?msg udfs:metadata ?metadata . }
-      }
-      ORDER BY ?createdAt
-    `.trim();
-        const response = await cachedFetch(endpoint, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/sparql-query',
-                Accept: 'application/sparql-results+json',
-            },
-            body: query,
-        });
-        if (!response.ok) {
-            const text = await response.text().catch(() => '');
-            throw new Error(`Failed to query thread messages: ${response.status} ${response.statusText} - ${text}`);
-        }
-        const json = await response.json();
-        const bindings = json.results?.bindings ?? [];
-        return bindings.map((binding) => ({
-            id: this.baseRelativeIdFromResource(this.parseSparqlBindingValue(binding, 'msg') ?? '', context),
-            chat: null,
+        const records = await models_1.messageRepository.list(db, {
             thread: resolvedThread.thread,
-            maker: this.parseSparqlBindingValue(binding, 'maker'),
-            role: this.parseSparqlBindingValue(binding, 'messageType') ?? this.parseSparqlBindingValue(binding, 'legacyRole'),
-            content: this.parseSparqlBindingValue(binding, 'content'),
-            status: this.parseSparqlBindingValue(binding, 'messageStatus') ?? this.parseSparqlBindingValue(binding, 'legacyStatus'),
-            createdAt: this.parseSparqlBindingValue(binding, 'createdAt') ?? this.parseSparqlBindingValue(binding, 'legacyCreatedAt'),
-            toolName: this.parseSparqlBindingValue(binding, 'toolName'),
-            toolCallId: this.parseSparqlBindingValue(binding, 'toolCallId'),
-            metadata: this.parseSparqlBindingValue(binding, 'metadata'),
-            resource: this.parseSparqlBindingValue(binding, 'msg'),
+        });
+        return records.map((record) => ({
+            id: record.id || '',
+            chat: record.chat || null,
+            thread: record.thread || resolvedThread.thread,
+            maker: record.maker || null,
+            role: record.role || null,
+            content: record.content || null,
+            status: record.status || null,
+            createdAt: record.createdAt || null,
+            toolName: record.toolName || null,
+            toolCallId: record.toolCallId || null,
+            metadata: record.metadata || null,
+            resource: record.id ? this.resolveDataResource(record.id, context) : null,
         }));
     }
     datePathFromTimestamp(timestamp) {
@@ -983,12 +1011,13 @@ class PodChatKitStore {
         });
     }
     generateItemId(itemType, thread, _context) {
-        const commandKind = thread.metadata?.commandKind === 'task' ? 'task' : 'chat';
-        const surfaceId = this.getSurfaceIdFromMetadata(thread.metadata);
+        const surface = this.commandSurfaceFromResourceRef(thread.parent)
+            ?? this.commandSurfaceFromResourceRef(thread.id)
+            ?? { commandKind: 'chat', surfaceId: PodChatKitStore.DEFAULT_CHAT_ID };
         return this.generateMessageResourceId({
             key: (0, types_1.generateId)(itemType.replace('_', '-')),
-            commandKind,
-            surfaceId,
+            commandKind: surface.commandKind,
+            surfaceId: surface.surfaceId,
         });
     }
     // =========================================================================
@@ -1010,11 +1039,13 @@ class PodChatKitStore {
         if (!threadRecord) {
             throw new Error(`Thread not found: ${resolvedThread.threadId}`);
         }
-        const chatResourceMap = await this.getChatResourceMap(context);
-        const metadata = this.threadRecordToMetadata(threadRecord, chatResourceMap);
+        const metadata = this.threadRecordToMetadata(threadRecord);
         // 缓存结果
         this.cacheThreadMetadata(context, metadata);
-        this.cacheThreadSurfaceId(context, metadata.id, resolvedThread.surfaceId);
+        const surface = this.commandSurfaceFromResourceRef(metadata.parent) ?? this.commandSurfaceFromResourceRef(metadata.id);
+        if (surface) {
+            this.cacheThreadSurfaceId(context, metadata.id, surface.surfaceId);
+        }
         return metadata;
     }
     async saveThread(thread, context) {
@@ -1023,15 +1054,16 @@ class PodChatKitStore {
             throw new Error('Cannot access Pod: invalid credentials');
         }
         const now = new Date().toISOString();
-        const commandKind = this.getCommandKindFromMetadata(thread.metadata);
-        const surfaceId = this.getSurfaceIdFromMetadata(thread.metadata);
-        thread.metadata = {
-            ...(thread.metadata ?? {}),
-            commandKind,
-            surface_id: surfaceId,
-            chat_id: surfaceId,
-        };
-        const metadataObject = this.jsonObjectOrNull(thread.metadata);
+        const parent = this.resolveThreadParent(thread, context);
+        const commandKind = parent.commandKind;
+        const surfaceId = parent.surfaceId;
+        const reconcilerOwner = (0, reconciler_1.normalizeReconcilerOwner)(thread.metadata?.reconcilerOwner ?? thread.reconcilerOwner, 'client');
+        const coordination = (0, reconciler_1.reconcilerCoordinationMetadata)(reconcilerOwner);
+        const storedMetadata = (0, reconciler_1.withReconcilerCoordinationMetadata)(this.threadStoredMetadata(thread.metadata), reconcilerOwner);
+        thread.parent = parent.parent;
+        thread.reconcilerOwner = coordination.reconcilerOwner;
+        thread.metadata = storedMetadata;
+        const metadataObject = this.jsonObjectOrNull(storedMetadata);
         if (commandKind === 'chat') {
             await this.ensureChat(surfaceId, context);
         }
@@ -1048,8 +1080,7 @@ class PodChatKitStore {
         if (existing) {
             // Update
             await db.updateByIri(schema_1.Thread, threadResource, {
-                chat: commandKind === 'chat' ? this.buildChatResourceId(surfaceId) : null,
-                task: commandKind === 'task' ? (0, store_2.buildTaskResourceId)(`index.ttl#${surfaceId}`) : null,
+                parent: parent.parent,
                 title: thread.title || null,
                 status: this.statusToString(thread.status),
                 workspace: thread.workspace || null,
@@ -1061,8 +1092,7 @@ class PodChatKitStore {
             // Insert
             await db.insert(schema_1.Thread).values({
                 id: threadResourceId,
-                chat: commandKind === 'chat' ? this.buildChatResourceId(surfaceId) : null,
-                task: commandKind === 'task' ? (0, store_2.buildTaskResourceId)(`index.ttl#${surfaceId}`) : null,
+                parent: parent.parent,
                 title: thread.title || null,
                 status: this.statusToString(thread.status),
                 workspace: thread.workspace || null,
@@ -1071,15 +1101,12 @@ class PodChatKitStore {
                 updatedAt: now,
             });
         }
-        // 缓存完整的 Thread metadata，确保 ChatKit metadata.chat_id 包含正确的 surface。
+        // 缓存完整的 Thread metadata；metadata 不包含协议兼容字段。
         const threadMetadata = {
             ...thread,
-            metadata: {
-                ...(thread.metadata ?? {}),
-                commandKind,
-                surface_id: surfaceId,
-                chat_id: surfaceId,
-            },
+            parent: parent.parent,
+            ...coordination,
+            metadata: storedMetadata,
         };
         this.cacheThreadMetadata(context, threadMetadata);
     }
@@ -1089,11 +1116,10 @@ class PodChatKitStore {
             return { data: [], has_more: false };
         }
         try {
-            const threads = await db.select().from(schema_1.Thread);
-            const chatResourceMap = await this.getChatResourceMap(context);
+            const threads = await models_1.threadRepository.list(db);
             const metadataById = new Map();
             for (const thread of threads) {
-                const metadata = this.threadRecordToMetadata(thread, chatResourceMap);
+                const metadata = this.threadRecordToMetadata(thread);
                 metadataById.set(metadata.id, metadata);
             }
             for (const cached of this.getCachedThreadMetadataList(context)) {
@@ -1211,17 +1237,22 @@ class PodChatKitStore {
         const webId = this.getWebId(context);
         let content = '';
         let role = schema_1.MessageRole.USER;
-        let status = null;
+        let status = schema_1.MessageStatus.COMPLETED;
         let toolName = null;
         let toolCallId = null;
         let metadata = null;
+        let mentions = [];
+        const threadMetadata = await this.loadThread({ thread_id: resolvedThread.threadId }, context).catch(() => undefined);
+        const reconcilerOwner = (0, reconciler_1.normalizeReconcilerOwner)(threadMetadata?.metadata?.reconcilerOwner ?? threadMetadata?.reconcilerOwner, 'client');
         if (item.type === 'user_message') {
             const userItem = item;
             content = userItem.content
                 .filter((c) => c.type === 'input_text')
                 .map((c) => c.text)
                 .join('\n');
+            mentions = this.mentionsFromUserMessageContent(userItem.content);
             role = schema_1.MessageRole.USER;
+            status = schema_1.MessageStatus.SENT;
         }
         else if (item.type === 'assistant_message') {
             const assistantItem = item;
@@ -1249,9 +1280,23 @@ class PodChatKitStore {
             // 其他类型暂时存储为 JSON
             content = JSON.stringify(item);
             role = schema_1.MessageRole.SYSTEM;
-        }
+            status = schema_1.MessageStatus.COMPLETED;
+        }
+        const durableMessageMetadata = (0, protocol_metadata_1.withProtocolMetadata)((0, reconciler_1.withReconcilerCoordinationMetadata)((0, protocol_metadata_1.withoutProtocolProjectionKeys)(metadata ?? undefined, [
+            'chat_id',
+            'thread_id',
+            'item_id',
+            'commandKind',
+            'surface_id',
+            'conversationKind',
+        ]), reconcilerOwner), 'chatkit', {
+            chat_id: resolvedThread.surfaceId,
+            thread_id: resolvedThread.threadId,
+            item_id: itemResourceId,
+        });
         const messageRecord = {
             id: itemResourceId,
+            parent: this.resolveDataResource(this.buildMessageParentResourceId(resolvedThread), context),
             chat: resolvedThread.commandKind === 'chat' ? this.buildChatResourceId(resolvedThread.surfaceId) : null,
             thread: resolvedThread.thread,
             maker: role === schema_1.MessageRole.USER ? webId : null,
@@ -1260,18 +1305,41 @@ class PodChatKitStore {
             status,
             toolName,
             toolCallId,
-            metadata: this.jsonObjectOrNull({
-                ...(metadata ?? {}),
-                commandKind: resolvedThread.commandKind,
-                surface_id: resolvedThread.surfaceId,
-                chat_id: resolvedThread.surfaceId,
-            }),
+            metadata: this.jsonObjectOrNull(durableMessageMetadata),
             createdAt: new Date(item.created_at * 1000).toISOString(),
         };
         await db.insert(schema_1.Message).values(messageRecord);
+        await this.reconcileGroupUserMessage({
+            thread: resolvedThread.thread,
+            triggerMessage: this.resolveDataResource(itemResourceId, context),
+            actor: String(webId ?? context.userId),
+            role,
+            content,
+            reconcilerOwner,
+            mentions,
+        });
         // Track this ID to avoid cache timing issues in saveItem
         this.recentlyCreatedIds.add(item.id);
     }
+    async reconcileGroupUserMessage(input) {
+        if (!this.serverGroupReconcilerService || input.role !== schema_1.MessageRole.USER) {
+            return;
+        }
+        try {
+            await this.serverGroupReconcilerService.reconcileThreadMessage({
+                thread: input.thread,
+                triggerMessage: input.triggerMessage,
+                actor: input.actor,
+                role: 'user',
+                content: input.content,
+                reconcilerOwner: input.reconcilerOwner,
+                mentions: input.mentions,
+            });
+        }
+        catch (error) {
+            this.logger.warn(`Failed to enqueue ChatKit group Reconciler wake: ${error}`);
+        }
+    }
     async saveItem(thread, item, context) {
         const db = await this.getDb(context);
         if (!db) {
@@ -1463,10 +1531,6 @@ WHERE { ${deletePatterns.join(' ')} }
         }
         run.id = (0, store_1.buildRunResourceId)(run);
         const existing = await db.findById(schema_2.Run, run.id);
-        const metadata = this.withXpodMetadata(run.metadata, {
-            commandKind: run.commandKind,
-            surfaceId: run.surfaceId,
-        });
         const values = {
             task: run.task || null,
             thread: run.thread,
@@ -1480,7 +1544,7 @@ WHERE { ${deletePatterns.join(' ')} }
             heartbeatAt: this.timestampToIso(run.heartbeatAt),
             cancelRequestedAt: this.timestampToIso(run.cancelRequestedAt),
             error: run.error || null,
-            metadata: this.jsonObjectOrNull(metadata),
+            metadata: this.jsonObjectOrNull(run.metadata),
             createdAt: this.timestampToIso(run.createdAt) ?? new Date().toISOString(),
             startedAt: this.timestampToIso(run.startedAt),
             completedAt: this.timestampToIso(run.completedAt),
@@ -1528,10 +1592,7 @@ WHERE { ${deletePatterns.join(' ')} }
         const records = conditions.length > 0
             ? await query.where((0, drizzle_solid_1.and)(...conditions))
             : await query;
-        let runs = records.map((record) => this.runRecordToData(record));
-        if (options.commandKind) {
-            runs = runs.filter((run) => run.commandKind === options.commandKind);
-        }
+        const runs = records.map((record) => this.runRecordToData(record));
         return runs
             .sort((a, b) => b.createdAt - a.createdAt || b.id.localeCompare(a.id))
             .slice(0, options.limit ?? runs.length);
@@ -1545,16 +1606,13 @@ WHERE { ${deletePatterns.join(' ')} }
             throw new Error(`RunStep runId must be a complete Run resource id: ${event.runId}`);
         }
         event.id = (0, store_1.buildRunStepResourceId)(event);
+        const runResource = event.run || this.resolveDataResource(event.runId, context);
         await db.insert(schema_2.RunStep).values({
             id: event.id,
-            run: event.run,
             stepType: event.type,
+            run: runResource,
             message: event.message || null,
-            payload: this.jsonObjectOrNull(this.withXpodMetadata(event.data, {
-                commandKind: event.commandKind,
-                surfaceId: event.surfaceId,
-                runId: event.runId,
-            })),
+            payload: this.jsonObjectOrNull(event.data),
             createdAt: this.timestampToIso(event.createdAt) ?? new Date().toISOString(),
         });
     }
@@ -1566,9 +1624,10 @@ WHERE { ${deletePatterns.join(' ')} }
         if (!(0, store_1.isRunResourceId)(runId)) {
             throw new Error(`loadRunSteps requires a base-relative Run id: ${runId}`);
         }
-        const records = await db.select().from(schema_2.RunStep).where((0, drizzle_solid_1.eq)(schema_2.RunStep.run, this.resolveDataResource(runId, context)));
+        const resolvedRun = this.resolveDataResource(runId, context);
+        const records = await db.select().from(schema_2.RunStep).where((0, drizzle_solid_1.eq)(schema_2.RunStep.run, resolvedRun));
         return records
-            .map((record) => this.runStepRecordToData(record))
+            .map((record) => this.runStepRecordToData(record, context))
             .sort((a, b) => a.createdAt - b.createdAt || a.id.localeCompare(b.id));
     }
     async claimRun(input, context) {
@@ -1595,7 +1654,6 @@ WHERE { ${deletePatterns.join(' ')} }
         task.id = (0, store_2.buildTaskResourceId)(task.id);
         const existing = await db.findById(schema_3.Task, task.id);
         const metadata = this.withXpodMetadata(this.withTaskAuthBindingMetadata(task.metadata, task.authBinding), {
-            surfaceId: task.surfaceId,
             runner: task.runner,
             triggerKind: task.triggerKind,
             cron: task.cron ?? null,
@@ -1859,21 +1917,24 @@ WHERE { ${deletePatterns.join(' ')} }
         }
         const endpoint = `${podBaseUrl.replace(/\/$/, '')}/settings/-/sparql`;
         const query = `
+      PREFIX cred: <https://vocab.xpod.dev/credential#>
+      PREFIX ai: <https://vocab.xpod.dev/ai#>
       PREFIX udfs: <https://undefineds.co/ns#>
-      SELECT ?cred ?provider ?apiKey ?isDefault ?lastUsedAt ?failCount ?baseUrl ?proxyUrl ?defaultModel ?hasModel
+      SELECT ?cred ?provider ?apiKey ?isDefault ?lastUsedAt ?failCount ?providerBaseUrl ?credentialBaseUrl ?providerProxyUrl ?credentialProxyUrl ?defaultModel ?hasModel
       WHERE {
-        ?cred a udfs:Credential ;
-              udfs:service "ai" ;
-              udfs:status "active" ;
-              udfs:apiKey ?apiKey .
-        OPTIONAL { ?cred udfs:provider ?provider . }
-        OPTIONAL { ?cred udfs:isDefault ?isDefault . }
-        OPTIONAL { ?cred udfs:lastUsedAt ?lastUsedAt . }
-        OPTIONAL { ?cred udfs:failCount ?failCount . }
-        OPTIONAL { ?provider udfs:baseUrl ?baseUrl . }
-        OPTIONAL { ?provider udfs:proxyUrl ?proxyUrl . }
-        OPTIONAL { ?provider udfs:defaultModel ?defaultModel . }
-        OPTIONAL { ?provider udfs:hasModel ?hasModel . }
+        ?cred (cred:service|udfs:service) "ai" ;
+              (cred:status|udfs:status) "active" ;
+              (cred:apiKey|udfs:apiKey) ?apiKey .
+        OPTIONAL { ?cred (cred:provider|udfs:provider) ?provider . }
+        OPTIONAL { ?cred (cred:isDefault|udfs:isDefault) ?isDefault . }
+        OPTIONAL { ?cred (cred:lastUsedAt|udfs:lastUsedAt) ?lastUsedAt . }
+        OPTIONAL { ?cred (cred:failCount|udfs:failCount) ?failCount . }
+        OPTIONAL { ?cred (cred:baseUrl|udfs:baseUrl) ?credentialBaseUrl . }
+        OPTIONAL { ?cred (cred:proxyUrl|udfs:proxyUrl) ?credentialProxyUrl . }
+        OPTIONAL { ?provider (ai:baseUrl|udfs:baseUrl) ?providerBaseUrl . }
+        OPTIONAL { ?provider (ai:proxyUrl|udfs:proxyUrl) ?providerProxyUrl . }
+        OPTIONAL { ?provider (ai:defaultModel|udfs:defaultModel) ?defaultModel . }
+        OPTIONAL { ?provider (ai:hasModel|udfs:hasModel) ?hasModel . }
       }
     `.trim();
         const response = await cachedFetch(endpoint, {
@@ -1900,8 +1961,10 @@ WHERE { ${deletePatterns.join(' ')} }
                 isDefault: this.parseSparqlBindingValue(binding, 'isDefault'),
                 lastUsedAt: this.parseSparqlBindingValue(binding, 'lastUsedAt'),
                 failCount: this.parseIntegerValue(this.parseSparqlBindingValue(binding, 'failCount')),
-                baseUrl: this.parseSparqlBindingValue(binding, 'baseUrl'),
-                proxyUrl: this.parseSparqlBindingValue(binding, 'proxyUrl'),
+                baseUrl: this.parseSparqlBindingValue(binding, 'providerBaseUrl')
+                    ?? this.parseSparqlBindingValue(binding, 'credentialBaseUrl'),
+                proxyUrl: this.parseSparqlBindingValue(binding, 'providerProxyUrl')
+                    ?? this.parseSparqlBindingValue(binding, 'credentialProxyUrl'),
                 defaultModel: this.parseSparqlBindingValue(binding, 'defaultModel')
                     ?? this.parseSparqlBindingValue(binding, 'hasModel'),
             };
@@ -1933,9 +1996,14 @@ WHERE { ${deletePatterns.join(' ')} }
         }
         this.ensurePodBaseUrlCache(context, db);
         try {
-            const sparqlConfig = await this.queryAiConfigFromSettingsSparql(context);
-            if (sparqlConfig !== null) {
-                return sparqlConfig ?? undefined;
+            try {
+                const sparqlConfig = await this.queryAiConfigFromSettingsSparql(context);
+                if (sparqlConfig !== null) {
+                    return sparqlConfig ?? undefined;
+                }
+            }
+            catch (error) {
+                this.logger.warn(`Failed to read AI config via settings SPARQL, falling back to model tables: ${error}`);
             }
             // 查询活跃的 AI 凭据
             const credentials = await db.select()
@@ -2035,7 +2103,7 @@ WHERE { ${deletePatterns.join(' ')} }
         catch (error) {
             this.logger.warn(`Failed to load Pod models for ${config.providerId}: ${error}`);
         }
-        if (config.defaultModel) {
+        if (config.defaultModel && !seenModelIds.has(config.defaultModel)) {
             this.pushAvailableModel(models, seenModelIds, {
                 id: config.defaultModel,
                 name: config.defaultModel,