@coffer-org/server 7.3.0 → 7.4.0

package/dist/orchestrator/types.d.ts

@@ -2,9 +2,11 @@ import type { ImageTarget } from '../media/index.ts';
 import type { AuthRole } from '../plugin-hooks.ts';
 import type { ContextFact } from './context-facts.ts';
 import type { SystemAreas } from './system-areas.ts';
+import type { StoredAttachment } from '../conversation-store.ts';
 export type { ImageTarget };
 export type { ContextFact };
 export type { SystemAreas };
+export type { StoredAttachment };
 export interface AttachmentRef {
     name: string;
     mime?: string;
@@ -85,7 +87,7 @@ export interface AgentTurn {
     body: {
         system: string[];
         messages: ConvMessage[];
-        userTurns: number;
+        userMessageCount: number;
     };
     toolProvider?: AgentToolProvider;
     presetId?: string;
@@ -112,7 +114,6 @@ export interface AgentRuntime {
 }
 export interface ConnectorRegistration {
     id: string;
-    linkUrl?(code: string): string | undefined;
 }
 export interface AttachmentMaterializer {
     store(bytes: Uint8Array, opts?: {
@@ -120,10 +121,9 @@ export interface AttachmentMaterializer {
         mime?: string;
     }): Promise<AttachmentRef>;
 }
-export type SenderIdKind = 'coffer-user' | 'transport';
 export interface TurnEnvelope {
     connectorId: string;
-    chatId: string;
+    conversationId: string;
     turnId: string;
 }
 export interface ConnectorCapabilities {
@@ -132,23 +132,26 @@ export interface ConnectorCapabilities {
 }
 export interface TurnBody {
     systemPrompt: SystemAreas;
-    messages: ConvMessage[];
     capabilities: ConnectorCapabilities;
-    userTurns: number;
 }
 export interface TurnRequest {
     envelope: TurnEnvelope;
-    body: TurnBody;
-    agentId?: string;
-    presetId?: string;
     sender: {
-        id: string;
+        userId: number;
         displayName?: string;
-        idKind?: SenderIdKind;
     };
+    message?: {
+        text: string;
+        attachments?: StoredAttachment[];
+        replyToMsgId?: string | null;
+    };
+    capabilities?: ConnectorCapabilities;
+    systemPrompt?: SystemAreas;
     turnContext?: ContextFact[];
-    prepareAttachments?: (materializer: AttachmentMaterializer) => Promise<ConvMessage[]>;
+    agentId?: string;
+    presetId?: string;
     signal?: AbortSignal;
+    prepareAttachments?(m: AttachmentMaterializer): Promise<StoredAttachment[] | ConvMessage[]>;
 }
 export type TurnEvent = {
     kind: 'delta';
@@ -177,9 +180,6 @@ export type TurnEvent = {
 } | {
     kind: 'title';
     text: string;
-} | {
-    kind: 'notice';
-    text: string;
 };
 export interface TurnSink {
     emit(event: TurnEvent): void;
@@ -187,14 +187,8 @@ export interface TurnSink {
 }
 export interface Connector {
     id: string;
-    enrolmentNotice: string;
-    open(envelope: TurnEnvelope): TurnSink;
-    recordContext(m: {
-        chatId: string;
-        userMsgId: string;
-        facts: ContextFact[];
-        ts: number;
-    }): Promise<void>;
+    open(envelope: TurnEnvelope, msgId: string): TurnSink;
+    bindMessage?(envelope: TurnEnvelope, msgId: string, externalId: string): Promise<void>;
 }
 export interface GatePolicy {
     agentId?: string;

package/dist/plugin-hooks.d.ts

@@ -1,6 +1,7 @@
 import type { EntityManager } from '@mikro-orm/core';
 import type { z } from 'zod';
-import type { ColumnType, ColumnConversion } from '@coffer-org/sdk/fields';
+import type { ColumnType, ColumnConversion, LayoutEl } from '@coffer-org/sdk/fields';
+import type { LayoutInput } from '@coffer-org/sdk/materialize/decl';
 import { type Logger } from '@coffer-org/sdk/logger';
 export type { BackgroundTask } from './background-scheduler.ts';
 export interface TableOps {
@@ -60,6 +61,15 @@ export type PluginStreamAction = (body: Record<string, unknown>, ctx: {
     emit: (event: string, data: unknown) => void;
     signal: AbortSignal;
 }) => Promise<void>;
+export interface PrivateTableDef {
+    name: string;
+    fields: LayoutEl[];
+    unique?: string[][];
+}
+export type PrivateTableDefInput = Omit<PrivateTableDef, 'fields'> & {
+    fields: LayoutInput;
+};
+export declare function definePrivateTable(t: PrivateTableDefInput): PrivateTableDef;
 export interface PluginHooks {
     migrations?: Migration[];
     seed?: Seed[];
@@ -71,6 +81,7 @@ export interface PluginHooks {
     userActions?: Record<string, PluginUserAction>;
     streamActions?: Record<string, PluginStreamAction>;
     http?: PluginHttpMount[];
+    tables?: PrivateTableDef[];
 }
 export declare const pluginHooks: Record<string, PluginHooks>;
 export interface PluginHttpRequest {

package/dist/plugin-hooks.js

@@ -1,3 +1,4 @@
+import { materializeDef } from '@coffer-org/sdk/materialize/pipeline';
 import { getLogger } from '@coffer-org/sdk/logger';
 export function pluginCtx(id, em, signal) {
     return { em, log: getLogger(id), ...(signal ? { signal } : {}) };
@@ -10,4 +11,7 @@ export class HttpError extends Error {
         this.name = 'HttpError';
     }
 }
+export function definePrivateTable(t) {
+    return materializeDef(t);
+}
 export const pluginHooks = {};

package/dist/plugin-runtime.d.ts

@@ -1,14 +1,18 @@
+import type { EntitySchema } from '@mikro-orm/core';
 import { type Registry } from '@coffer-org/sdk/compose';
 import type { PluginManifest } from '@coffer-org/sdk/plugin';
+import { type PluginHooks } from './plugin-hooks.ts';
 export declare function getPlugins(): Promise<PluginManifest[]>;
 export declare function readDisabled(): Promise<Set<string>>;
 export declare function getDisabled(): Promise<Set<string>>;
 export declare function getPluginSettings(groupId: string): Promise<Record<string, unknown>>;
 export declare function requireSettings<K extends string>(pluginId: string, keys: readonly K[]): Promise<Record<K, string>>;
+export declare function privateTableEntities(plugins: PluginManifest[], hooks: Record<string, PluginHooks>): EntitySchema[];
 export declare function initStorage(): Promise<Set<string>>;
 export declare function initPlugins(): Promise<Registry>;
 export declare function teardownPlugins(): Promise<void>;
 export declare function teardownPlugin(id: string): Promise<void>;
+export declare function pluginTables(p: PluginManifest, hooks?: Record<string, PluginHooks>): string[];
 export declare function purgePluginData(p: PluginManifest, actor: string): Promise<void>;
 export declare function filterEnabled<T extends {
     id: string;

package/dist/plugin-runtime.js

@@ -2,7 +2,7 @@ import { composeRegistry } from '@coffer-org/sdk/compose';
 import { getLogger } from '@coffer-org/sdk/logger';
 import { initDb, getOrm, getEm } from "./db.js";
 import { syncSchema } from "./schema-sync.js";
-import { systemEntities, buildPluginEntities, shelfTableName } from "./entity-schema.js";
+import { systemEntities, buildPluginEntities, buildPrivateTableEntity, shelfTableName, privateTableName, } from "./entity-schema.js";
 import { pluginHooks, pluginCtx, HttpError } from "./plugin-hooks.js";
 import { discoverPlugins, loadServerHooks } from "./plugin-discovery.js";
 import { selectRows } from "./read-rows.js";
@@ -13,7 +13,7 @@ import { migrateEmbeddingVectorsToBlob } from "./embeddings.js";
 import { ensureSearchTable } from "./search-index.js";
 import { startScheduler, stopScheduler } from "./background-scheduler.js";
 import { startSearchIndexer, indexSearchOnce } from "./search-indexer.js";
-import { startOrchestrator, stopOrchestrator, orchestratorStartersTask, linkCodePruneTask, } from "./orchestrator/index.js";
+import { startOrchestrator, stopOrchestrator, orchestratorStartersTask } from "./orchestrator/index.js";
 import { SYSTEM_SETTINGS_ID, SYSTEM_SETTINGS } from "./system-settings.js";
 const log = getLogger('plugins');
 let stopSearchIndexer;
@@ -78,6 +78,9 @@ async function seedPluginRows() {
     }
     await fork.flush();
 }
+export function privateTableEntities(plugins, hooks) {
+    return plugins.flatMap((p) => (hooks[p.id]?.tables ?? []).map((t) => buildPrivateTableEntity(p.id, t)));
+}
 export async function initStorage() {
     await initDb(systemEntities);
     await runSystemMigrations(getEm().fork());
@@ -92,10 +95,10 @@ export async function initStorage() {
     const hooks = await loadServerHooks();
     await runMigrations({
         em: getEm().fork(),
-        plugins: active.map((p) => ({ id: p.id, tables: pluginTables(p) })),
+        plugins: active.map((p) => ({ id: p.id, tables: pluginTables(p, hooks) })),
         hooks,
     });
-    const pluginEntities = buildPluginEntities(active);
+    const pluginEntities = [...buildPluginEntities(active), ...privateTableEntities(active, hooks)];
     await assertSafeRequired(getEm().fork(), pluginEntities);
     if (pluginEntities.length)
         getOrm().discoverEntity(pluginEntities);
@@ -110,7 +113,7 @@ export async function initPlugins() {
     Object.assign(pluginHooks, await loadServerHooks());
     await runSeeds({ em: getEm().fork(), plugins: reg.order, hooks: pluginHooks });
     startOrchestrator();
-    const bgTasks = [orchestratorStartersTask, linkCodePruneTask];
+    const bgTasks = [orchestratorStartersTask];
     for (const p of reg.order) {
         const h = pluginHooks[p.id];
         try {
@@ -175,16 +178,17 @@ function pluginShelves(p) {
         ...(p.libraryShelves ?? []).map((m) => ({ library: m.library, shelf: m.shelf })),
     ];
 }
-function pluginTables(p) {
+export function pluginTables(p, hooks) {
     return [
         ...pluginShelves(p).map(({ library, shelf }) => shelfTableName(library, shelf)),
         ...(p.extends_ ?? []).map((e) => `extend__${e.id}`),
         ...(p.settings && p.settings.fields.length > 0 ? [`_settings__${p.id}`] : []),
+        ...(hooks?.[p.id]?.tables ?? []).map((t) => privateTableName(p.id, t.name)),
     ];
 }
 export async function purgePluginData(p, actor) {
     await teardownPlugin(p.id);
-    const tables = pluginTables(p);
+    const tables = pluginTables(p, pluginHooks);
     const conn = getEm().fork().getConnection();
     for (const t of tables) {
         await conn.execute(`DROP TABLE IF EXISTS "${t}"`);

package/dist/plugins-api.d.ts

@@ -1,15 +1,21 @@
 import type { FastifyInstance } from 'fastify';
 import type { PluginManifest } from '@coffer-org/sdk/plugin';
 import type { PluginAssetRecord } from './plugin-discovery.ts';
+export interface PluginLabelEntry {
+    id: string;
+    label: string;
+}
 export interface PluginListEntry {
     id: string;
+    label: string;
+    description: string;
     installedVersion: string;
     latestVersion: string | null;
     packageName: string | null;
     dependsOn: string[];
     enabled: boolean;
-    libraries: string[];
-    extends: string[];
+    libraries: PluginLabelEntry[];
+    extends: PluginLabelEntry[];
     hasSettings: boolean;
     schema?: string;
     web?: string;

package/dist/plugins-api.js

@@ -11,13 +11,15 @@ export async function buildPluginListResponse(plugins, assets, disabled, withUpd
         const a = assetById.get(p.id);
         return {
             id: p.id,
+            label: p.label,
+            description: p.description,
             installedVersion: a?.version ?? p.version,
             latestVersion: withUpdates && a && !a.local ? await checkLatestVersion(a.packageName, { force: forceUpdates }) : null,
             packageName: a?.packageName ?? null,
             dependsOn: p.dependsOn,
             enabled: !disabled.has(p.id),
-            libraries: (p.libraries ?? []).map((v) => v.meta.id),
-            extends: (p.extends_ ?? []).map((e) => e.id),
+            libraries: (p.libraries ?? []).map((v) => ({ id: v.meta.id, label: v.meta.label })),
+            extends: (p.extends_ ?? []).map((e) => ({ id: e.id, label: e.label })),
             hasSettings: Boolean(p.settings && p.settings.fields.length > 0),
             schema: a?.schema,
             web: a?.web,

package/dist/settings-write.d.ts

@@ -5,11 +5,10 @@ export interface SettingsFieldInfo {
     key: string;
     kind: string;
     label?: string;
-    required: boolean;
     options?: string[];
 }
 export declare function describeSettingsFields(fields: LayoutEl[]): SettingsFieldInfo[];
-export declare function buildSettingsBody(groupId: string, fields: LayoutEl[], incoming: Record<string, unknown>, existing: Record<string, unknown>, label?: string): Record<string, unknown>;
+export declare function buildSettingsBody(groupId: string, fields: LayoutEl[], incoming: Record<string, unknown>, existing: Record<string, unknown>, label: string): Record<string, unknown>;
 export declare function writePluginSettings(em: EntityManager, groupId: string, incoming: Record<string, unknown>, actor: string, pluginsOverride?: PluginManifest[]): Promise<Record<string, unknown>>;
 export declare function listSettings(pluginsOverride?: PluginManifest[]): Promise<{
     group: string;

package/dist/settings-write.js

@@ -9,11 +9,10 @@ export function describeSettingsFields(fields) {
         key,
         kind: f.kind,
         label: f.label,
-        required: f.required === true,
         ...(f.options ? { options: f.options.map((o) => o.value) } : {}),
     }));
 }
-function settingsShelf(groupId, fields, label = `${groupId}.plugin.label`) {
+function settingsShelf(groupId, fields, label) {
     return { library: '_settings', shelf: groupId, label, fields };
 }
 export function buildSettingsBody(groupId, fields, incoming, existing, label) {

package/dist/temporal.js

@@ -1,4 +1,4 @@
-import { fieldMap } from '@coffer-org/sdk/shelf';
+import { fieldEntries, storageColumns } from '@coffer-org/sdk/shelf';
 export function dtStringToDate(s) {
     return new Date(`${s}:00Z`);
 }
@@ -8,8 +8,13 @@ export function dateToDtString(d) {
         `T${p(d.getUTCHours())}:${p(d.getUTCMinutes())}`);
 }
 function datetimeKeysAt(fields) {
-    const fm = fieldMap(fields);
-    return Object.keys(fm).filter((k) => fm[k]?.column === 'datetime');
+    const out = [];
+    for (const [key, fm] of fieldEntries(fields)) {
+        for (const [col, type] of storageColumns(key, fm))
+            if (type === 'datetime')
+                out.push(col);
+    }
+    return out;
 }
 export function encodeTemporalAt(fields, row) {
     const out = { ...row };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coffer-org/server",
-  "version": "7.3.0",
+  "version": "7.4.0",
   "type": "module",
   "engines": {
     "node": ">=24"
@@ -40,7 +40,7 @@
     "postpack": "node ../../scripts/swap-exports.mjs src"
   },
   "dependencies": {
-    "@coffer-org/sdk": "^7.3.0",
+    "@coffer-org/sdk": "^7.4.0",
     "@extractus/oembed-extractor": "^4.1.0",
     "@fastify/cors": "^11.2.0",
     "@fastify/multipart": "^10.0.0",