@undefineds.co/xpod 0.2.44 → 0.3.0

package/dist/cli/lib/pi-optional.d.ts

@@ -1,84 +0,0 @@
-export interface PiModel {
-    id: string;
-    name?: string;
-    api?: string;
-    provider?: string;
-    baseUrl?: string;
-    reasoning?: boolean;
-    input?: string[];
-    cost?: {
-        input: number;
-        output: number;
-        cacheRead: number;
-        cacheWrite: number;
-    };
-    contextWindow?: number;
-    maxTokens?: number;
-}
-export interface OAuthCredentials {
-    refresh: string;
-    access: string;
-    expires: number;
-    userId?: string;
-    userName?: string;
-}
-export interface OAuthAuthInfo {
-    url: string;
-    instructions?: string;
-}
-export interface OAuthPrompt {
-    message: string;
-    placeholder?: string;
-}
-export interface OAuthLoginCallbacks {
-    onAuth(info: OAuthAuthInfo): void;
-    onPrompt(prompt: OAuthPrompt): Promise<string>;
-    onProgress(message: string): void;
-}
-export interface OAuthProviderInterface {
-    id: string;
-    name: string;
-    login(callbacks: OAuthLoginCallbacks): Promise<OAuthCredentials>;
-    refreshToken(credentials: OAuthCredentials): Promise<OAuthCredentials>;
-    getApiKey?(credentials: OAuthCredentials): string;
-}
-export interface PiAiOAuthUtils {
-    getOAuthProvider(providerId: string): OAuthProviderInterface | undefined;
-    registerOAuthProvider(provider: OAuthProviderInterface): void;
-}
-export interface PiAiModule {
-    getModels(providerId: string): PiModel[];
-}
-export interface AgentSessionLike {
-    subscribe(handler: (event: any) => void | Promise<void>): void;
-}
-export interface CreateAgentSessionResultLike {
-    session: AgentSessionLike;
-}
-export interface SessionManagerLike {
-    appendMessage(message: any): void;
-}
-export interface PiCodingAgentModule {
-    createAgentSession(options: any): Promise<CreateAgentSessionResultLike>;
-    runPrintMode(agent: AgentSessionLike, options: any): Promise<void>;
-    AuthStorage: {
-        inMemory(): {
-            setRuntimeApiKey(provider: string, apiKey: string): void;
-        };
-    };
-    SessionManager: {
-        create(workspace: string, sessionDir: string): SessionManagerLike;
-    };
-    SettingsManager: {
-        inMemory(): unknown;
-    };
-    DefaultResourceLoader: new (options: any) => {
-        reload(): Promise<void>;
-    };
-    InteractiveMode: new (agent: AgentSessionLike, options: any) => {
-        run(): Promise<void>;
-    };
-}
-export declare function loadPiAiOAuthUtils(): Promise<PiAiOAuthUtils>;
-export declare function loadPiAi(): Promise<PiAiModule>;
-export declare function loadPiCodingAgent(): Promise<PiCodingAgentModule>;

package/dist/cli/lib/pi-optional.js

@@ -1,35 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadPiAiOAuthUtils = loadPiAiOAuthUtils;
-exports.loadPiAi = loadPiAi;
-exports.loadPiCodingAgent = loadPiCodingAgent;
-const dynamicImport = new Function('specifier', 'return import(specifier)');
-function createMissingPackageError(packageName, error) {
-    const reason = error instanceof Error ? error.message : String(error);
-    return new Error(`Optional package ${packageName} is required for this CLI feature: ${reason}`);
-}
-async function loadPiAiOAuthUtils() {
-    try {
-        return await dynamicImport('@mariozechner/pi-ai/dist/utils/oauth/index.js');
-    }
-    catch (error) {
-        throw createMissingPackageError('@mariozechner/pi-ai', error);
-    }
-}
-async function loadPiAi() {
-    try {
-        return await dynamicImport('@mariozechner/pi-ai');
-    }
-    catch (error) {
-        throw createMissingPackageError('@mariozechner/pi-ai', error);
-    }
-}
-async function loadPiCodingAgent() {
-    try {
-        return await dynamicImport('@mariozechner/pi-coding-agent');
-    }
-    catch (error) {
-        throw createMissingPackageError('@mariozechner/pi-coding-agent', error);
-    }
-}
-//# sourceMappingURL=pi-optional.js.map

package/dist/cli/lib/pi-optional.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"pi-optional.js","sourceRoot":"","sources":["../../../src/cli/lib/pi-optional.ts"],"names":[],"mappings":";;AAqGA,gDAMC;AAED,4BAMC;AAED,8CAMC;AA3HD,MAAM,aAAa,GAAG,IAAI,QAAQ,CAAC,WAAW,EAAE,0BAA0B,CACrC,CAAC;AAEtC,SAAS,yBAAyB,CAAC,WAAmB,EAAE,KAAc;IACpE,MAAM,MAAM,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACtE,OAAO,IAAI,KAAK,CAAC,oBAAoB,WAAW,sCAAsC,MAAM,EAAE,CAAC,CAAC;AAClG,CAAC;AA+FM,KAAK,UAAU,kBAAkB;IACtC,IAAI,CAAC;QACH,OAAO,MAAM,aAAa,CAAC,+CAA+C,CAAmB,CAAC;IAChG,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,yBAAyB,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;IAChE,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,QAAQ;IAC5B,IAAI,CAAC;QACH,OAAO,MAAM,aAAa,CAAC,qBAAqB,CAAe,CAAC;IAClE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,yBAAyB,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;IAChE,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,iBAAiB;IACrC,IAAI,CAAC;QACH,OAAO,MAAM,aAAa,CAAC,+BAA+B,CAAwB,CAAC;IACrF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,yBAAyB,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;IAC1E,CAAC;AACH,CAAC","sourcesContent":["const dynamicImport = new Function('specifier', 'return import(specifier)') as\n  (specifier: string) => Promise<any>;\n\nfunction createMissingPackageError(packageName: string, error: unknown): Error {\n  const reason = error instanceof Error ? error.message : String(error);\n  return new Error(`Optional package ${packageName} is required for this CLI feature: ${reason}`);\n}\n\nexport interface PiModel {\n  id: string;\n  name?: string;\n  api?: string;\n  provider?: string;\n  baseUrl?: string;\n  reasoning?: boolean;\n  input?: string[];\n  cost?: {\n    input: number;\n    output: number;\n    cacheRead: number;\n    cacheWrite: number;\n  };\n  contextWindow?: number;\n  maxTokens?: number;\n}\n\nexport interface OAuthCredentials {\n  refresh: string;\n  access: string;\n  expires: number;\n  userId?: string;\n  userName?: string;\n}\n\nexport interface OAuthAuthInfo {\n  url: string;\n  instructions?: string;\n}\n\nexport interface OAuthPrompt {\n  message: string;\n  placeholder?: string;\n}\n\nexport interface OAuthLoginCallbacks {\n  onAuth(info: OAuthAuthInfo): void;\n  onPrompt(prompt: OAuthPrompt): Promise<string>;\n  onProgress(message: string): void;\n}\n\nexport interface OAuthProviderInterface {\n  id: string;\n  name: string;\n  login(callbacks: OAuthLoginCallbacks): Promise<OAuthCredentials>;\n  refreshToken(credentials: OAuthCredentials): Promise<OAuthCredentials>;\n  getApiKey?(credentials: OAuthCredentials): string;\n}\n\nexport interface PiAiOAuthUtils {\n  getOAuthProvider(providerId: string): OAuthProviderInterface | undefined;\n  registerOAuthProvider(provider: OAuthProviderInterface): void;\n}\n\nexport interface PiAiModule {\n  getModels(providerId: string): PiModel[];\n}\n\nexport interface AgentSessionLike {\n  subscribe(handler: (event: any) => void | Promise<void>): void;\n}\n\nexport interface CreateAgentSessionResultLike {\n  session: AgentSessionLike;\n}\n\nexport interface SessionManagerLike {\n  appendMessage(message: any): void;\n}\n\nexport interface PiCodingAgentModule {\n  createAgentSession(options: any): Promise<CreateAgentSessionResultLike>;\n  runPrintMode(agent: AgentSessionLike, options: any): Promise<void>;\n  AuthStorage: {\n    inMemory(): {\n      setRuntimeApiKey(provider: string, apiKey: string): void;\n    };\n  };\n  SessionManager: {\n    create(workspace: string, sessionDir: string): SessionManagerLike;\n  };\n  SettingsManager: {\n    inMemory(): unknown;\n  };\n  DefaultResourceLoader: new(options: any) => {\n    reload(): Promise<void>;\n  };\n  InteractiveMode: new(agent: AgentSessionLike, options: any) => {\n    run(): Promise<void>;\n  };\n}\n\nexport async function loadPiAiOAuthUtils(): Promise<PiAiOAuthUtils> {\n  try {\n    return await dynamicImport('@mariozechner/pi-ai/dist/utils/oauth/index.js') as PiAiOAuthUtils;\n  } catch (error) {\n    throw createMissingPackageError('@mariozechner/pi-ai', error);\n  }\n}\n\nexport async function loadPiAi(): Promise<PiAiModule> {\n  try {\n    return await dynamicImport('@mariozechner/pi-ai') as PiAiModule;\n  } catch (error) {\n    throw createMissingPackageError('@mariozechner/pi-ai', error);\n  }\n}\n\nexport async function loadPiCodingAgent(): Promise<PiCodingAgentModule> {\n  try {\n    return await dynamicImport('@mariozechner/pi-coding-agent') as PiCodingAgentModule;\n  } catch (error) {\n    throw createMissingPackageError('@mariozechner/pi-coding-agent', error);\n  }\n}\n"]}

package/dist/cli/lib/pod-ai-config.d.ts

@@ -1,26 +0,0 @@
-/**
- * Load AI provider configuration from the user's Solid Pod.
- *
- * Uses drizzle-solid to query Credential + Provider tables,
- * following the same protocol as API/ChatKit.
- */
-import type { Session } from '@inrupt/solid-client-authn-node';
-export interface PodAiConfig {
-    provider: string;
-    modelId: string;
-    apiKey: string;
-    baseUrl?: string;
-    proxyUrl?: string;
-    credentialId?: string;
-    authType?: 'api-key' | 'oauth';
-}
-/**
- * Fetch AI configuration from the user's Pod.
- *
- * Queries ApiKeyCredential + OAuthCredential + Provider tables using drizzle-solid.
- * Credential.provider (uri) references Provider's subject URI.
- * Returns the first active AI credential with a matching provider.
- *
- * Priority: ApiKeyCredential > OAuthCredential (API Key 优先)
- */
-export declare function loadPodAiConfig(session: Session): Promise<PodAiConfig | null>;

package/dist/cli/lib/pod-ai-config.js

@@ -1,99 +0,0 @@
-"use strict";
-/**
- * Load AI provider configuration from the user's Solid Pod.
- *
- * Uses drizzle-solid to query Credential + Provider tables,
- * following the same protocol as API/ChatKit.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadPodAiConfig = loadPodAiConfig;
-const drizzle_solid_1 = require("@undefineds.co/drizzle-solid");
-const tables_1 = require("../../credential/schema/tables");
-const provider_1 = require("../../ai/schema/provider");
-const model_1 = require("../../ai/schema/model");
-const types_1 = require("../../credential/schema/types");
-const oauth_credential_manager_1 = require("./oauth-credential-manager");
-/**
- * Fetch AI configuration from the user's Pod.
- *
- * Queries ApiKeyCredential + OAuthCredential + Provider tables using drizzle-solid.
- * Credential.provider (uri) references Provider's subject URI.
- * Returns the first active AI credential with a matching provider.
- *
- * Priority: ApiKeyCredential > OAuthCredential (API Key 优先)
- */
-async function loadPodAiConfig(session) {
-    try {
-        const db = (0, drizzle_solid_1.drizzle)({
-            fetch: session.fetch,
-            info: session.info,
-        });
-        // Workaround: drizzle-solid places FILTER inside OPTIONAL blocks,
-        // causing eq() on string columns to return 0 results.
-        // Fetch all and filter in JS. See docs/cli-dev-testing.md#known-issues.
-        // 1. 尝试读取 API Key credentials
-        const allApiKeyCredentials = await db.select().from(tables_1.ApiKeyCredential);
-        const apiKeyCredentials = allApiKeyCredentials.filter((c) => c.service === types_1.ServiceType.AI && c.status === types_1.CredentialStatus.ACTIVE);
-        // 2. 尝试读取 OAuth credentials
-        const allOAuthCredentials = await db.select().from(tables_1.OAuthCredential);
-        const oauthCredentials = allOAuthCredentials.filter((c) => c.service === types_1.ServiceType.AI && c.status === types_1.CredentialStatus.ACTIVE);
-        // 3. 合并所有凭据，API Key 优先
-        const allCredentials = [...apiKeyCredentials, ...oauthCredentials];
-        if (allCredentials.length === 0) {
-            return null;
-        }
-        // Build provider lookup by subject URI (@id)
-        const allProviders = await db.select().from(provider_1.Provider);
-        const providerByUri = new Map(allProviders.map(p => [p['@id'], p]));
-        // Match: cred.provider (uri) === provider['@id'] (subject URI)
-        for (let cred of allCredentials) {
-            if (!cred.provider)
-                continue;
-            const provider = providerByUri.get(cred.provider);
-            if (!provider)
-                continue;
-            const baseUrl = provider.baseUrl;
-            if (!baseUrl)
-                continue;
-            // 判断凭据类型
-            const isApiKey = 'apiKey' in cred && cred.apiKey;
-            const isOAuth = 'oauthAccessToken' in cred && cred.oauthAccessToken;
-            if (!isApiKey && !isOAuth)
-                continue;
-            // OAuth token 需要检查过期并自动刷新
-            if (isOAuth) {
-                const providerId = provider.id;
-                const tokenValid = await (0, oauth_credential_manager_1.ensureOAuthTokenValid)(session, cred.id, providerId);
-                if (!tokenValid) {
-                    console.warn(`OAuth token invalid for credential ${cred.id}, skipping`);
-                    continue;
-                }
-                // 重新读取 credential（可能已刷新）
-                const refreshedCreds = await db.select().from(tables_1.OAuthCredential);
-                const refreshedCred = refreshedCreds.find((c) => c.id === cred.id);
-                if (refreshedCred) {
-                    cred = refreshedCred;
-                }
-            }
-            const defaultModelRef = provider.defaultModel ?? provider.hasModel;
-            const defaultModel = defaultModelRef
-                ? (await db.findByIri(model_1.Model, defaultModelRef))?.id ?? ''
-                : '';
-            return {
-                provider: provider.id,
-                modelId: defaultModel,
-                apiKey: isApiKey ? cred.apiKey : cred.oauthAccessToken,
-                baseUrl,
-                proxyUrl: provider.proxyUrl || undefined,
-                credentialId: cred.id,
-                authType: isApiKey ? 'api-key' : 'oauth',
-            };
-        }
-        return null;
-    }
-    catch (error) {
-        console.error('Failed to load AI config from Pod:', error);
-        return null;
-    }
-}
-//# sourceMappingURL=pod-ai-config.js.map

package/dist/cli/lib/pod-ai-config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"pod-ai-config.js","sourceRoot":"","sources":["../../../src/cli/lib/pod-ai-config.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Load AI provider configuration from the user's Solid Pod.\n *\n * Uses drizzle-solid to query Credential + Provider tables,\n * following the same protocol as API/ChatKit.\n */\n\nimport { drizzle } from '@undefineds.co/drizzle-solid';\nimport { ApiKeyCredential, OAuthCredential } from '../../credential/schema/tables';\nimport { Provider } from '../../ai/schema/provider';\nimport { Model } from '../../ai/schema/model';\nimport { ServiceType, CredentialStatus } from '../../credential/schema/types';\nimport type { Session } from '@inrupt/solid-client-authn-node';\nimport { ensureOAuthTokenValid } from './oauth-credential-manager';\n\nexport interface PodAiConfig {\n  provider: string;      // provider id, e.g. 'openrouter'\n  modelId: string;       // e.g. 'claude-sonnet-4-20250514'\n  apiKey: string;\n  baseUrl?: string;\n  proxyUrl?: string;\n  credentialId?: string;\n  authType?: 'api-key' | 'oauth';  // 认证类型\n}\n\n/**\n * Fetch AI configuration from the user's Pod.\n *\n * Queries ApiKeyCredential + OAuthCredential + Provider tables using drizzle-solid.\n * Credential.provider (uri) references Provider's subject URI.\n * Returns the first active AI credential with a matching provider.\n *\n * Priority: ApiKeyCredential > OAuthCredential (API Key 优先)\n */\nexport async function loadPodAiConfig(session: Session): Promise<PodAiConfig | null> {\n  try {\n    const db: any = drizzle({\n      fetch: session.fetch,\n      info: session.info,\n    } as any);\n\n    // Workaround: drizzle-solid places FILTER inside OPTIONAL blocks,\n    // causing eq() on string columns to return 0 results.\n    // Fetch all and filter in JS. See docs/cli-dev-testing.md#known-issues.\n\n    // 1. 尝试读取 API Key credentials\n    const allApiKeyCredentials = await db.select().from(ApiKeyCredential) as any[];\n    const apiKeyCredentials = allApiKeyCredentials.filter((c: any) =>\n      c.service === ServiceType.AI && c.status === CredentialStatus.ACTIVE,\n    );\n\n    // 2. 尝试读取 OAuth credentials\n    const allOAuthCredentials = await db.select().from(OAuthCredential) as any[];\n    const oauthCredentials = allOAuthCredentials.filter((c: any) =>\n      c.service === ServiceType.AI && c.status === CredentialStatus.ACTIVE,\n    );\n\n    // 3. 合并所有凭据，API Key 优先\n    const allCredentials = [...apiKeyCredentials, ...oauthCredentials];\n\n    if (allCredentials.length === 0) {\n      return null;\n    }\n\n    // Build provider lookup by subject URI (@id)\n    const allProviders = await db.select().from(Provider) as any[];\n    const providerByUri = new Map(allProviders.map(p => [p['@id'], p]));\n\n    // Match: cred.provider (uri) === provider['@id'] (subject URI)\n    for (let cred of allCredentials) {\n      if (!cred.provider) continue;\n\n      const provider = providerByUri.get(cred.provider);\n      if (!provider) continue;\n\n      const baseUrl = provider.baseUrl;\n      if (!baseUrl) continue;\n\n      // 判断凭据类型\n      const isApiKey = 'apiKey' in cred && cred.apiKey;\n      const isOAuth = 'oauthAccessToken' in cred && cred.oauthAccessToken;\n\n      if (!isApiKey && !isOAuth) continue;\n\n      // OAuth token 需要检查过期并自动刷新\n      if (isOAuth) {\n        const providerId = provider.id as string;\n        const tokenValid = await ensureOAuthTokenValid(session, cred.id, providerId);\n        if (!tokenValid) {\n          console.warn(`OAuth token invalid for credential ${cred.id}, skipping`);\n          continue;\n        }\n\n        // 重新读取 credential（可能已刷新）\n        const refreshedCreds = await db.select().from(OAuthCredential) as any[];\n        const refreshedCred = refreshedCreds.find((c: any) => c.id === cred.id);\n        if (refreshedCred) {\n          cred = refreshedCred as any;\n        }\n      }\n\n      const defaultModelRef = provider.defaultModel ?? provider.hasModel;\n      const defaultModel = defaultModelRef\n        ? (await db.findByIri(Model, defaultModelRef))?.id ?? ''\n        : '';\n\n      return {\n        provider: provider.id as string,\n        modelId: defaultModel,\n        apiKey: isApiKey ? (cred as any).apiKey : (cred as any).oauthAccessToken,\n        baseUrl,\n        proxyUrl: provider.proxyUrl || undefined,\n        credentialId: cred.id,\n        authType: isApiKey ? 'api-key' : 'oauth',\n      };\n    }\n\n    return null;\n  } catch (error) {\n    console.error('Failed to load AI config from Pod:', error);\n    return null;\n  }\n}\n"]}

package/dist/cli/lib/pod-thread-store.d.ts

@@ -1,57 +0,0 @@
-/**
- * Conversation thread storage backed by the user's Solid Pod.
- *
- * Uses drizzle-solid to operate on Chat + Thread + Message tables,
- * following the same protocol as API/ChatKit.
- *
- * Data model:
- * - Chat = 通讯录（跟谁聊）：由 participants 决定，不再由 cwd hash 生成
- * - Thread = 对话实例（聊什么、在哪聊）：workspace 是一级字段
- */
-import type { Session } from '@inrupt/solid-client-authn-node';
-export interface ThreadMessage {
-    role: 'user' | 'assistant' | 'system';
-    content: string;
-    timestamp: string;
-}
-export interface ThreadData {
-    id: string;
-    title?: string;
-    workspace?: string;
-    createdAt: string;
-    updatedAt: string;
-    messages: ThreadMessage[];
-}
-/**
- * Get or create the default 1v1 Chat for CLI (user ↔ SecretaryAI).
- * Returns the chatId (bare ID, not URI).
- */
-export declare function getOrCreateDefaultChat(session: Session): Promise<string>;
-/**
- * List thread IDs (most-recent first) for a given chatId.
- * Uses direct SPARQL because eq() on optional uri() fields still has issues.
- */
-export declare function listThreads(session: Session, chatId: string): Promise<string[]>;
-/**
- * Load a thread by ID with all its messages.
- */
-export declare function loadThread(session: Session, chatId: string, threadId: string): Promise<ThreadData | null>;
-/**
- * Save a message to a thread.
- */
-export declare function saveMessage(session: Session, chatId: string, threadId: string, message: ThreadMessage): Promise<boolean>;
-/**
- * Save a tool call as a message with metadata.
- */
-export declare function saveToolCall(session: Session, chatId: string, threadId: string, toolCall: {
-    toolName: string;
-    toolCallId: string;
-    arguments: any;
-    output?: string;
-    status: 'pending' | 'completed' | 'failed';
-}): Promise<boolean>;
-/**
- * Create a fresh thread.
- * workspace is stored as a first-class field on Thread.
- */
-export declare function createThread(session: Session, chatId: string, workspace?: string, title?: string): Promise<string>;

package/dist/cli/lib/pod-thread-store.js

@@ -1,312 +0,0 @@
-"use strict";
-/**
- * Conversation thread storage backed by the user's Solid Pod.
- *
- * Uses drizzle-solid to operate on Chat + Thread + Message tables,
- * following the same protocol as API/ChatKit.
- *
- * Data model:
- * - Chat = 通讯录（跟谁聊）：由 participants 决定，不再由 cwd hash 生成
- * - Thread = 对话实例（聊什么、在哪聊）：workspace 是一级字段
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOrCreateDefaultChat = getOrCreateDefaultChat;
-exports.listThreads = listThreads;
-exports.loadThread = loadThread;
-exports.saveMessage = saveMessage;
-exports.saveToolCall = saveToolCall;
-exports.createThread = createThread;
-const drizzle_solid_1 = require("@undefineds.co/drizzle-solid");
-const schema_1 = require("../../api/chatkit/schema");
-/** Default Chat ID for CLI 1v1 conversations with SecretaryAI */
-const DEFAULT_CLI_CHAT_ID = 'cli-default';
-/**
- * Create a drizzle-solid database instance from an authenticated Session.
- */
-function createDb(session) {
-    return (0, drizzle_solid_1.drizzle)({
-        fetch: session.fetch,
-        info: session.info,
-    });
-}
-function buildThreadUri(session, chatId, threadId) {
-    const podBaseUrl = session.info.webId.replace('/profile/card#me', '');
-    return `${podBaseUrl}/.data/chat/${chatId}/index.ttl#${threadId}`;
-}
-/**
- * Get or create the default 1v1 Chat for CLI (user ↔ SecretaryAI).
- * Returns the chatId (bare ID, not URI).
- */
-async function getOrCreateDefaultChat(session) {
-    const chatId = DEFAULT_CLI_CHAT_ID;
-    try {
-        const db = createDb(session);
-        await ensureChat(db, chatId, session.info.webId);
-    }
-    catch (error) {
-        console.error('Failed to ensure default chat:', error);
-    }
-    return chatId;
-}
-/**
- * List thread IDs (most-recent first) for a given chatId.
- * Uses direct SPARQL because eq() on optional uri() fields still has issues.
- */
-async function listThreads(session, chatId) {
-    try {
-        const podBaseUrl = session.info.webId.replace('/profile/card#me', '');
-        const endpoint = `${podBaseUrl}/.data/chat/-/sparql`;
-        const chatSubject = `<${podBaseUrl}/.data/chat/${chatId}/index.ttl#this>`;
-        // Note: Removed OPTIONAL to avoid filtering out threads without createdAt
-        // OPTIONAL in GRAPH ?g context can cause incomplete results (40 vs 57 threads)
-        const query = `
-      PREFIX sioc: <http://rdfs.org/sioc/ns#>
-      PREFIX udfs: <https://undefineds.co/ns#>
-      SELECT ?thread ?createdAt
-      WHERE {
-        ?thread a sioc:Thread ;
-                sioc:has_parent ${chatSubject} ;
-                udfs:createdAt ?createdAt .
-      }
-      ORDER BY DESC(?createdAt)
-    `;
-        const res = await session.fetch(endpoint, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/sparql-query',
-                'Accept': 'application/sparql-results+json',
-            },
-            body: query,
-        });
-        if (!res.ok)
-            return [];
-        const json = await res.json();
-        const bindings = json.results?.bindings || [];
-        // Extract thread ID from URI fragment: ...index.ttl#thread-xxx → thread-xxx
-        return bindings
-            .map((b) => {
-            const uri = b.thread?.value || '';
-            const hash = uri.lastIndexOf('#');
-            return hash >= 0 ? uri.slice(hash + 1) : '';
-        })
-            .filter((id) => id.length > 0);
-    }
-    catch (error) {
-        console.error('Failed to list threads:', error);
-        return [];
-    }
-}
-/**
- * Load a thread by ID with all its messages.
- */
-async function loadThread(session, chatId, threadId) {
-    try {
-        const db = createDb(session);
-        const podBaseUrl = session.info.webId.replace('/profile/card#me', '');
-        const threadUri = buildThreadUri(session, chatId, threadId);
-        // Query thread by full URI
-        const thread = await db.findByIri(schema_1.Thread, threadUri);
-        if (!thread)
-            return null;
-        // Query messages using direct SPARQL
-        // Note: OPTIONAL works correctly with date-grouped files (messages.ttl)
-        const endpoint = `${podBaseUrl}/.data/chat/-/sparql`;
-        const threadSubject = `<${threadUri}>`;
-        const messagesQuery = `
-      PREFIX meeting: <http://www.w3.org/ns/pim/meeting#>
-      PREFIX sioc: <http://rdfs.org/sioc/ns#>
-      PREFIX udfs: <https://undefineds.co/ns#>
-      SELECT ?role ?content ?createdAt
-      WHERE {
-        ?msg a meeting:Message ;
-             sioc:has_container ${threadSubject} .
-        OPTIONAL { ?msg udfs:role ?role . }
-        OPTIONAL { ?msg sioc:content ?content . }
-        OPTIONAL { ?msg udfs:createdAt ?createdAt . }
-      }
-      ORDER BY ?createdAt
-    `;
-        const messagesRes = await session.fetch(endpoint, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/sparql-query',
-                'Accept': 'application/sparql-results+json',
-            },
-            body: messagesQuery,
-        });
-        const messagesJson = messagesRes.ok ? await messagesRes.json() : { results: { bindings: [] } };
-        const messageBindings = messagesJson.results?.bindings || [];
-        // Extract bare ID from thread.id
-        const bareId = typeof thread.id === 'string' && thread.id.includes('#')
-            ? thread.id.split('#').pop() || threadId
-            : thread.id;
-        return {
-            id: bareId,
-            title: thread.title || undefined,
-            workspace: thread.workspace || undefined,
-            createdAt: thread.createdAt?.toISOString() || new Date().toISOString(),
-            updatedAt: thread.updatedAt?.toISOString() || new Date().toISOString(),
-            messages: messageBindings.map((m) => ({
-                role: m.role?.value || 'user',
-                content: m.content?.value || '',
-                timestamp: m.createdAt?.value || new Date().toISOString(),
-            })),
-        };
-    }
-    catch (error) {
-        console.error('Failed to load thread:', error);
-        return null;
-    }
-}
-/**
- * Save a message to a thread.
- */
-async function saveMessage(session, chatId, threadId, message) {
-    try {
-        const db = createDb(session);
-        // Ensure chat exists
-        await ensureChat(db, chatId, session.info.webId);
-        // Ensure thread exists
-        await ensureThread(db, chatId, threadId, session.info.webId);
-        // 构建完整的 Thread URI（用于 RDF 引用）
-        const threadUri = buildThreadUri(session, chatId, threadId);
-        // Insert message
-        // Note: yyyy/MM/dd are automatically extracted from createdAt by drizzle-solid
-        const messageId = `msg-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-        await db.insert(schema_1.Message).values({
-            id: messageId,
-            chat: chatId,
-            thread: threadUri, // 传入完整 URI
-            maker: session.info.webId,
-            role: message.role,
-            content: message.content,
-            status: 'completed',
-            createdAt: new Date(message.timestamp),
-        });
-        return true;
-    }
-    catch (error) {
-        console.error('Failed to save message:', error);
-        return false;
-    }
-}
-/**
- * Save a tool call as a message with metadata.
- */
-async function saveToolCall(session, chatId, threadId, toolCall) {
-    try {
-        const db = createDb(session);
-        // Ensure chat and thread exist
-        await ensureChat(db, chatId, session.info.webId);
-        await ensureThread(db, chatId, threadId, session.info.webId);
-        // 构建完整的 Thread URI（用于 RDF 引用）
-        const threadUri = buildThreadUri(session, chatId, threadId);
-        // Insert tool call message
-        // Note: yyyy/MM/dd are automatically extracted from createdAt by drizzle-solid
-        const messageId = `tool-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-        await db.insert(schema_1.Message).values({
-            id: messageId,
-            chat: chatId,
-            thread: threadUri, // 传入完整 URI
-            maker: session.info.webId,
-            role: 'tool_call',
-            content: `Executed ${toolCall.toolName}`,
-            status: toolCall.status,
-            toolName: toolCall.toolName,
-            toolCallId: toolCall.toolCallId,
-            metadata: JSON.stringify({
-                type: 'tool_call',
-                toolName: toolCall.toolName,
-                toolCallId: toolCall.toolCallId,
-                arguments: toolCall.arguments,
-                output: toolCall.output,
-                status: toolCall.status,
-            }),
-            createdAt: new Date(),
-        });
-        return true;
-    }
-    catch (error) {
-        console.error('Failed to save tool call:', error);
-        return false;
-    }
-}
-/**
- * Create a fresh thread.
- * workspace is stored as a first-class field on Thread.
- */
-async function createThread(session, chatId, workspace, title) {
-    const threadId = `thread-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-    try {
-        const db = createDb(session);
-        // Ensure chat exists
-        await ensureChat(db, chatId, session.info.webId);
-        // Create thread with workspace as first-class field
-        const now = new Date();
-        await db.insert(schema_1.Thread).values({
-            id: threadId,
-            chatId,
-            title: title || 'CLI Conversation',
-            workspace: workspace || null,
-            status: 'active',
-            metadata: JSON.stringify({ source: 'cli' }),
-            createdAt: now,
-            updatedAt: now,
-        });
-        return threadId;
-    }
-    catch (error) {
-        console.error('Failed to create thread:', error);
-        return threadId; // Return ID anyway, will be created on first message
-    }
-}
-// ============================================================================
-// Internal Helpers
-// ============================================================================
-async function ensureChat(db, chatId, webId) {
-    try {
-        // Use findByIri to avoid OPTIONAL bug in SPARQL queries
-        const podBaseUrl = webId.replace('/profile/card#me', '');
-        const chatUri = `${podBaseUrl}/.data/chat/${chatId}/index.ttl#this`;
-        const chat = await db.findByIri(schema_1.Chat, chatUri);
-        if (!chat) {
-            const now = new Date();
-            await db.insert(schema_1.Chat).values({
-                id: chatId,
-                title: 'CLI Chat',
-                author: webId,
-                participants: [],
-                status: 'active',
-                createdAt: now,
-                updatedAt: now,
-            });
-        }
-    }
-    catch (error) {
-        // Ignore if already exists
-    }
-}
-async function ensureThread(db, chatId, threadId, webId) {
-    try {
-        // Use findByIri to avoid OPTIONAL bug in SPARQL queries
-        const podBaseUrl = webId.replace('/profile/card#me', '');
-        const threadUri = `${podBaseUrl}/.data/chat/${chatId}/index.ttl#${threadId}`;
-        const thread = await db.findByIri(schema_1.Thread, threadUri);
-        if (!thread) {
-            const now = new Date();
-            await db.insert(schema_1.Thread).values({
-                id: threadId,
-                chatId,
-                title: 'CLI Conversation',
-                status: 'active',
-                metadata: JSON.stringify({ source: 'cli' }),
-                createdAt: now,
-                updatedAt: now,
-            });
-        }
-    }
-    catch (error) {
-        // Ignore if already exists
-    }
-}
-//# sourceMappingURL=pod-thread-store.js.map