@undefineds.co/xpod 0.2.45 → 0.3.1

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

@@ -7,7 +7,7 @@ exports.PodChatKitStore = void 0;
  * 将 ChatKit 数据存储到 Solid Pod。
  *
  * 存储结构:
- * /.data/chat/{chatId}/
+ * /.data/{chat|task}/{surfaceId}/
  *   index.ttl
  *     #this                           # Chat (meeting:LongChat)
  *     #{threadId}                     # Thread (sioc:Thread)
@@ -17,15 +17,24 @@ const drizzle_solid_1 = require("@undefineds.co/drizzle-solid");
 const global_logger_factory_1 = require("global-logger-factory");
 const types_1 = require("./types");
 const schema_1 = require("./schema");
+const schema_2 = require("../runs/schema");
+const store_1 = require("../runs/store");
+const schema_3 = require("../tasks/schema");
+const store_2 = require("../tasks/store");
+const TaskAuthBinding_1 = require("../tasks/TaskAuthBinding");
 const AuthContext_1 = require("../auth/AuthContext");
 const provider_1 = require("../../ai/schema/provider");
 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 schema = {
     chat: schema_1.Chat,
     thread: schema_1.Thread,
     message: schema_1.Message,
+    run: schema_2.Run,
+    runStep: schema_2.RunStep,
+    task: schema_3.Task,
     provider: provider_1.Provider,
     model: model_1.Model,
     credential: tables_1.Credential,
@@ -36,7 +45,7 @@ const schema = {
  * 数据模型映射：
  * - ChatKit thread = Thread (sioc:Thread)
  * - ChatKit thread item = Message (meeting:Message)
- * - Chat (meeting:LongChat) 是容器/Agent，通过 metadata.chat_id 暴露
+ * - ChatKit 协议里的 chat_id 在内部映射为 surfaceId
  *
  * 每个 Thread 属于一个 Chat 容器。默认使用 'default' Chat。
  */
@@ -75,7 +84,7 @@ class PodChatKitStore {
                 const db = (0, drizzle_solid_1.drizzle)({ fetch: authFetch, info: { webId: auth.webId, isLoggedIn: true } }, { schema });
                 this.logger.info(`Initializing tables for Pod (access token): ${auth.webId}`);
                 try {
-                    await db.init(schema_1.Chat, schema_1.Thread, schema_1.Message);
+                    await db.init(schema_1.Chat, schema_1.Thread, schema_1.Message, schema_2.Run, schema_2.RunStep, schema_3.Task, tables_1.Credential);
                     this.logger.info('Tables initialized successfully');
                 }
                 catch (initError) {
@@ -108,7 +117,7 @@ class PodChatKitStore {
             const authFetch = this.createAccessTokenFetch(token.accessToken, token.tokenType);
             this.logger.info(`Initializing tables for Pod: ${webId}`);
             try {
-                await db.init(schema_1.Chat, schema_1.Thread, schema_1.Message);
+                await db.init(schema_1.Chat, schema_1.Thread, schema_1.Message, schema_2.Run, schema_2.RunStep, schema_3.Task, tables_1.Credential);
                 this.logger.info('Tables initialized successfully');
             }
             catch (initError) {
@@ -228,15 +237,53 @@ class PodChatKitStore {
                 return { type: 'active' };
         }
     }
-    /**
-     * 从 ThreadMetadata.metadata 中获取 chat_id，如果没有则返回默认值
-     */
-    getChatIdFromMetadata(metadata) {
+    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;
     }
+    isBaseRelativeChatResourceId(value) {
+        return typeof value === 'string'
+            && !/^https?:\/\//.test(value)
+            && !value.startsWith('/')
+            && /^[^/]+\/index\.ttl#this$/.test(value);
+    }
+    buildChatResourceId(chatId) {
+        if (this.isBaseRelativeChatResourceId(chatId)) {
+            return chatId;
+        }
+        return `${chatId.replace(/^#/, '')}/index.ttl#this`;
+    }
+    chatSurfaceIdFromResourceId(chatId) {
+        if (!chatId) {
+            return undefined;
+        }
+        const match = chatId.match(/^([^/]+)\/index\.ttl#this$/);
+        return match ? decodeURIComponent(match[1]) : undefined;
+    }
+    chatSurfaceIdFromIri(chatIri) {
+        if (!chatIri) {
+            return undefined;
+        }
+        try {
+            const url = new URL(chatIri);
+            const match = url.pathname.match(/\/\.data\/chat\/([^/]+)\/index\.ttl$/);
+            if (match && url.hash === '#this') {
+                return decodeURIComponent(match[1]);
+            }
+        }
+        catch {
+            // Fall through to base-relative parsing.
+        }
+        return this.chatSurfaceIdFromResourceId(chatIri);
+    }
     /**
      * 确保 Chat 容器存在，如果不存在则创建
      */
@@ -246,49 +293,258 @@ class PodChatKitStore {
             throw new Error('Cannot access Pod: invalid credentials');
         }
         const webId = this.getWebId(context);
+        const chatResourceId = this.buildChatResourceId(chatId);
+        const surfaceId = this.chatSurfaceIdFromResourceId(chatResourceId) ?? chatId;
         // 检查是否存在
-        const existing = await db.findByLocator(schema_1.Chat, { id: chatId });
+        const existing = await db.findById(schema_1.Chat, chatResourceId);
         if (!existing) {
             // 创建 Chat 容器
             const now = new Date().toISOString();
             await db.insert(schema_1.Chat).values({
-                id: chatId,
-                title: chatId === PodChatKitStore.DEFAULT_CHAT_ID ? 'Default Chat' : chatId,
+                id: chatResourceId,
+                title: surfaceId === PodChatKitStore.DEFAULT_CHAT_ID ? 'Default Chat' : surfaceId,
                 author: webId || null,
                 status: 'active',
                 createdAt: now,
                 updatedAt: now,
             });
-            this.logger.info(`Created Chat container: ${chatId}`);
+            this.logger.info(`Created Chat container: ${surfaceId}`);
         }
     }
     /**
      * 将 ThreadRecord 转为 ThreadMetadata
-     * 包含 metadata.chat_id 暴露 Chat 容器 ID
+     * ChatKit 边界继续暴露 metadata.chat_id；内部同一值叫 surface_id。
      */
     threadRecordToMetadata(record, chatUriMap) {
-        const chatId = this.resolveChatIdFromUri(record.chatId, chatUriMap, PodChatKitStore.DEFAULT_CHAT_ID);
-        let extra;
-        if (record.metadata) {
-            try {
-                extra = JSON.parse(record.metadata);
-            }
-            catch {
-                // ignore invalid metadata
-            }
-        }
+        const commandKind = record.commandKind === 'task' ? 'task' : 'chat';
+        const surfaceId = record.surfaceId || this.resolveChatSurfaceFromUri(record.chat, chatUriMap, PodChatKitStore.DEFAULT_CHAT_ID);
+        const extra = this.parseJsonObject(record.metadata);
         return {
             id: record.id,
             title: record.title || undefined,
             status: this.stringToStatus(record.status),
+            workspace: record.workspace || undefined,
             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: {
-                chat_id: chatId,
                 ...(extra ?? {}),
+                chat_id: surfaceId,
+                commandKind,
+                surface_id: surfaceId,
             },
         };
     }
+    timestampToIso(timestamp) {
+        return typeof timestamp === 'number' ? new Date(timestamp * 1000).toISOString() : null;
+    }
+    isoToTimestamp(value) {
+        if (!value) {
+            return undefined;
+        }
+        const date = value instanceof Date ? value : new Date(value);
+        const time = date.getTime();
+        return Number.isNaN(time) ? undefined : Math.floor(time / 1000);
+    }
+    parseJsonObject(value) {
+        if (!value) {
+            return undefined;
+        }
+        if (typeof value === 'object' && !Array.isArray(value)) {
+            return value;
+        }
+        if (typeof value !== 'string') {
+            return undefined;
+        }
+        try {
+            const parsed = JSON.parse(value);
+            return parsed && typeof parsed === 'object' && !Array.isArray(parsed)
+                ? parsed
+                : undefined;
+        }
+        catch {
+            return undefined;
+        }
+    }
+    jsonObjectOrNull(value) {
+        return value && Object.keys(value).length > 0 ? value : null;
+    }
+    withTaskAuthBindingMetadata(metadata, authBinding) {
+        if (!authBinding) {
+            return metadata;
+        }
+        return {
+            ...(metadata ?? {}),
+            authBinding,
+        };
+    }
+    parseTaskAuthBinding(value) {
+        if (!value || typeof value !== 'object') {
+            return undefined;
+        }
+        const candidate = value;
+        if (typeof candidate.id !== 'string'
+            || typeof candidate.kind !== 'string'
+            || typeof candidate.webId !== 'string'
+            || typeof candidate.clientId !== 'string'
+            || typeof candidate.status !== 'string'
+            || typeof candidate.createdAt !== 'number') {
+            return undefined;
+        }
+        return {
+            id: candidate.id,
+            kind: candidate.kind,
+            webId: candidate.webId,
+            clientId: candidate.clientId,
+            displayName: typeof candidate.displayName === 'string' ? candidate.displayName : undefined,
+            status: candidate.status,
+            createdAt: candidate.createdAt,
+            expiresAt: typeof candidate.expiresAt === 'number' ? candidate.expiresAt : undefined,
+        };
+    }
+    isBaseRelativeDataResourceId(value) {
+        return typeof value === 'string'
+            && !/^https?:\/\//.test(value)
+            && !value.startsWith('/')
+            && value.includes('#')
+            && !value.startsWith('#');
+    }
+    isResourceLikeId(value) {
+        return typeof value === 'string'
+            && !/^https?:\/\//.test(value)
+            && !value.startsWith('/')
+            && !value.startsWith('#')
+            && (value.includes('/') || /\.ttl(?:#|$)/i.test(value) || value.includes('#'));
+    }
+    isThreadResourceId(value) {
+        return typeof value === 'string'
+            && /^(chat|task)\/[^/]+\/index\.ttl#[^#/]+$/.test(value);
+    }
+    isMessageResourceId(value) {
+        return typeof value === 'string'
+            && /^(chat|task)\/[^/]+\/\d{4}\/\d{2}\/\d{2}\/messages\.ttl#[^#/]+$/.test(value);
+    }
+    buildThreadResourceId(input) {
+        void input.commandKind;
+        void input.surfaceId;
+        if (!this.isThreadResourceId(input.id)) {
+            throw new Error(`Thread id must be a complete Thread resource id: ${input.id}`);
+        }
+        return input.id;
+    }
+    generateThreadResourceId(input) {
+        if ((0, store_1.isBaseRelativeResourceId)(input.key)) {
+            throw new Error(`Thread id generator requires a local key, got resource id: ${input.key}`);
+        }
+        if (this.isResourceLikeId(input.key)) {
+            throw new Error(`Thread id generator requires a local key: ${input.key}`);
+        }
+        return `${input.commandKind}/${input.surfaceId}/index.ttl#${(0, store_1.extractResourceLocalId)(input.key)}`;
+    }
+    buildMessageResourceId(input) {
+        void input.commandKind;
+        void input.surfaceId;
+        void input.createdAt;
+        if (!this.isMessageResourceId(input.id)) {
+            throw new Error(`Message id must be a complete Message resource id: ${input.id}`);
+        }
+        return input.id;
+    }
+    generateMessageResourceId(input) {
+        if ((0, store_1.isBaseRelativeResourceId)(input.key)) {
+            throw new Error(`Message id generator requires a local key, got resource id: ${input.key}`);
+        }
+        if (this.isResourceLikeId(input.key)) {
+            throw new Error(`Message id generator requires a local key: ${input.key}`);
+        }
+        const { yyyy, MM, dd } = this.datePathFromTimestamp(input.createdAt);
+        return `${input.commandKind}/${input.surfaceId}/${yyyy}/${MM}/${dd}/messages.ttl#${(0, store_1.extractResourceLocalId)(input.key)}`;
+    }
+    resolveDataResourceUriFromId(resourceId, context) {
+        if (/^https?:\/\//.test(resourceId)) {
+            return resourceId;
+        }
+        const podBaseUrl = this.getCachedPodBaseUrl(context)
+            ?? this.derivePodBaseUrl(this.getWebId(context));
+        if (!podBaseUrl) {
+            throw new Error(`Cannot resolve Pod base URL for resource id: ${resourceId}`);
+        }
+        return (0, store_1.resolveDataResourceIri)(podBaseUrl, resourceId);
+    }
+    baseRelativeIdFromSubjectUri(subjectUri, context) {
+        const podBaseUrl = this.getCachedPodBaseUrl(context)
+            ?? this.derivePodBaseUrl(this.getWebId(context));
+        if (podBaseUrl) {
+            const dataPrefix = `${podBaseUrl.replace(/\/$/, '')}/.data/`;
+            if (subjectUri.startsWith(dataPrefix)) {
+                return subjectUri.slice(dataPrefix.length);
+            }
+        }
+        const marker = '/.data/';
+        const markerIndex = subjectUri.indexOf(marker);
+        if (markerIndex >= 0) {
+            return subjectUri.slice(markerIndex + marker.length);
+        }
+        return subjectUri;
+    }
+    runRecordToData(record) {
+        return {
+            id: record.id || '',
+            surfaceId: record.surfaceId || 'default',
+            task: record.task || undefined,
+            thread: record.thread || '',
+            workspace: record.workspace || '',
+            commandKind: record.commandKind === 'task' ? 'task' : 'chat',
+            status: (record.status || 'queued'),
+            runner: record.runner || '',
+            prompt: record.prompt || undefined,
+            externalRunId: record.externalRunId || undefined,
+            leaseOwner: record.leaseOwner || undefined,
+            leaseExpiresAt: this.isoToTimestamp(record.leaseExpiresAt),
+            heartbeatAt: this.isoToTimestamp(record.heartbeatAt),
+            cancelRequestedAt: this.isoToTimestamp(record.cancelRequestedAt),
+            error: record.error || undefined,
+            metadata: this.parseJsonObject(record.metadata),
+            createdAt: this.isoToTimestamp(record.createdAt) ?? (0, types_1.nowTimestamp)(),
+            startedAt: this.isoToTimestamp(record.startedAt),
+            completedAt: this.isoToTimestamp(record.completedAt),
+            updatedAt: this.isoToTimestamp(record.updatedAt) ?? (0, types_1.nowTimestamp)(),
+        };
+    }
+    runStepRecordToData(record) {
+        return {
+            id: record.id || '',
+            commandKind: record.commandKind === 'task' ? 'task' : 'chat',
+            surfaceId: record.surfaceId || 'default',
+            runId: record.runId || '',
+            run: record.run || '',
+            type: record.type || 'runtime.event',
+            message: record.message || undefined,
+            data: this.parseJsonObject(record.data),
+            createdAt: this.isoToTimestamp(record.createdAt) ?? (0, types_1.nowTimestamp)(),
+        };
+    }
+    taskRecordToData(record) {
+        return {
+            id: record.id || '',
+            surfaceId: record.surfaceId || 'default',
+            title: record.title || undefined,
+            prompt: record.prompt || '',
+            thread: record.thread || '',
+            workspace: record.workspace || '',
+            runner: record.runner || '',
+            status: (record.status || 'active'),
+            triggerKind: (record.triggerKind || 'once'),
+            cron: record.cron || undefined,
+            intervalSeconds: typeof record.intervalSeconds === 'number' ? record.intervalSeconds : undefined,
+            eventName: record.eventName || undefined,
+            nextRunAt: this.isoToTimestamp(record.nextRunAt),
+            lastRunAt: this.isoToTimestamp(record.lastRunAt),
+            authBinding: this.parseTaskAuthBinding(this.parseJsonObject(record.metadata)?.authBinding),
+            metadata: this.parseJsonObject(record.metadata),
+            createdAt: this.isoToTimestamp(record.createdAt) ?? (0, types_1.nowTimestamp)(),
+            updatedAt: this.isoToTimestamp(record.updatedAt) ?? (0, types_1.nowTimestamp)(),
+        };
+    }
     /**
      * 将 MessageRecord 转为 ThreadItem
      * thread_id 返回 Message 所属的 Thread ID
@@ -304,7 +560,22 @@ class PodChatKitStore {
                 created_at: createdAt,
             };
         }
-        else {
+        if (record.role === schema_1.MessageRole.SYSTEM && record.toolName) {
+            const metadata = this.parseJsonObject(record.metadata) ?? {};
+            return {
+                id: record.id,
+                thread_id: threadId,
+                type: 'client_tool_call',
+                name: record.toolName,
+                arguments: typeof metadata.arguments === 'string' ? metadata.arguments : '',
+                call_id: record.toolCallId || '',
+                status: (record.status === 'completed' ? 'completed' : 'pending'),
+                output: typeof metadata.output === 'string' ? metadata.output : undefined,
+                metadata,
+                created_at: createdAt,
+            };
+        }
+        {
             return {
                 id: record.id,
                 thread_id: threadId,
@@ -316,8 +587,8 @@ class PodChatKitStore {
         }
     }
     /**
-     * 获取或构建 chatUri → bare chatId 的映射缓存。
-     * drizzle-solid 的 uri() 字段返回完整 URI，通过 Chat 的 @id 比对来还原 bare ID。
+     * 获取或构建 Chat IRI -> surface id 的映射缓存。
+     * drizzle-solid 的 uri().link(Chat) 字段返回完整 URI，通过 Chat 的 @id 比对还原路径槽位。
      */
     async getChatUriMap(context) {
         if (context._chatUriMap) {
@@ -330,8 +601,9 @@ class PodChatKitStore {
                 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, c.id);
+                        map.set(uri, surfaceId);
                 }
             }
             catch {
@@ -342,17 +614,19 @@ class PodChatKitStore {
         return map;
     }
     /**
-     * 从 chatId URI 还原 bare chatId。
-     * 优先通过 @id 映射，fallback 处理裸 ID。
+     * 从 Chat URI 还原 surface id。
+     * 优先通过 @id 映射；若调用方本来给的是裸 ID，则原样使用。
      */
-    resolveChatIdFromUri(chatIdUri, chatUriMap, fallback) {
-        if (!chatIdUri)
-            return fallback;
-        const bare = chatUriMap.get(chatIdUri);
+    resolveChatSurfaceFromUri(chatUri, chatUriMap, defaultSurfaceId) {
+        if (!chatUri)
+            return defaultSurfaceId;
+        const bare = chatUriMap.get(chatUri);
         if (bare)
             return bare;
-        // Bare ID passed directly (not a URI)
-        return chatIdUri.includes('/') ? fallback : chatIdUri;
+        const parsed = this.chatSurfaceIdFromIri(chatUri);
+        if (parsed)
+            return parsed;
+        return chatUri.includes('/') ? defaultSurfaceId : chatUri;
     }
     isAbsoluteHttpIri(value) {
         try {
@@ -366,14 +640,17 @@ class PodChatKitStore {
     parseThreadIri(threadIri) {
         try {
             const url = new URL(threadIri);
-            const match = url.pathname.match(/\/\.data\/chat\/([^/]+)\/index\.ttl$/);
-            const threadId = url.hash.startsWith('#') ? decodeURIComponent(url.hash.slice(1)) : '';
-            if (!match || !threadId) {
+            const match = url.pathname.match(/\/\.data\/(chat|task)\/([^/]+)\/index\.ttl$/);
+            const localThreadId = url.hash.startsWith('#') ? decodeURIComponent(url.hash.slice(1)) : '';
+            if (!match || !localThreadId) {
                 return null;
             }
+            const commandKind = match[1] === 'task' ? 'task' : 'chat';
+            const surfaceId = decodeURIComponent(match[2]);
             return {
-                threadId,
-                chatId: decodeURIComponent(match[1]),
+                threadId: `${commandKind}/${surfaceId}/index.ttl#${localThreadId}`,
+                commandKind,
+                surfaceId,
                 threadUri: url.toString(),
             };
         }
@@ -384,14 +661,18 @@ class PodChatKitStore {
     normalizeThreadCacheKey(thread) {
         return (0, types_1.getThreadIdFromRef)(thread);
     }
-    async buildThreadUri(threadId, chatId, context) {
-        await this.getDb(context);
-        const podBaseUrl = this.getCachedPodBaseUrl(context)
-            ?? this.derivePodBaseUrl(this.getWebId(context));
-        if (!podBaseUrl) {
-            throw new Error('Cannot resolve Pod base URL for thread locator');
+    parseThreadResourceId(threadId) {
+        const match = threadId.match(/^(chat|task)\/([^/]+)\/index\.ttl#(.+)$/);
+        if (!match) {
+            return null;
         }
-        return `${podBaseUrl}/.data/chat/${chatId}/index.ttl#${threadId}`;
+        const commandKind = match[1] === 'task' ? 'task' : 'chat';
+        const surfaceId = decodeURIComponent(match[2]);
+        return {
+            threadId,
+            commandKind,
+            surfaceId,
+        };
     }
     async resolveThreadRef(thread, context) {
         const threadIdOrIri = thread.thread_id;
@@ -400,29 +681,45 @@ class PodChatKitStore {
             if (!parsed) {
                 throw new Error(`Invalid thread IRI: ${threadIdOrIri}`);
             }
-            this.cacheThreadChatId(context, parsed.threadId, parsed.chatId);
+            this.cacheThreadSurfaceId(context, parsed.threadId, parsed.surfaceId);
             return parsed;
         }
-        if (!('chat_id' in thread) || !thread.chat_id) {
-            throw new Error(`chat_id is required when thread_id "${threadIdOrIri}" is not a full thread IRI`);
+        const parsedResourceId = this.parseThreadResourceId(threadIdOrIri);
+        if (parsedResourceId) {
+            const threadUri = this.resolveDataResourceUriFromId(parsedResourceId.threadId, context);
+            this.cacheThreadSurfaceId(context, parsedResourceId.threadId, parsedResourceId.surfaceId);
+            return {
+                ...parsedResourceId,
+                threadUri,
+            };
         }
-        const chatId = thread.chat_id;
-        const threadUri = await this.buildThreadUri(threadIdOrIri, chatId, context);
-        this.cacheThreadChatId(context, threadIdOrIri, chatId);
+        if (!('chat_id' in thread) || !thread.chat_id) {
+            throw new Error(`chat_id is required when thread_id "${threadIdOrIri}" is not a full thread resource id`);
+        }
+        const surfaceId = thread.chat_id;
+        const commandKind = 'chat';
+        const threadId = this.generateThreadResourceId({
+            key: threadIdOrIri,
+            commandKind,
+            surfaceId,
+        });
+        const threadUri = this.resolveDataResourceUriFromId(threadId, context);
+        this.cacheThreadSurfaceId(context, threadId, surfaceId);
         return {
-            threadId: threadIdOrIri,
-            chatId,
+            threadId,
+            commandKind,
+            surfaceId,
             threadUri,
         };
     }
     /**
-     * 缓存 Thread -> chatId 映射
+     * 缓存 Thread -> surfaceId 映射
      */
-    cacheThreadChatId(context, threadId, chatId) {
-        if (!context._threadChatIdCache) {
-            context._threadChatIdCache = new Map();
+    cacheThreadSurfaceId(context, threadId, surfaceId) {
+        if (!context._threadSurfaceIdCache) {
+            context._threadSurfaceIdCache = new Map();
         }
-        context._threadChatIdCache.set(threadId, chatId);
+        context._threadSurfaceIdCache.set(threadId, surfaceId);
     }
     /**
      * 缓存完整的 Thread metadata
@@ -447,14 +744,6 @@ class PodChatKitStore {
         const cachedWebId = context._cachedWebId;
         return this.derivePodBaseUrl(cachedWebId);
     }
-    extractFragmentId(subjectUri) {
-        const hashIndex = subjectUri.lastIndexOf('#');
-        if (hashIndex >= 0 && hashIndex < subjectUri.length - 1) {
-            return subjectUri.slice(hashIndex + 1);
-        }
-        const slashIndex = subjectUri.lastIndexOf('/');
-        return slashIndex >= 0 && slashIndex < subjectUri.length - 1 ? subjectUri.slice(slashIndex + 1) : subjectUri;
-    }
     parseSparqlBindingValue(binding, key) {
         return binding?.[key]?.value ?? null;
     }
@@ -471,16 +760,20 @@ class PodChatKitStore {
       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 ?role ?content ?status ?createdAt ?toolName ?toolCallId ?metadata
+      SELECT ?msg ?maker ?messageType ?legacyRole ?content ?messageStatus ?legacyStatus ?createdAt ?legacyCreatedAt ?toolName ?toolCallId ?metadata
       WHERE {
         ?msg a meeting:Message ;
              sioc:has_container <${resolvedThread.threadUri}> .
         OPTIONAL { ?msg foaf:maker ?maker . }
-        OPTIONAL { ?msg udfs:role ?role . }
+        OPTIONAL { ?msg udfs:messageType ?messageType . }
+        OPTIONAL { ?msg udfs:role ?legacyRole . }
         OPTIONAL { ?msg sioc:content ?content . }
-        OPTIONAL { ?msg udfs:status ?status . }
-        OPTIONAL { ?msg udfs:createdAt ?createdAt . }
+        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 . }
@@ -502,28 +795,46 @@ class PodChatKitStore {
         const json = await response.json();
         const bindings = json.results?.bindings ?? [];
         return bindings.map((binding) => ({
-            id: this.extractFragmentId(this.parseSparqlBindingValue(binding, 'msg') ?? ''),
+            id: this.baseRelativeIdFromSubjectUri(this.parseSparqlBindingValue(binding, 'msg') ?? '', context),
             chat: null,
             thread: resolvedThread.threadUri,
             maker: this.parseSparqlBindingValue(binding, 'maker'),
-            role: this.parseSparqlBindingValue(binding, 'role'),
+            role: this.parseSparqlBindingValue(binding, 'messageType') ?? this.parseSparqlBindingValue(binding, 'legacyRole'),
             content: this.parseSparqlBindingValue(binding, 'content'),
-            status: this.parseSparqlBindingValue(binding, 'status'),
-            createdAt: this.parseSparqlBindingValue(binding, 'createdAt'),
+            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'),
             subjectUri: this.parseSparqlBindingValue(binding, 'msg'),
         }));
     }
+    datePathFromTimestamp(timestamp) {
+        const date = typeof timestamp === 'number' ? new Date(timestamp * 1000) : new Date();
+        return {
+            yyyy: String(date.getUTCFullYear()),
+            MM: String(date.getUTCMonth() + 1).padStart(2, '0'),
+            dd: String(date.getUTCDate()).padStart(2, '0'),
+        };
+    }
     // =========================================================================
     // ID Generation
     // =========================================================================
     generateThreadId(_context) {
-        return (0, types_1.generateId)('thread');
+        return this.generateThreadResourceId({
+            key: (0, types_1.generateId)('thread'),
+            commandKind: 'chat',
+            surfaceId: PodChatKitStore.DEFAULT_CHAT_ID,
+        });
     }
-    generateItemId(itemType, _thread, _context) {
-        return (0, types_1.generateId)(itemType.replace('_', '-'));
+    generateItemId(itemType, thread, _context) {
+        const commandKind = thread.metadata?.commandKind === 'task' ? 'task' : 'chat';
+        const surfaceId = this.getSurfaceIdFromMetadata(thread.metadata);
+        return this.generateMessageResourceId({
+            key: (0, types_1.generateId)(itemType.replace('_', '-')),
+            commandKind,
+            surfaceId,
+        });
     }
     // =========================================================================
     // Thread Operations (ChatKit thread = our Thread)
@@ -548,7 +859,7 @@ class PodChatKitStore {
         const metadata = this.threadRecordToMetadata(threadRecord, chatUriMap);
         // 缓存结果
         this.cacheThreadMetadata(context, metadata);
-        this.cacheThreadChatId(context, metadata.id, resolvedThread.chatId);
+        this.cacheThreadSurfaceId(context, metadata.id, resolvedThread.surfaceId);
         return metadata;
     }
     async saveThread(thread, context) {
@@ -557,48 +868,70 @@ class PodChatKitStore {
             throw new Error('Cannot access Pod: invalid credentials');
         }
         const now = new Date().toISOString();
-        // 从 metadata 获取 chat_id
-        const chatId = this.getChatIdFromMetadata(thread.metadata);
-        thread.metadata = { ...(thread.metadata ?? {}), chat_id: chatId };
-        // Persist all metadata except chat_id (which is derived from storage location).
+        const commandKind = this.getCommandKindFromMetadata(thread.metadata);
+        const surfaceId = this.getSurfaceIdFromMetadata(thread.metadata);
+        thread.metadata = {
+            ...(thread.metadata ?? {}),
+            commandKind,
+            surface_id: surfaceId,
+            chat_id: surfaceId,
+        };
+        // Persist extended metadata except fields that are derived from first-class columns.
         const metadataToPersist = { ...(thread.metadata ?? {}) };
         delete metadataToPersist.chat_id;
-        const metadataJson = Object.keys(metadataToPersist).length > 0 ? JSON.stringify(metadataToPersist) : null;
-        // 确保 Chat 容器存在
-        await this.ensureChat(chatId, context);
-        // 缓存 Thread -> chatId 映射，避免后续查询
-        this.cacheThreadChatId(context, thread.id, chatId);
-        const threadUri = await this.buildThreadUri(thread.id, chatId, context);
+        delete metadataToPersist.commandKind;
+        delete metadataToPersist.surface_id;
+        const metadataObject = this.jsonObjectOrNull(metadataToPersist);
+        if (commandKind === 'chat') {
+            await this.ensureChat(surfaceId, context);
+        }
+        const threadResourceId = this.buildThreadResourceId({
+            id: thread.id,
+            commandKind,
+            surfaceId,
+        });
+        thread.id = threadResourceId;
+        this.cacheThreadSurfaceId(context, thread.id, surfaceId);
+        const threadUri = this.resolveDataResourceUriFromId(threadResourceId, context);
         // 检查 Thread 是否存在
         const existing = await db.findByIri(schema_1.Thread, threadUri);
         if (existing) {
             // Update
-            await db.updateByLocator(schema_1.Thread, {
-                id: thread.id,
-                chatId,
-            }, {
+            await db.updateByIri(schema_1.Thread, threadUri, {
+                commandKind,
+                surfaceId,
+                chat: commandKind === 'chat' ? this.buildChatResourceId(surfaceId) : null,
                 title: thread.title || null,
                 status: this.statusToString(thread.status),
-                metadata: metadataJson,
+                workspace: thread.workspace || null,
+                metadata: metadataObject,
                 updatedAt: now,
             });
         }
         else {
             // Insert
             await db.insert(schema_1.Thread).values({
-                id: thread.id,
-                chatId, // 关联到 Chat 容器
+                id: threadResourceId,
+                commandKind,
+                surfaceId,
+                chat: commandKind === 'chat' ? this.buildChatResourceId(surfaceId) : null,
                 title: thread.title || null,
                 status: this.statusToString(thread.status),
-                metadata: metadataJson,
+                workspace: thread.workspace || null,
+                metadata: metadataObject,
                 createdAt: new Date(thread.created_at * 1000).toISOString(),
                 updatedAt: now,
             });
         }
-        // 缓存完整的 Thread metadata，确保 metadata.chat_id 包含正确的值
+        // 缓存完整的 Thread metadata，确保 ChatKit metadata.chat_id 包含正确的 surface。
         const threadMetadata = {
             ...thread,
-            metadata: { ...(thread.metadata ?? {}), chat_id: chatId },
+            metadata: {
+                ...(thread.metadata ?? {}),
+                commandKind,
+                surface_id: surfaceId,
+                chat_id: surfaceId,
+            },
         };
         this.cacheThreadMetadata(context, threadMetadata);
     }
@@ -655,10 +988,7 @@ class PodChatKitStore {
         }
         // 删除 Thread
         try {
-            await db.deleteByLocator(schema_1.Thread, {
-                id: resolvedThread.threadId,
-                chatId: resolvedThread.chatId,
-            });
+            await db.deleteByIri(schema_1.Thread, resolvedThread.threadUri);
         }
         catch (err) {
             if (!err.message?.includes('404') && !err.message?.includes('Could not retrieve') && !err.message?.includes('Parse error')) {
@@ -668,9 +998,9 @@ class PodChatKitStore {
         }
         // 清除缓存
         const metadataCache = context._threadMetadataCache;
-        const chatIdCache = context._threadChatIdCache;
+        const surfaceIdCache = context._threadSurfaceIdCache;
         metadataCache?.delete(resolvedThread.threadId);
-        chatIdCache?.delete(resolvedThread.threadId);
+        surfaceIdCache?.delete(resolvedThread.threadId);
     }
     // =========================================================================
     // Thread Item Operations (ChatKit items = our Messages)
@@ -712,10 +1042,21 @@ class PodChatKitStore {
             throw new Error('Cannot access Pod: invalid credentials');
         }
         const resolvedThread = await this.resolveThreadRef(thread, context);
+        const itemResourceId = this.buildMessageResourceId({
+            id: item.id,
+            commandKind: resolvedThread.commandKind,
+            surfaceId: resolvedThread.surfaceId,
+            createdAt: item.created_at,
+        });
+        item.id = itemResourceId;
+        item.thread_id = resolvedThread.threadId;
         const webId = this.getWebId(context);
         let content = '';
         let role = schema_1.MessageRole.USER;
         let status = null;
+        let toolName = null;
+        let toolCallId = null;
+        let metadata = null;
         if (item.type === 'user_message') {
             const userItem = item;
             content = userItem.content
@@ -733,24 +1074,42 @@ class PodChatKitStore {
             role = schema_1.MessageRole.ASSISTANT;
             status = assistantItem.status || schema_1.MessageStatus.COMPLETED;
         }
+        else if (item.type === 'client_tool_call') {
+            const toolItem = item;
+            content = toolItem.output ?? '';
+            role = schema_1.MessageRole.SYSTEM;
+            status = toolItem.status ?? 'pending';
+            toolName = toolItem.name;
+            toolCallId = toolItem.call_id;
+            metadata = {
+                ...(toolItem.metadata ?? {}),
+                arguments: toolItem.arguments,
+                output: toolItem.output,
+            };
+        }
         else {
             // 其他类型暂时存储为 JSON
             content = JSON.stringify(item);
             role = schema_1.MessageRole.SYSTEM;
         }
         const messageRecord = {
-            id: item.id,
-            chat: resolvedThread.chatId, // bare ID，用于路径构建
-            thread: resolvedThread.threadUri, // 完整 URI，用于 RDF 引用
+            id: itemResourceId,
+            commandKind: resolvedThread.commandKind,
+            surfaceId: resolvedThread.surfaceId,
+            chat: resolvedThread.commandKind === 'chat' ? this.buildChatResourceId(resolvedThread.surfaceId) : null,
+            thread: resolvedThread.threadUri,
             maker: role === schema_1.MessageRole.USER ? webId : null,
             role,
             content,
             status,
+            toolName,
+            toolCallId,
+            metadata: this.jsonObjectOrNull(metadata ?? undefined),
             createdAt: new Date(item.created_at * 1000).toISOString(),
         };
         await db.insert(schema_1.Message).values(messageRecord);
         // Track this ID to avoid cache timing issues in saveItem
-        this.recentlyCreatedIds.add(messageRecord.id);
+        this.recentlyCreatedIds.add(item.id);
     }
     async saveItem(thread, item, context) {
         const db = await this.getDb(context);
@@ -761,6 +1120,7 @@ class PodChatKitStore {
         // 准备更新数据
         let content = '';
         let status = null;
+        let metadata = null;
         if (item.type === 'user_message') {
             const userItem = item;
             content = userItem.content
@@ -776,25 +1136,40 @@ class PodChatKitStore {
                 .join('\n');
             status = assistantItem.status || schema_1.MessageStatus.COMPLETED;
         }
-        // 获取 createdAt 用于计算资源路径（与 drizzle-solid 模板填充保持一致）
-        const createdAt = item.created_at ? new Date(item.created_at * 1000).toISOString() : undefined;
+        else if (item.type === 'client_tool_call') {
+            const toolItem = item;
+            content = toolItem.output ?? '';
+            status = toolItem.status ?? 'pending';
+            metadata = {
+                ...(toolItem.metadata ?? {}),
+                arguments: toolItem.arguments,
+                output: toolItem.output,
+            };
+        }
+        const itemResourceId = this.buildMessageResourceId({
+            id: item.id,
+            commandKind: resolvedThread.commandKind,
+            surfaceId: resolvedThread.surfaceId,
+            createdAt: item.created_at,
+        });
         // 如果是最近创建的消息，使用直接 PATCH 更新（避免 drizzle-solid UPDATE 的 bug）
-        const wasRecentlyCreated = this.recentlyCreatedIds.has(item.id);
+        const wasRecentlyCreated = this.recentlyCreatedIds.has(itemResourceId);
         if (wasRecentlyCreated) {
-            this.recentlyCreatedIds.delete(item.id);
-            await this.directPatchMessage(context, resolvedThread.chatId, item.id, content, status, createdAt);
+            this.recentlyCreatedIds.delete(itemResourceId);
+            item.id = itemResourceId;
+            item.thread_id = resolvedThread.threadId;
+            await this.directPatchMessage(context, itemResourceId, content, status, metadata);
             return;
         }
         // 对于非最近创建的消息，使用普通流程
         const existingItems = (await this.selectMessagesForThread(thread, context))
-            .filter((message) => message.id === item.id);
+            .filter((message) => message.id === itemResourceId);
         const existing = existingItems.length > 0 ? existingItems[0] : null;
         if (existing) {
             // 使用直接 PATCH 更新
-            const existingCreatedAt = existing.createdAt
-                ? (existing.createdAt instanceof Date ? existing.createdAt.toISOString() : String(existing.createdAt))
-                : undefined;
-            await this.directPatchMessage(context, resolvedThread.chatId, item.id, content, status, existingCreatedAt);
+            item.id = itemResourceId;
+            item.thread_id = resolvedThread.threadId;
+            await this.directPatchMessage(context, existing.id, content, status, metadata);
         }
         else {
             // Create new record
@@ -805,25 +1180,15 @@ class PodChatKitStore {
      * 直接使用 SPARQL UPDATE PATCH 更新消息内容
      * 避免 drizzle-solid UPDATE 的 bug
      */
-    async directPatchMessage(context, chatId, messageId, content, status, createdAt) {
+    async directPatchMessage(context, messageResourceId, content, status, metadata = null) {
         // 使用缓存的 fetch 和 webId（由 getDb 时创建的 session）
         const cachedFetch = context._cachedFetch;
-        const cachedWebId = context._cachedWebId;
-        if (!cachedFetch || !cachedWebId) {
+        if (!cachedFetch) {
             throw new Error('No cached session for direct PATCH - call getDb first');
         }
-        // 构建资源 URL 和 subject URI
-        // Template: {chatId}/{yyyy}/{MM}/{dd}/messages.ttl#{id}
-        const podBaseUrl = this.derivePodBaseUrl(cachedWebId);
-        if (!podBaseUrl) {
-            throw new Error(`Cannot resolve Pod base URL from cached WebID: ${cachedWebId}`);
-        }
-        const messageDate = createdAt ? new Date(createdAt) : new Date();
-        const yyyy = String(messageDate.getUTCFullYear());
-        const MM = String(messageDate.getUTCMonth() + 1).padStart(2, '0');
-        const dd = String(messageDate.getUTCDate()).padStart(2, '0');
-        const resourceUrl = `${podBaseUrl}/.data/chat/${chatId}/${yyyy}/${MM}/${dd}/messages.ttl`;
-        const subjectUri = `${resourceUrl}#${messageId}`;
+        const subjectUri = this.resolveDataResourceUriFromId(messageResourceId, context);
+        const hashIndex = subjectUri.lastIndexOf('#');
+        const resourceUrl = hashIndex >= 0 ? subjectUri.slice(0, hashIndex) : subjectUri;
         // 构建 SPARQL UPDATE：删除旧值，插入新值
         const deletePatterns = [];
         const insertTriples = [];
@@ -851,8 +1216,12 @@ class PodChatKitStore {
         insertTriples.push(`<${subjectUri}> <http://rdfs.org/sioc/ns#content> ${escapeForSparql(content)} .`);
         // Status 更新
         if (status) {
-            deletePatterns.push(`<${subjectUri}> <https://undefineds.co/ns#status> ?oldStatus .`);
-            insertTriples.push(`<${subjectUri}> <https://undefineds.co/ns#status> "${status}" .`);
+            deletePatterns.push(`<${subjectUri}> <https://undefineds.co/ns#messageStatus> ?oldStatus .`);
+            insertTriples.push(`<${subjectUri}> <https://undefineds.co/ns#messageStatus> "${status}" .`);
+        }
+        if (metadata) {
+            deletePatterns.push(`<${subjectUri}> <https://undefineds.co/ns#metadata> ?oldMetadata .`);
+            insertTriples.push(`<${subjectUri}> <https://undefineds.co/ns#metadata> ${escapeForSparql(JSON.stringify(metadata))} .`);
         }
         const sparql = `
 DELETE { ${deletePatterns.join(' ')} }
@@ -923,19 +1292,276 @@ WHERE { ${deletePatterns.join(' ')} }
     async deleteAttachment(attachmentId, _context) {
         this.logger.info(`Attachment deleted: ${attachmentId}`);
     }
+    // =========================================================================
+    // Run Operations
+    // =========================================================================
+    async saveRun(run, context) {
+        const db = await this.getDb(context);
+        if (!db) {
+            throw new Error('Cannot access Pod: invalid credentials');
+        }
+        run.id = (0, store_1.buildRunResourceId)(run);
+        const existing = await db.findById(schema_2.Run, run.id);
+        const values = {
+            surfaceId: run.surfaceId,
+            task: run.task || null,
+            thread: run.thread,
+            workspace: run.workspace,
+            commandKind: run.commandKind,
+            status: run.status,
+            runner: run.runner || null,
+            prompt: run.prompt || null,
+            externalRunId: run.externalRunId || null,
+            leaseOwner: run.leaseOwner || null,
+            leaseExpiresAt: this.timestampToIso(run.leaseExpiresAt),
+            heartbeatAt: this.timestampToIso(run.heartbeatAt),
+            cancelRequestedAt: this.timestampToIso(run.cancelRequestedAt),
+            error: run.error || null,
+            metadata: this.jsonObjectOrNull(run.metadata),
+            createdAt: this.timestampToIso(run.createdAt) ?? new Date().toISOString(),
+            startedAt: this.timestampToIso(run.startedAt),
+            completedAt: this.timestampToIso(run.completedAt),
+            updatedAt: this.timestampToIso(run.updatedAt) ?? new Date().toISOString(),
+        };
+        if (existing) {
+            await db.updateById(schema_2.Run, run.id, values);
+            return;
+        }
+        await db.insert(schema_2.Run).values({
+            id: run.id,
+            ...values,
+        });
+    }
+    async loadRun(id, context) {
+        const db = await this.getDb(context);
+        if (!db) {
+            throw new Error('Cannot access Pod: invalid credentials');
+        }
+        const record = await db.findById(schema_2.Run, id);
+        if (!record) {
+            throw new Error(`Run not found: ${id}`);
+        }
+        return this.runRecordToData(record);
+    }
+    async listRuns(options, context) {
+        const db = await this.getDb(context);
+        if (!db) {
+            throw new Error('Cannot access Pod: invalid credentials');
+        }
+        const conditions = [];
+        if (options.task) {
+            conditions.push((0, drizzle_solid_1.eq)(schema_2.Run.task, options.task));
+        }
+        if (options.thread) {
+            conditions.push((0, drizzle_solid_1.eq)(schema_2.Run.thread, options.thread));
+        }
+        if (options.workspace) {
+            conditions.push((0, drizzle_solid_1.eq)(schema_2.Run.workspace, options.workspace));
+        }
+        if (options.commandKind) {
+            conditions.push((0, drizzle_solid_1.eq)(schema_2.Run.commandKind, options.commandKind));
+        }
+        if (options.status) {
+            conditions.push((0, drizzle_solid_1.eq)(schema_2.Run.status, options.status));
+        }
+        const query = db.select().from(schema_2.Run);
+        const records = conditions.length > 0
+            ? await query.where((0, drizzle_solid_1.and)(...conditions))
+            : await query;
+        return records
+            .map((record) => this.runRecordToData(record))
+            .sort((a, b) => b.createdAt - a.createdAt || b.id.localeCompare(a.id))
+            .slice(0, options.limit ?? records.length);
+    }
+    async appendRunStep(event, context) {
+        const db = await this.getDb(context);
+        if (!db) {
+            throw new Error('Cannot access Pod: invalid credentials');
+        }
+        if (!(0, store_1.isRunResourceId)(event.runId)) {
+            throw new Error(`RunStep runId must be a complete Run resource id: ${event.runId}`);
+        }
+        event.id = (0, store_1.buildRunStepResourceId)(event);
+        await db.insert(schema_2.RunStep).values({
+            id: event.id,
+            commandKind: event.commandKind,
+            surfaceId: event.surfaceId,
+            runId: event.runId,
+            run: event.run,
+            type: event.type,
+            message: event.message || null,
+            data: this.jsonObjectOrNull(event.data),
+            createdAt: this.timestampToIso(event.createdAt) ?? new Date().toISOString(),
+        });
+    }
+    async loadRunSteps(runId, context) {
+        const db = await this.getDb(context);
+        if (!db) {
+            throw new Error('Cannot access Pod: invalid credentials');
+        }
+        if (!(0, store_1.isRunResourceId)(runId)) {
+            throw new Error(`loadRunSteps requires a base-relative Run id: ${runId}`);
+        }
+        // runId is a local query field; RunStep.run remains the semantic RDF URI relation.
+        const records = await db.select().from(schema_2.RunStep).where((0, drizzle_solid_1.eq)(schema_2.RunStep.runId, runId));
+        return records
+            .map((record) => this.runStepRecordToData(record))
+            .sort((a, b) => a.createdAt - b.createdAt || a.id.localeCompare(b.id));
+    }
+    async claimRun(input, context) {
+        const run = await this.loadRun(input.runId, context);
+        if (!(0, store_1.canClaimRun)(run, input)) {
+            return undefined;
+        }
+        run.leaseOwner = input.leaseOwner;
+        run.leaseExpiresAt = input.leaseExpiresAt;
+        run.heartbeatAt = input.now;
+        run.updatedAt = input.now;
+        await this.saveRun(run, context);
+        const claimed = await this.loadRun(input.runId, context);
+        return claimed.leaseOwner === input.leaseOwner ? claimed : undefined;
+    }
+    // =========================================================================
+    // Task Operations
+    // =========================================================================
+    async saveTask(task, context) {
+        const db = await this.getDb(context);
+        if (!db) {
+            throw new Error('Cannot access Pod: invalid credentials');
+        }
+        task.id = (0, store_2.buildTaskResourceId)(task.id);
+        const existing = await db.findById(schema_3.Task, task.id);
+        const values = {
+            surfaceId: task.surfaceId,
+            title: task.title || null,
+            prompt: task.prompt,
+            thread: task.thread,
+            workspace: task.workspace,
+            runner: task.runner,
+            status: task.status,
+            triggerKind: task.triggerKind,
+            cron: task.cron || null,
+            intervalSeconds: task.intervalSeconds ?? null,
+            eventName: task.eventName || null,
+            nextRunAt: this.timestampToIso(task.nextRunAt),
+            lastRunAt: this.timestampToIso(task.lastRunAt),
+            metadata: this.jsonObjectOrNull(this.withTaskAuthBindingMetadata(task.metadata, task.authBinding)),
+            createdAt: this.timestampToIso(task.createdAt) ?? new Date().toISOString(),
+            updatedAt: this.timestampToIso(task.updatedAt) ?? new Date().toISOString(),
+        };
+        if (existing) {
+            await db.updateById(schema_3.Task, task.id, values);
+            return;
+        }
+        await db.insert(schema_3.Task).values({
+            id: task.id,
+            ...values,
+        });
+    }
+    async loadTask(taskId, context) {
+        const db = await this.getDb(context);
+        if (!db) {
+            throw new Error('Cannot access Pod: invalid credentials');
+        }
+        const record = await db.findById(schema_3.Task, taskId);
+        if (!record) {
+            throw new Error(`Task not found: ${taskId}`);
+        }
+        return this.taskRecordToData(record);
+    }
+    async listTasks(options, context) {
+        const db = await this.getDb(context);
+        if (!db) {
+            throw new Error('Cannot access Pod: invalid credentials');
+        }
+        const records = await db.select().from(schema_3.Task);
+        const dueAt = options.dueAt ?? (0, types_1.nowTimestamp)();
+        let tasks = records.map((record) => this.taskRecordToData(record));
+        if (options.status) {
+            tasks = tasks.filter((task) => task.status === options.status);
+        }
+        if (options.triggerKind) {
+            tasks = tasks.filter((task) => task.triggerKind === options.triggerKind);
+        }
+        if (options.eventName) {
+            tasks = tasks.filter((task) => task.eventName === options.eventName);
+        }
+        if (typeof options.dueAt === 'number') {
+            tasks = tasks.filter((task) => typeof task.nextRunAt === 'number' && task.nextRunAt <= dueAt);
+        }
+        tasks.sort((a, b) => (a.nextRunAt ?? a.createdAt) - (b.nextRunAt ?? b.createdAt) || a.id.localeCompare(b.id));
+        return tasks.slice(0, options.limit ?? tasks.length);
+    }
+    async saveTaskAuthCredential(input, context) {
+        const db = await this.getDb(context);
+        if (!db) {
+            throw new Error('Cannot access Pod: invalid credentials');
+        }
+        const values = {
+            service: TaskAuthBinding_1.TASK_AUTH_CREDENTIAL_SERVICE,
+            status: types_2.CredentialStatus.ACTIVE,
+            apiKey: input.apiKey,
+            label: input.displayName ?? null,
+            oauthExpiresAt: this.timestampToIso(input.expiresAt),
+        };
+        const existing = await db.findById(tables_1.Credential, input.id);
+        if (existing) {
+            await db.updateById(tables_1.Credential, input.id, values);
+            return {
+                ...existing,
+                ...values,
+                id: input.id,
+            };
+        }
+        await db.insert(tables_1.Credential).values({
+            id: input.id,
+            ...values,
+        });
+        return {
+            id: input.id,
+            ...values,
+            createdAt: new Date().toISOString(),
+        };
+    }
+    async loadTaskAuthCredential(id, context) {
+        const db = await this.getDb(context);
+        if (!db) {
+            throw new Error('Cannot access Pod: invalid credentials');
+        }
+        const credential = await db.findById(tables_1.Credential, id);
+        if (!credential || credential.service !== TaskAuthBinding_1.TASK_AUTH_CREDENTIAL_SERVICE) {
+            return undefined;
+        }
+        return credential;
+    }
     /**
      * 从 Pod 获取 AI 配置（Provider + Credential）
      * 复用已缓存的 Session，避免重复登录
      */
     extractProviderId(provider) {
-        if (!provider) {
+        const value = provider?.trim();
+        if (!value) {
             return '';
         }
-        const hashIndex = provider.lastIndexOf('#');
-        if (hashIndex >= 0 && hashIndex < provider.length - 1) {
-            return provider.slice(hashIndex + 1);
-        }
-        return provider;
+        const hashIndex = value.lastIndexOf('#');
+        const hashless = hashIndex >= 0 && hashIndex < value.length - 1
+            ? value.slice(hashIndex + 1)
+            : value;
+        const clean = hashless.replace(/\/+$/, '');
+        const slashIndex = clean.lastIndexOf('/');
+        const tail = slashIndex >= 0 ? clean.slice(slashIndex + 1) : clean;
+        const ttlFragmentIndex = tail.lastIndexOf('.ttl#');
+        if (ttlFragmentIndex >= 0) {
+            return tail.slice(ttlFragmentIndex + '.ttl#'.length);
+        }
+        if (tail.endsWith('.ttl')) {
+            return tail.slice(0, -'.ttl'.length);
+        }
+        const fragmentIndex = tail.lastIndexOf('#');
+        if (fragmentIndex >= 0 && fragmentIndex < tail.length - 1) {
+            return tail.slice(fragmentIndex + 1);
+        }
+        return tail;
     }
     pushAvailableModel(models, seenModelIds, model) {
         const id = typeof model.id === 'string' ? model.id.trim() : '';
@@ -964,6 +1590,44 @@ WHERE { ${deletePatterns.join(' ')} }
         }
         models.push(item);
     }
+    resolvePodResourceIri(context, resource) {
+        if (/^https?:\/\//.test(resource)) {
+            return resource;
+        }
+        const podBaseUrl = this.getCachedPodBaseUrl(context)
+            ?? this.derivePodBaseUrl(this.getWebId(context));
+        if (!podBaseUrl) {
+            throw new Error(`Cannot resolve Pod base URL for resource: ${resource}`);
+        }
+        return `${podBaseUrl.replace(/\/$/, '')}/${resource.replace(/^\//, '')}`;
+    }
+    async findProviderForCredential(db, context, providerRef) {
+        const candidates = new Set();
+        candidates.add(providerRef);
+        if (!/^https?:\/\//.test(providerRef)) {
+            candidates.add(this.resolvePodResourceIri(context, providerRef));
+        }
+        const providerId = (0, models_1.normalizeAIConfigProviderId)(providerRef);
+        if (providerId) {
+            candidates.add(providerId);
+            candidates.add(`/settings/providers/${providerId}.ttl`);
+            candidates.add(this.resolvePodResourceIri(context, `/settings/providers/${providerId}.ttl`));
+        }
+        for (const candidate of candidates) {
+            try {
+                const provider = /^https?:\/\//.test(candidate)
+                    ? await db.findByIri(provider_1.Provider, candidate)
+                    : await db.findById(provider_1.Provider, candidate);
+                if (provider) {
+                    return provider;
+                }
+            }
+            catch {
+                // Try the next canonical form.
+            }
+        }
+        return null;
+    }
     async getAiConfig(context) {
         const db = await this.getDb(context);
         if (!db) {
@@ -977,23 +1641,11 @@ WHERE { ${deletePatterns.join(' ')} }
             if (credentials.length === 0) {
                 return undefined;
             }
-            // Build provider @id → record map for URI matching
-            const allProviders = await db.select().from(provider_1.Provider);
-            const providerByUri = new Map();
-            for (const p of allProviders) {
-                const uri = p['@id'];
-                if (uri)
-                    providerByUri.set(uri, p);
-                // Also index by bare id for fallback
-                providerByUri.set(p.id, p);
-            }
             // 遍历凭据，找到有效的 Provider
             for (const cred of credentials) {
                 if (!cred.provider)
                     continue;
-                // Match provider by full URI first, then fallback to bare fragment id.
-                const provider = providerByUri.get(cred.provider)
-                    ?? providerByUri.get(this.extractProviderId(cred.provider));
+                const provider = await this.findProviderForCredential(db, context, cred.provider);
                 if (!provider)
                     continue;
                 const baseUrl = provider.baseUrl;
@@ -1003,9 +1655,10 @@ WHERE { ${deletePatterns.join(' ')} }
                 const defaultModel = defaultModelRef
                     ? (await db.findByIri(model_1.Model, defaultModelRef))?.id ?? undefined
                     : undefined;
-                this.logger.debug(`Using credential ${cred.id} with provider ${provider.id}`);
+                const providerId = this.extractProviderId(provider.id || cred.provider);
+                this.logger.debug(`Using credential ${cred.id} with provider ${providerId}`);
                 return {
-                    providerId: provider.id,
+                    providerId,
                     baseUrl,
                     proxyUrl: provider.proxyUrl || undefined,
                     defaultModel,
@@ -1042,6 +1695,7 @@ WHERE { ${deletePatterns.join(' ')} }
                 }
                 if (typeof provider?.id === 'string' && provider.id) {
                     providerByKey.set(provider.id, provider);
+                    providerByKey.set(this.extractProviderId(provider.id), provider);
                 }
             }
             const currentProvider = providerByKey.get(config.providerId)
@@ -1105,12 +1759,12 @@ WHERE { ${deletePatterns.join(' ')} }
             }
             // 如果需要递增 failCount，先查询当前值
             if (options?.incrementFailCount) {
-                const currentCred = await db.findByLocator(tables_1.Credential, { id: credentialId });
+                const currentCred = await db.findById(tables_1.Credential, credentialId);
                 if (currentCred) {
                     updateData.failCount = (currentCred.failCount ?? 0) + 1;
                 }
             }
-            await db.updateByLocator(tables_1.Credential, { id: credentialId }, updateData);
+            await db.updateById(tables_1.Credential, credentialId, updateData);
             this.logger.info(`Credential ${credentialId} status updated to ${status}`);
         }
         catch (error) {
@@ -1126,7 +1780,7 @@ WHERE { ${deletePatterns.join(' ')} }
             return;
         }
         try {
-            await db.updateByLocator(tables_1.Credential, { id: credentialId }, {
+            await db.updateById(tables_1.Credential, credentialId, {
                 lastUsedAt: new Date(),
                 failCount: 0,
                 status: types_2.CredentialStatus.ACTIVE,