@undefineds.co/xpod 0.3.32 → 0.3.33

package/dist/api/chatkit/pod-store.d.ts

@@ -61,6 +61,9 @@ export declare class PodChatKitStore implements ChatKitStore<StoreContext>, RunS
     private isoToTimestamp;
     private parseJsonObject;
     private jsonObjectOrNull;
+    private getXpodMetadata;
+    private withXpodMetadata;
+    private withoutXpodMetadata;
     private withTaskAuthBindingMetadata;
     private parseTaskAuthBinding;
     private isBaseRelativeDataResourceId;

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

@@ -316,9 +316,12 @@ class PodChatKitStore {
      * ChatKit 边界继续暴露 metadata.chat_id；内部同一值叫 surface_id。
      */
     threadRecordToMetadata(record, chatResourceMap) {
-        const commandKind = record.commandKind === 'task' ? 'task' : 'chat';
-        const surfaceId = record.surfaceId || this.resolveChatSurfaceFromResource(record.chat, chatResourceMap, PodChatKitStore.DEFAULT_CHAT_ID);
         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);
         return {
             id: record.id,
             title: record.title || undefined,
@@ -368,6 +371,29 @@ class PodChatKitStore {
     jsonObjectOrNull(value) {
         return value && Object.keys(value).length > 0 ? value : null;
     }
+    getXpodMetadata(metadata) {
+        const value = metadata?.xpod;
+        return value && typeof value === 'object' && !Array.isArray(value)
+            ? value
+            : undefined;
+    }
+    withXpodMetadata(metadata, xpod) {
+        return {
+            ...(metadata ?? {}),
+            xpod: {
+                ...(this.getXpodMetadata(metadata) ?? {}),
+                ...xpod,
+            },
+        };
+    }
+    withoutXpodMetadata(metadata) {
+        if (!metadata) {
+            return undefined;
+        }
+        const result = { ...metadata };
+        delete result.xpod;
+        return Object.keys(result).length > 0 ? result : undefined;
+    }
     withTaskAuthBindingMetadata(metadata, authBinding) {
         if (!authBinding) {
             return metadata;
@@ -487,13 +513,15 @@ class PodChatKitStore {
         return resource;
     }
     runRecordToData(record) {
+        const metadata = this.parseJsonObject(record.metadata);
+        const xpod = this.getXpodMetadata(metadata);
         return {
             id: record.id || '',
-            surfaceId: record.surfaceId || 'default',
+            surfaceId: record.surfaceId || (typeof xpod?.surfaceId === 'string' ? xpod.surfaceId : 'default'),
             task: record.task || undefined,
             thread: record.thread || '',
             workspace: record.workspace || '',
-            commandKind: record.commandKind === 'task' ? 'task' : 'chat',
+            commandKind: record.commandKind === 'task' || xpod?.commandKind === 'task' ? 'task' : 'chat',
             status: (record.status || 'queued'),
             runner: record.runner || '',
             prompt: record.prompt || undefined,
@@ -503,7 +531,7 @@ class PodChatKitStore {
             heartbeatAt: this.isoToTimestamp(record.heartbeatAt),
             cancelRequestedAt: this.isoToTimestamp(record.cancelRequestedAt),
             error: record.error || undefined,
-            metadata: this.parseJsonObject(record.metadata),
+            metadata,
             createdAt: this.isoToTimestamp(record.createdAt) ?? (0, types_1.nowTimestamp)(),
             startedAt: this.isoToTimestamp(record.startedAt),
             completedAt: this.isoToTimestamp(record.completedAt),
@@ -511,36 +539,42 @@ class PodChatKitStore {
         };
     }
     runStepRecordToData(record) {
+        const payload = this.parseJsonObject(record.payload) ?? this.parseJsonObject(record.data);
+        const xpod = this.getXpodMetadata(payload);
         return {
             id: record.id || '',
-            commandKind: record.commandKind === 'task' ? 'task' : 'chat',
-            surfaceId: record.surfaceId || 'default',
-            runId: record.runId || '',
+            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 : ''),
             run: record.run || '',
-            type: record.type || 'runtime.event',
+            type: record.type || record.stepType || 'runtime.event',
             message: record.message || undefined,
-            data: this.parseJsonObject(record.data),
+            data: this.withoutXpodMetadata(payload),
             createdAt: this.isoToTimestamp(record.createdAt) ?? (0, types_1.nowTimestamp)(),
         };
     }
     taskRecordToData(record) {
+        const metadata = this.parseJsonObject(record.metadata);
+        const xpod = this.getXpodMetadata(metadata);
         return {
             id: record.id || '',
-            surfaceId: record.surfaceId || 'default',
+            surfaceId: record.surfaceId || (typeof xpod?.surfaceId === 'string' ? xpod.surfaceId : 'default'),
             title: record.title || undefined,
             prompt: record.prompt || '',
             thread: record.thread || '',
             workspace: record.workspace || '',
-            runner: record.runner || '',
+            runner: record.runner || (typeof xpod?.runner === 'string' ? xpod.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),
+            triggerKind: (record.triggerKind || xpod?.triggerKind || 'once'),
+            cron: record.cron || (typeof xpod?.cron === 'string' ? xpod.cron : undefined),
+            intervalSeconds: typeof record.intervalSeconds === 'number'
+                ? record.intervalSeconds
+                : (typeof xpod?.intervalSeconds === 'number' ? xpod.intervalSeconds : undefined),
+            eventName: record.eventName || (typeof xpod?.eventName === 'string' ? xpod.eventName : undefined),
+            nextRunAt: this.isoToTimestamp(record.nextRunAt) ?? (typeof xpod?.nextRunAt === 'number' ? xpod.nextRunAt : undefined),
+            lastRunAt: this.isoToTimestamp(record.lastRunAt) ?? (typeof xpod?.lastRunAt === 'number' ? xpod.lastRunAt : undefined),
+            authBinding: this.parseTaskAuthBinding(metadata?.authBinding),
+            metadata,
             createdAt: this.isoToTimestamp(record.createdAt) ?? (0, types_1.nowTimestamp)(),
             updatedAt: this.isoToTimestamp(record.updatedAt) ?? (0, types_1.nowTimestamp)(),
         };
@@ -876,12 +910,7 @@ class PodChatKitStore {
             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;
-        delete metadataToPersist.commandKind;
-        delete metadataToPersist.surface_id;
-        const metadataObject = this.jsonObjectOrNull(metadataToPersist);
+        const metadataObject = this.jsonObjectOrNull(thread.metadata);
         if (commandKind === 'chat') {
             await this.ensureChat(surfaceId, context);
         }
@@ -898,9 +927,8 @@ class PodChatKitStore {
         if (existing) {
             // Update
             await db.updateByIri(schema_1.Thread, threadResource, {
-                commandKind,
-                surfaceId,
                 chat: commandKind === 'chat' ? this.buildChatResourceId(surfaceId) : null,
+                task: commandKind === 'task' ? (0, store_2.buildTaskResourceId)(`index.ttl#${surfaceId}`) : null,
                 title: thread.title || null,
                 status: this.statusToString(thread.status),
                 workspace: thread.workspace || null,
@@ -912,9 +940,8 @@ class PodChatKitStore {
             // Insert
             await db.insert(schema_1.Thread).values({
                 id: threadResourceId,
-                commandKind,
-                surfaceId,
                 chat: commandKind === 'chat' ? this.buildChatResourceId(surfaceId) : null,
+                task: commandKind === 'task' ? (0, store_2.buildTaskResourceId)(`index.ttl#${surfaceId}`) : null,
                 title: thread.title || null,
                 status: this.statusToString(thread.status),
                 workspace: thread.workspace || null,
@@ -1094,8 +1121,6 @@ class PodChatKitStore {
         }
         const messageRecord = {
             id: itemResourceId,
-            commandKind: resolvedThread.commandKind,
-            surfaceId: resolvedThread.surfaceId,
             chat: resolvedThread.commandKind === 'chat' ? this.buildChatResourceId(resolvedThread.surfaceId) : null,
             thread: resolvedThread.thread,
             maker: role === schema_1.MessageRole.USER ? webId : null,
@@ -1104,7 +1129,12 @@ class PodChatKitStore {
             status,
             toolName,
             toolCallId,
-            metadata: this.jsonObjectOrNull(metadata ?? undefined),
+            metadata: this.jsonObjectOrNull({
+                ...(metadata ?? {}),
+                commandKind: resolvedThread.commandKind,
+                surface_id: resolvedThread.surfaceId,
+                chat_id: resolvedThread.surfaceId,
+            }),
             createdAt: new Date(item.created_at * 1000).toISOString(),
         };
         await db.insert(schema_1.Message).values(messageRecord);
@@ -1302,12 +1332,14 @@ WHERE { ${deletePatterns.join(' ')} }
         }
         run.id = (0, store_1.buildRunResourceId)(run);
         const existing = await db.findById(schema_2.Run, run.id);
-        const values = {
+        const metadata = this.withXpodMetadata(run.metadata, {
+            commandKind: run.commandKind,
             surfaceId: run.surfaceId,
+        });
+        const values = {
             task: run.task || null,
             thread: run.thread,
             workspace: run.workspace,
-            commandKind: run.commandKind,
             status: run.status,
             runner: run.runner || null,
             prompt: run.prompt || null,
@@ -1317,7 +1349,7 @@ WHERE { ${deletePatterns.join(' ')} }
             heartbeatAt: this.timestampToIso(run.heartbeatAt),
             cancelRequestedAt: this.timestampToIso(run.cancelRequestedAt),
             error: run.error || null,
-            metadata: this.jsonObjectOrNull(run.metadata),
+            metadata: this.jsonObjectOrNull(metadata),
             createdAt: this.timestampToIso(run.createdAt) ?? new Date().toISOString(),
             startedAt: this.timestampToIso(run.startedAt),
             completedAt: this.timestampToIso(run.completedAt),
@@ -1358,9 +1390,6 @@ WHERE { ${deletePatterns.join(' ')} }
         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));
         }
@@ -1368,10 +1397,13 @@ WHERE { ${deletePatterns.join(' ')} }
         const records = conditions.length > 0
             ? await query.where((0, drizzle_solid_1.and)(...conditions))
             : await query;
-        return records
-            .map((record) => this.runRecordToData(record))
+        let runs = records.map((record) => this.runRecordToData(record));
+        if (options.commandKind) {
+            runs = runs.filter((run) => run.commandKind === options.commandKind);
+        }
+        return runs
             .sort((a, b) => b.createdAt - a.createdAt || b.id.localeCompare(a.id))
-            .slice(0, options.limit ?? records.length);
+            .slice(0, options.limit ?? runs.length);
     }
     async appendRunStep(event, context) {
         const db = await this.getDb(context);
@@ -1384,13 +1416,14 @@ WHERE { ${deletePatterns.join(' ')} }
         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,
+            stepType: event.type,
             message: event.message || null,
-            data: this.jsonObjectOrNull(event.data),
+            payload: this.jsonObjectOrNull(this.withXpodMetadata(event.data, {
+                commandKind: event.commandKind,
+                surfaceId: event.surfaceId,
+                runId: event.runId,
+            })),
             createdAt: this.timestampToIso(event.createdAt) ?? new Date().toISOString(),
         });
     }
@@ -1402,8 +1435,7 @@ WHERE { ${deletePatterns.join(' ')} }
         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 relation.
-        const records = await db.select().from(schema_2.RunStep).where((0, drizzle_solid_1.eq)(schema_2.RunStep.runId, runId));
+        const records = await db.select().from(schema_2.RunStep).where((0, drizzle_solid_1.eq)(schema_2.RunStep.run, this.resolveDataResource(runId, context)));
         return records
             .map((record) => this.runStepRecordToData(record))
             .sort((a, b) => a.createdAt - b.createdAt || a.id.localeCompare(b.id));
@@ -1431,21 +1463,23 @@ WHERE { ${deletePatterns.join(' ')} }
         }
         task.id = (0, store_2.buildTaskResourceId)(task.id);
         const existing = await db.findById(schema_3.Task, task.id);
-        const values = {
+        const metadata = this.withXpodMetadata(this.withTaskAuthBindingMetadata(task.metadata, task.authBinding), {
             surfaceId: task.surfaceId,
+            runner: task.runner,
+            triggerKind: task.triggerKind,
+            cron: task.cron ?? null,
+            intervalSeconds: task.intervalSeconds ?? null,
+            eventName: task.eventName ?? null,
+            nextRunAt: task.nextRunAt ?? null,
+            lastRunAt: task.lastRunAt ?? null,
+        });
+        const values = {
             title: task.title || null,
+            instruction: task.prompt,
             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)),
+            metadata: this.jsonObjectOrNull(metadata),
             createdAt: this.timestampToIso(task.createdAt) ?? new Date().toISOString(),
             updatedAt: this.timestampToIso(task.updatedAt) ?? new Date().toISOString(),
         };