@undefineds.co/models 0.2.0 → 0.2.1

package/dist/thread.schema.js

@@ -1 +1,39 @@
-export { threadTable, } from './core.js';
+import { uri, boolean, object, podTable, string, timestamp, id } from '@undefineds.co/drizzle-solid';
+import { UDFS, DCTerms, SIOC, LINX_CHAT } from './namespaces.js';
+/**
+ * Thread schema.
+ *
+ * CP0 baseline:
+ * - Chat is a pure channel/place.
+ * - Thread carries execution context needed for collaboration/audit.
+ *
+ * Storage structure (aligned with xpod):
+ * - Thread stored as fragment in Chat's index.ttl
+ * - Location: /.data/chat/{chat}/index.ttl#{id}
+ *
+ * NOTE:
+ * - `thread.workspace` is a storage-layer reference (URI) to a container/resource in CSS/Pod.
+ * - It is NOT the same thing as the runtime create API payload `workspace: { path, copy }`.
+ * - Runtime path/copy is an execution-time interface shape; persistence should keep the
+ *   container URI here and store portable metadata with that container/resource.
+ */
+export const threadTable = podTable('thread', {
+    id: id('id'),
+    // Belongs to chat. Stored as an RDF URI; short ids are resolved via chatTable's URI template by the ORM.
+    chat: uri('chat').predicate(SIOC.has_parent).notNull().link('chats'),
+    // Display / state
+    title: string('title').predicate(DCTerms.title),
+    starred: boolean('starred').predicate(UDFS.favorite).default(false),
+    // Storage-layer execution context reference: container/resource URI
+    workspace: uri('workspace').predicate(LINX_CHAT.workspace),
+    // Generic execution metadata shared by CLI/App runtimes.
+    metadata: object('metadata').predicate(UDFS.metadata),
+    createdAt: timestamp('createdAt').predicate(DCTerms.created).notNull().defaultNow(),
+    updatedAt: timestamp('updatedAt').predicate(DCTerms.modified).notNull().defaultNow(),
+}, {
+    base: '/.data/chat/',
+    sparqlEndpoint: '/.data/chat/-/sparql',
+    type: SIOC.Thread,
+    namespace: UDFS,
+    subjectTemplate: '{chat}/index.ttl#{id}',
+});

package/dist/{core/types/collaboration-rich-content.d.ts → types/collaboration-blocks.d.ts}

@@ -1,12 +1,12 @@
 /**
- * Wave A CP0: collaboration-related rich content items.
+ * Wave A CP0: collaboration-related richContent block contracts.
  *
- * These are data contracts stored in `MessageRow.richContent.items`.
- * They intentionally omit presentation/runtime wrapper fields.
+ * These are minimal JSON shapes stored in MessageRow.richContent and consumed by downstream UIs.
+ * They intentionally do NOT include UI block runtime fields (id/createdAt/status, etc.).
  */
 export type ToolRisk = 'low' | 'medium' | 'high';
 export type ToolApprovalStatus = 'pending' | 'approved' | 'rejected' | 'auto_approved';
-export interface ToolApprovalRichContentItem {
+export interface ToolApprovalBlock {
     type: 'tool_approval';
     toolCallId: string;
     toolName: string;
@@ -24,7 +24,7 @@ export interface ToolApprovalRichContentItem {
     inboxItemId?: string;
 }
 export type TaskProgressStepStatus = 'pending' | 'running' | 'done' | 'error' | 'skipped';
-export interface TaskProgressRichContentItem {
+export interface TaskProgressBlock {
     type: 'task_progress';
     taskId: string;
     title: string;
@@ -39,7 +39,7 @@ export interface TaskProgressRichContentItem {
     totalSteps: number;
 }
 export type ToolCallStatus = 'calling' | 'waiting_approval' | 'running' | 'done' | 'error';
-export interface ToolCallRichContentItem {
+export interface ToolCallBlock {
     type: 'tool';
     toolCallId: string;
     toolName: string;
@@ -49,4 +49,4 @@ export interface ToolCallRichContentItem {
     error?: string;
     duration?: number;
 }
-export type CollaborationRichContentItem = ToolApprovalRichContentItem | TaskProgressRichContentItem | ToolCallRichContentItem;
+export type CollaborationRichBlock = ToolApprovalBlock | TaskProgressBlock | ToolCallBlock;

package/dist/types/collaboration-blocks.js

@@ -0,0 +1,7 @@
+/**
+ * Wave A CP0: collaboration-related richContent block contracts.
+ *
+ * These are minimal JSON shapes stored in MessageRow.richContent and consumed by downstream UIs.
+ * They intentionally do NOT include UI block runtime fields (id/createdAt/status, etc.).
+ */
+export {};

package/dist/types/message-block.d.ts

@@ -0,0 +1,270 @@
+import type { ToolApprovalStatus, ToolCallStatus, TaskProgressStepStatus } from './collaboration-blocks';
+/**
+ * Message Block Types - 基于 Cherry Studio 的 block-based 消息系统
+ *
+ * 将消息内容拆分为多个块（blocks），支持：
+ * - 主文本 (Markdown)
+ * - 思考过程 (CoT/Reasoning)
+ * - 工具调用
+ * - 图片/文件
+ * - 引用/搜索结果
+ * - 错误信息
+ */
+export declare enum MessageBlockType {
+    /** 未知类型，用于流式响应开始前 */
+    UNKNOWN = "unknown",
+    /** 主要文本内容（Markdown） */
+    MAIN_TEXT = "main_text",
+    /** 思考过程（Claude、DeepSeek R1、OpenAI o-系列等） */
+    THINKING = "thinking",
+    /** 图片内容 */
+    IMAGE = "image",
+    /** 代码块（独立可运行） */
+    CODE = "code",
+    /** 工具调用及响应 */
+    TOOL = "tool",
+    /** 工具审批卡片 */
+    TOOL_APPROVAL = "tool_approval",
+    /** 任务进度卡片 */
+    TASK_PROGRESS = "task_progress",
+    /** 文件内容 */
+    FILE = "file",
+    /** 错误信息 */
+    ERROR = "error",
+    /** 引用类型（Web 搜索、知识库等） */
+    CITATION = "citation"
+}
+export declare enum MessageBlockStatus {
+    /** 等待处理 */
+    PENDING = "pending",
+    /** 正在处理，等待接收 */
+    PROCESSING = "processing",
+    /** 正在流式接收 */
+    STREAMING = "streaming",
+    /** 处理成功 */
+    SUCCESS = "success",
+    /** 处理错误 */
+    ERROR = "error",
+    /** 处理暂停 */
+    PAUSED = "paused"
+}
+export interface BaseMessageBlock {
+    /** 块 ID */
+    id: string;
+    /** 所属消息 ID */
+    messageId: string;
+    /** 块类型 */
+    type: MessageBlockType;
+    /** 创建时间 */
+    createdAt: string;
+    /** 更新时间 */
+    updatedAt?: string;
+    /** 块状态 */
+    status: MessageBlockStatus;
+    /** 使用的模型 */
+    model?: {
+        id: string;
+        name: string;
+        provider: string;
+    };
+    /** 通用元数据 */
+    metadata?: Record<string, unknown>;
+    /** 错误信息 */
+    error?: {
+        code?: string;
+        message: string;
+        details?: unknown;
+    };
+}
+export interface PlaceholderMessageBlock extends BaseMessageBlock {
+    type: MessageBlockType.UNKNOWN;
+}
+export interface MainTextMessageBlock extends BaseMessageBlock {
+    type: MessageBlockType.MAIN_TEXT;
+    /** Markdown 内容 */
+    content: string;
+    /** 关联的知识库 ID */
+    knowledgeBaseIds?: string[];
+    /** 引用参考 */
+    citationReferences?: Array<{
+        citationBlockId?: string;
+        url?: string;
+        title?: string;
+    }>;
+}
+export interface ThinkingMessageBlock extends BaseMessageBlock {
+    type: MessageBlockType.THINKING;
+    /** 思考内容 */
+    content: string;
+    /** 思考耗时（毫秒） */
+    thinkingDuration?: number;
+}
+export interface CodeMessageBlock extends BaseMessageBlock {
+    type: MessageBlockType.CODE;
+    /** 代码内容 */
+    content: string;
+    /** 代码语言 */
+    language: string;
+    /** 是否可执行 */
+    executable?: boolean;
+    /** 执行结果 */
+    executionResult?: {
+        output?: string;
+        error?: string;
+        exitCode?: number;
+    };
+}
+export interface ImageMessageBlock extends BaseMessageBlock {
+    type: MessageBlockType.IMAGE;
+    /** 图片 URL */
+    url?: string;
+    /** 本地文件路径 */
+    filePath?: string;
+    /** 图片元数据 */
+    metadata?: BaseMessageBlock['metadata'] & {
+        /** 生成提示词 */
+        prompt?: string;
+        /** 负面提示词 */
+        negativePrompt?: string;
+        /** 原始文件名 */
+        fileName?: string;
+        /** 文件大小 */
+        fileSize?: number;
+        /** 宽度 */
+        width?: number;
+        /** 高度 */
+        height?: number;
+    };
+}
+export interface ToolMessageBlock extends BaseMessageBlock {
+    type: MessageBlockType.TOOL;
+    /** 协作链路中的工具调用 ID（与 CP0 ToolCallBlock 对齐） */
+    toolCallId?: string;
+    /** 工具 ID */
+    toolId: string;
+    /** 工具名称 */
+    toolName: string;
+    /** 调用参数 */
+    arguments?: Record<string, unknown>;
+    /** 响应内容 */
+    content?: string | object;
+    /** CP0 协作契约状态（waiting_approval / running / done ...） */
+    toolStatus?: ToolCallStatus;
+    /** 执行结果（CP0 ToolCallBlock.result） */
+    result?: unknown;
+    /** 错误信息（CP0 ToolCallBlock.error） */
+    toolError?: string;
+    /** 耗时（ms） */
+    duration?: number;
+    /** 工具元数据 */
+    metadata?: BaseMessageBlock['metadata'] & {
+        /** 是否来自 MCP */
+        isMcp?: boolean;
+        /** MCP 服务器名称 */
+        mcpServer?: string;
+    };
+}
+export interface ToolApprovalMessageBlock extends BaseMessageBlock {
+    type: MessageBlockType.TOOL_APPROVAL;
+    toolCallId: string;
+    toolName: string;
+    toolDescription: string;
+    arguments: Record<string, unknown>;
+    risk: 'low' | 'medium' | 'high';
+    approvalStatus: ToolApprovalStatus;
+    approvedBy?: string;
+    approvedAt?: string;
+    decisionBy?: string;
+    decisionRole?: 'human' | 'secretary' | 'system';
+    onBehalfOf?: string;
+    reason?: string;
+    policyVersion?: string;
+    inboxItemId?: string;
+}
+export interface TaskProgressMessageBlock extends BaseMessageBlock {
+    type: MessageBlockType.TASK_PROGRESS;
+    taskId: string;
+    title: string;
+    steps: Array<{
+        id: string;
+        label: string;
+        status: TaskProgressStepStatus;
+        detail?: string;
+        duration?: number;
+    }>;
+    currentStep: number;
+    totalSteps: number;
+}
+export interface CitationMessageBlock extends BaseMessageBlock {
+    type: MessageBlockType.CITATION;
+    /** Web 搜索结果 */
+    webSearch?: {
+        query: string;
+        results: Array<{
+            title: string;
+            url: string;
+            snippet?: string;
+            favicon?: string;
+        }>;
+    };
+    /** 知识库引用 */
+    knowledge?: Array<{
+        id: string;
+        title: string;
+        content: string;
+        source?: string;
+    }>;
+}
+export interface FileMessageBlock extends BaseMessageBlock {
+    type: MessageBlockType.FILE;
+    /** 文件名 */
+    fileName: string;
+    /** 文件路径或 URL */
+    fileUrl: string;
+    /** 文件大小 */
+    fileSize?: number;
+    /** MIME 类型 */
+    mimeType?: string;
+}
+export interface ErrorMessageBlock extends BaseMessageBlock {
+    type: MessageBlockType.ERROR;
+    /** 错误消息 */
+    message: string;
+    /** 是否可重试 */
+    retryable?: boolean;
+}
+export type MessageBlock = PlaceholderMessageBlock | MainTextMessageBlock | ThinkingMessageBlock | CodeMessageBlock | ImageMessageBlock | ToolMessageBlock | ToolApprovalMessageBlock | TaskProgressMessageBlock | FileMessageBlock | ErrorMessageBlock | CitationMessageBlock;
+/**
+ * 消息的 richContent JSON 结构
+ * 存储在 Message.richContent 字段中
+ */
+export interface MessageRichContent {
+    /** 向后兼容：思考内容 */
+    thought?: string;
+    /** 向后兼容：工具调用 */
+    toolInvocations?: Array<{
+        id: string;
+        toolName: string;
+        input: unknown;
+        output?: unknown;
+        error?: string;
+    }>;
+    /** 新的块系统 */
+    blocks?: MessageBlock[];
+}
+/**
+ * 创建块的工厂函数
+ */
+export declare function createMessageBlock<T extends MessageBlock>(type: T['type'], messageId: string, partial: Omit<T, 'id' | 'messageId' | 'type' | 'createdAt' | 'status'>): T;
+/**
+ * 判断块类型
+ */
+export declare function isBlockType<T extends MessageBlock>(block: MessageBlock, type: T['type']): block is T;
+/**
+ * 从 richContent JSON 解析块
+ */
+export declare function parseMessageBlocks(richContent: string | null | undefined): MessageBlock[];
+/**
+ * 序列化块到 richContent JSON
+ */
+export declare function serializeMessageBlocks(blocks: MessageBlock[]): string;

package/dist/types/message-block.js

@@ -0,0 +1,125 @@
+/**
+ * Message Block Types - 基于 Cherry Studio 的 block-based 消息系统
+ *
+ * 将消息内容拆分为多个块（blocks），支持：
+ * - 主文本 (Markdown)
+ * - 思考过程 (CoT/Reasoning)
+ * - 工具调用
+ * - 图片/文件
+ * - 引用/搜索结果
+ * - 错误信息
+ */
+// 块类型枚举
+export var MessageBlockType;
+(function (MessageBlockType) {
+    /** 未知类型，用于流式响应开始前 */
+    MessageBlockType["UNKNOWN"] = "unknown";
+    /** 主要文本内容（Markdown） */
+    MessageBlockType["MAIN_TEXT"] = "main_text";
+    /** 思考过程（Claude、DeepSeek R1、OpenAI o-系列等） */
+    MessageBlockType["THINKING"] = "thinking";
+    /** 图片内容 */
+    MessageBlockType["IMAGE"] = "image";
+    /** 代码块（独立可运行） */
+    MessageBlockType["CODE"] = "code";
+    /** 工具调用及响应 */
+    MessageBlockType["TOOL"] = "tool";
+    /** 工具审批卡片 */
+    MessageBlockType["TOOL_APPROVAL"] = "tool_approval";
+    /** 任务进度卡片 */
+    MessageBlockType["TASK_PROGRESS"] = "task_progress";
+    /** 文件内容 */
+    MessageBlockType["FILE"] = "file";
+    /** 错误信息 */
+    MessageBlockType["ERROR"] = "error";
+    /** 引用类型（Web 搜索、知识库等） */
+    MessageBlockType["CITATION"] = "citation";
+})(MessageBlockType || (MessageBlockType = {}));
+// 块状态定义
+export var MessageBlockStatus;
+(function (MessageBlockStatus) {
+    /** 等待处理 */
+    MessageBlockStatus["PENDING"] = "pending";
+    /** 正在处理，等待接收 */
+    MessageBlockStatus["PROCESSING"] = "processing";
+    /** 正在流式接收 */
+    MessageBlockStatus["STREAMING"] = "streaming";
+    /** 处理成功 */
+    MessageBlockStatus["SUCCESS"] = "success";
+    /** 处理错误 */
+    MessageBlockStatus["ERROR"] = "error";
+    /** 处理暂停 */
+    MessageBlockStatus["PAUSED"] = "paused";
+})(MessageBlockStatus || (MessageBlockStatus = {}));
+/**
+ * 创建块的工厂函数
+ */
+export function createMessageBlock(type, messageId, partial) {
+    const id = `block-${Date.now()}-${Math.random().toString(36).slice(2, 9)}`;
+    return {
+        id,
+        messageId,
+        type,
+        createdAt: new Date().toISOString(),
+        status: MessageBlockStatus.PENDING,
+        ...partial,
+    };
+}
+/**
+ * 判断块类型
+ */
+export function isBlockType(block, type) {
+    return block.type === type;
+}
+/**
+ * 从 richContent JSON 解析块
+ */
+export function parseMessageBlocks(richContent) {
+    if (!richContent)
+        return [];
+    try {
+        const parsed = JSON.parse(richContent);
+        // 如果有新的块系统，直接返回
+        if (parsed.blocks && parsed.blocks.length > 0) {
+            return parsed.blocks;
+        }
+        // 向后兼容：转换旧格式
+        const blocks = [];
+        if (parsed.thought) {
+            blocks.push({
+                id: 'legacy-thought',
+                messageId: '',
+                type: MessageBlockType.THINKING,
+                content: parsed.thought,
+                createdAt: new Date().toISOString(),
+                status: MessageBlockStatus.SUCCESS,
+            });
+        }
+        if (parsed.toolInvocations) {
+            parsed.toolInvocations.forEach((ti, index) => {
+                blocks.push({
+                    id: `legacy-tool-${index}`,
+                    messageId: '',
+                    type: MessageBlockType.TOOL,
+                    toolId: ti.id,
+                    toolName: ti.toolName,
+                    arguments: ti.input,
+                    content: ti.output ?? ti.error,
+                    createdAt: new Date().toISOString(),
+                    status: ti.error ? MessageBlockStatus.ERROR : MessageBlockStatus.SUCCESS,
+                });
+            });
+        }
+        return blocks;
+    }
+    catch {
+        return [];
+    }
+}
+/**
+ * 序列化块到 richContent JSON
+ */
+export function serializeMessageBlocks(blocks) {
+    const content = { blocks };
+    return JSON.stringify(content);
+}

package/dist/vocab/_namespaces.d.ts

@@ -1 +1 @@
-export * from '../namespaces.js';
+export * from '../namespaces';

package/dist/vocab/index.d.ts

@@ -1,6 +1,5 @@
-export * from './_namespaces.js';
-export * from './chat.vocab.js';
-export * from './message.vocab.js';
-export * from './contact.vocab.js';
-export * from './thread.vocab.js';
-export * from './workspace.vocab.js';
+export * from './_namespaces';
+export * from './chat.vocab';
+export * from './message.vocab';
+export * from './contact.vocab';
+export * from './thread.vocab';

package/dist/vocab/index.js

@@ -3,4 +3,3 @@ export * from './chat.vocab.js';
 export * from './message.vocab.js';
 export * from './contact.vocab.js';
 export * from './thread.vocab.js';
-export * from './workspace.vocab.js';

package/dist/vocab/message.vocab.js

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

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

@@ -1,8 +1,7 @@
 export declare const ThreadVocab: {
-    readonly chatId: string;
+    readonly chat: string;
     readonly title: string;
     readonly starred: string;
-    readonly status: string;
     readonly metadata: string;
     readonly createdAt: string;
     readonly updatedAt: string;

package/dist/vocab/thread.vocab.js

@@ -1,13 +1,12 @@
 import { DCTerms, LINX_CHAT, SIOC, UDFS } from '../namespaces.js';
 export const ThreadVocab = {
-    chatId: SIOC.has_parent,
+    chat: SIOC.has_parent,
     title: DCTerms.title,
     starred: UDFS.favorite,
-    status: UDFS.status,
     metadata: UDFS.metadata,
     createdAt: DCTerms.created,
     updatedAt: DCTerms.modified,
-    // Execution context: workspace container (Agent@workspace)
+    // Execution context: workspace URI for the runnable root
     workspace: LINX_CHAT.workspace,
     // Type marker (for SPARQL convenience)
     type: SIOC.Thread,