@coffer-org/plugin-orchestrator 1.3.0 → 1.4.0

package/dist/index.js

@@ -4,7 +4,7 @@ import { field } from '@coffer-org/sdk/fields';
 export default definePlugin({
     id: 'orchestrator',
     version: '1.0.0',
-    dependsOn: ['agent'],
+    dependsOn: ['claude-agent'],
     settings: defineSettings({
         label: 'orchestrator.settings.label',
         fields: [

package/dist/runtime/db.d.ts

@@ -4,7 +4,6 @@ export type LogTurn = {
     userId: string;
     role: 'user' | 'assistant';
     text: string;
-    sessionId: string | null;
     tokensIn: number | null;
     tokensOut: number | null;
     ms: number | null;

package/dist/runtime/db.js

@@ -1,7 +1,9 @@
 import { logMessage } from '@coffer-org/server/msg-log';
+import { getLogger } from '@coffer-org/sdk/logger';
+const log = getLogger('orchestrator');
 export function openLogDb() {
     return {
-        logTurn(row) { logMessage(row).catch((e) => console.error('[orchestrator] logTurn:', e)); },
+        logTurn(row) { logMessage(row).catch((e) => log.error('logTurn failed', e)); },
         close() { },
     };
 }

package/dist/runtime/index.d.ts

@@ -2,5 +2,5 @@ import type { PluginHooks } from '@coffer-org/server/plugin-hooks';
 export { handleIncoming } from './pipeline.ts';
 export type { PipelineDeps, RunAgentFn } from './pipeline.ts';
 export { buildPolicy, loadGatePolicy } from './config.ts';
-export type { Connector, ConnectorCapabilities, IncomingPayload, GatePolicy } from './types.ts';
+export type { Connector, ConnectorCapabilities, IncomingConversation, GatePolicy, ConvMessage, SystemLayer, AgentRequest, AgentResult, } from './types.ts';
 export declare const serverHooks: PluginHooks;

package/dist/runtime/pipeline.d.ts

@@ -1,5 +1,5 @@
-import { runAgent } from '@coffer-org/plugin-agent/runtime';
-import type { Connector, IncomingPayload, GatePolicy } from './types.ts';
+import { runAgent } from '@coffer-org/plugin-claude-agent/runtime';
+import type { Connector, IncomingConversation, GatePolicy } from './types.ts';
 import type { LogDb } from './db.ts';
 export declare function setLogDb(db: LogDb | undefined): void;
 export type RunAgentFn = typeof runAgent;
@@ -8,5 +8,6 @@ export interface PipelineDeps {
     logDb?: LogDb | null;
     throttleMs?: number;
     policy?: GatePolicy;
+    agentBase?: () => Promise<string>;
 }
-export declare function handleIncoming(connector: Connector, payload: IncomingPayload, deps?: PipelineDeps): Promise<void>;
+export declare function handleIncoming(connector: Connector, conversation: IncomingConversation, deps?: PipelineDeps): Promise<void>;

package/dist/runtime/pipeline.js

@@ -1,9 +1,11 @@
-import { runAgent } from '@coffer-org/plugin-agent/runtime';
+import { runAgent, agentSystemBase } from '@coffer-org/plugin-claude-agent/runtime';
 import { chunk } from "./format.js";
 import { join } from 'node:path';
-import { loadThreads, saveThreads, resolveParent, getSession, recordSession, pruneThreads, } from "./threads.js";
 import { loadAllowed, saveAllowed, isAllowed, addAllowed, makeThrottle } from "./allow.js";
 import { loadGatePolicy } from "./config.js";
+import { buildSystem } from "./system-assembly.js";
+import { getLogger } from '@coffer-org/sdk/logger';
+const log = getLogger('orchestrator');
 const DEFAULT_STREAM_THROTTLE_MS = 2000;
 const stateDir = () => process.env['ORCHESTRATOR_STATE_DIR']
     ?? join(new URL('../../runtime/state', import.meta.url).pathname);
@@ -18,48 +20,55 @@ function passThrottle(connectorId) {
     }
     return t;
 }
+let cachedBase;
+function cachedAgentBase() { return (cachedBase ??= agentSystemBase()); }
 async function safeCall(fn, fallback, label) {
     try {
         return await fn();
     }
     catch (err) {
-        console.error(`[orchestrator] connector error in ${label}:`, err instanceof Error ? err.message : String(err));
+        log.error(`connector error in ${label}: ${err instanceof Error ? err.message : String(err)}`);
         return fallback;
     }
 }
-export async function handleIncoming(connector, payload, deps) {
+export async function handleIncoming(connector, conversation, deps) {
     const agent = deps?.runAgent ?? runAgent;
     const db = deps && 'logDb' in deps ? deps.logDb : logDb;
     const throttleMs = deps?.throttleMs ?? DEFAULT_STREAM_THROTTLE_MS;
     const policy = deps?.policy ?? await loadGatePolicy();
-    const { chatId, userId, text, replyToId } = payload;
+    const agentBase = deps?.agentBase ?? cachedAgentBase;
+    const { connectorId, chatId, sender, messages } = conversation;
+    const last = messages[messages.length - 1];
+    if (!last || last.role !== 'user')
+        return;
+    const incomingMsgId = last.msgId;
     const dir = stateDir();
-    const allowFile = join(dir, `${connector.id}.allowed.json`);
-    const threadsFile = join(dir, `${connector.id}.threads.json`);
+    const allowFile = join(dir, `${connectorId}.allowed.json`);
     if (policy.accessPassword) {
         let allow = loadAllowed(allowFile);
-        if (!isAllowed(allow, userId)) {
-            if (text.trim() === policy.accessPassword) {
-                allow = addAllowed(allow, userId, Date.now());
+        if (!isAllowed(allow, sender.id)) {
+            if (last.content.trim() === policy.accessPassword) {
+                allow = addAllowed(allow, sender.id, Date.now());
                 saveAllowed(allowFile, allow);
                 await safeCall(() => connector.sendMessage(chatId, '✅ Access granted. Send your requests.'), null, 'sendMessage(enroll)');
             }
-            else if (passThrottle(connector.id)(userId)) {
+            else if (passThrottle(connectorId)(sender.id)) {
                 await safeCall(() => connector.sendMessage(chatId, '🔒 Access locked. Send the password to gain access.'), null, 'sendMessage(locked)');
             }
             return;
         }
     }
-    if (policy.triggerPrefix && !text.toLowerCase().startsWith(policy.triggerPrefix.toLowerCase()))
+    if (policy.triggerPrefix && !last.content.toLowerCase().startsWith(policy.triggerPrefix.toLowerCase()))
         return;
-    const queryText = policy.triggerPrefix ? text.slice(policy.triggerPrefix.length).trim() : text.trim();
+    const queryText = policy.triggerPrefix ? last.content.slice(policy.triggerPrefix.length).trim() : last.content.trim();
     if (!queryText)
         return;
-    const now = Date.now();
-    let threads = loadThreads(threadsFile);
-    const parent = resolveParent(threads, { replyToMsgId: replyToId, now }, policy.replyWindow);
-    const parentSession = getSession(threads, parent);
-    db?.logTurn({ connector: connector.id, chatId, userId, role: 'user', text: queryText, sessionId: parentSession, tokensIn: null, tokensOut: null, ms: null });
+    const agentMessages = policy.triggerPrefix
+        ? messages.map((m, i) => (i === messages.length - 1 ? { ...m, content: queryText } : m))
+        : messages;
+    const base = await agentBase();
+    const system = buildSystem({ base, channelSystem: conversation.channelSystem });
+    db?.logTurn({ connector: connectorId, chatId, userId: sender.id, role: 'user', text: queryText, tokensIn: null, tokensOut: null, ms: null });
     const startedAt = Date.now();
     const canStream = connector.capabilities.streaming && typeof connector.editMessage === 'function';
     const max = connector.capabilities.maxMessageLength;
@@ -89,9 +98,20 @@ export async function handleIncoming(connector, payload, deps) {
                 .finally(() => { editing = false; });
         }, throttleMs);
         try {
-            result = await agent({ prompt: queryText, sessionId: parentSession, onDelta: (acc) => { pending = acc; } });
-            if (result.text == null && parentSession)
-                result = await agent({ prompt: queryText, sessionId: null, onDelta: (acc) => { pending = acc; } });
+            result = await agent({
+                system,
+                messages: agentMessages,
+                onDelta: (acc) => { pending = acc; },
+                onSegment: () => {
+                    const t = pending.slice(0, max);
+                    if (placeholderId && t && t !== lastEdited) {
+                        void safeCall(() => connector.editMessage(chatId, placeholderId, t), undefined, 'editMessage(segment)');
+                    }
+                    placeholderId = null;
+                    pending = '';
+                    lastEdited = '';
+                },
+            });
         }
         finally {
             closed = true;
@@ -105,9 +125,7 @@ export async function handleIncoming(connector, payload, deps) {
             ? await safeCall(async () => connector.startTyping(chatId), undefined, 'startTyping')
             : undefined;
         try {
-            result = await agent({ prompt: queryText, sessionId: parentSession });
-            if (result.text == null && parentSession)
-                result = await agent({ prompt: queryText, sessionId: null });
+            result = await agent({ system, messages: agentMessages });
         }
         finally {
             stopTyping?.();
@@ -131,11 +149,6 @@ export async function handleIncoming(connector, payload, deps) {
         }
     }
     if (result.text)
-        db?.logTurn({ connector: connector.id, chatId, userId, role: 'assistant', text: result.text, sessionId: result.sessionId, tokensIn: result.tokensIn, tokensOut: result.tokensOut, ms: Date.now() - startedAt });
-    if (result.sessionId) {
-        const incomingMsgId = replyToId ?? String(now);
-        threads = recordSession(threads, { msgId: incomingMsgId, botMsgId, sessionId: result.sessionId, now });
-        threads = pruneThreads(threads, now, 7);
-        saveThreads(threadsFile, threads);
-    }
+        db?.logTurn({ connector: connectorId, chatId, userId: sender.id, role: 'assistant', text: result.text, tokensIn: result.tokensIn, tokensOut: result.tokensOut, ms: Date.now() - startedAt });
+    await safeCall(() => connector.recordAssistant({ parentMsgId: incomingMsgId, botMsgId, text: result.text ?? '' }), undefined, 'recordAssistant');
 }

package/dist/runtime/system-assembly.d.ts

@@ -0,0 +1,5 @@
+import type { SystemLayer } from './types.ts';
+export declare function buildSystem(input: {
+    base: string;
+    channelSystem?: string;
+}): SystemLayer[];

package/dist/runtime/system-assembly.js

@@ -0,0 +1,4 @@
+export function buildSystem(input) {
+    const text = [input.base, input.channelSystem].filter(Boolean).join('\n\n');
+    return [{ text, stable: true }];
+}

package/dist/runtime/types.d.ts

@@ -1,8 +1,20 @@
+export type { ConvMessage, SystemLayer, AgentRequest, AgentResult } from '@coffer-org/plugin-claude-agent/runtime';
+import type { ConvMessage } from '@coffer-org/plugin-claude-agent/runtime';
 export interface ConnectorCapabilities {
     streaming: boolean;
     typing: boolean;
     maxMessageLength: number;
 }
+export interface IncomingConversation {
+    connectorId: string;
+    chatId: string;
+    channelSystem?: string;
+    sender: {
+        id: string;
+        displayName?: string;
+    };
+    messages: ConvMessage[];
+}
 export interface Connector {
     id: string;
     capabilities: ConnectorCapabilities;
@@ -11,12 +23,11 @@ export interface Connector {
     } | null>;
     editMessage?(chatId: string, msgId: string, text: string): Promise<void>;
     startTyping?(chatId: string): () => void;
-}
-export interface IncomingPayload {
-    chatId: string;
-    userId: string;
-    text: string;
-    replyToId: string | null;
+    recordAssistant(m: {
+        parentMsgId: string | null;
+        botMsgId: string | null;
+        text: string;
+    }): Promise<void>;
 }
 export interface GatePolicy {
     accessPassword: string;

package/dist/schema.js

@@ -154,7 +154,10 @@ function assignProp(target, prop, value) {
 }
 function mergeDefs(...defs) {
 	const mergedDescriptors = {};
-	for (const def of defs) Object.assign(mergedDescriptors, Object.getOwnPropertyDescriptors(def));
+	for (const def of defs) {
+		const descriptors = Object.getOwnPropertyDescriptors(def);
+		Object.assign(mergedDescriptors, descriptors);
+	}
 	return Object.defineProperties({}, mergedDescriptors);
 }
 function esc(str) {
@@ -476,7 +479,7 @@ var _parse = (_Err) => (schema, value, _ctx, _params) => {
 	}, ctx);
 	if (result instanceof Promise) throw new $ZodAsyncError();
 	if (result.issues.length) {
-		const e = new (_params?.Err ?? _Err)(result.issues.map((iss) => finalizeIssue(iss, ctx, config())));
+		const e = new ((_params?.Err) ?? _Err)(result.issues.map((iss) => finalizeIssue(iss, ctx, config())));
 		captureStackTrace(e, _params?.callee);
 		throw e;
 	}
@@ -493,7 +496,7 @@ var _parseAsync = (_Err) => async (schema, value, _ctx, params) => {
 	}, ctx);
 	if (result instanceof Promise) result = await result;
 	if (result.issues.length) {
-		const e = new (params?.Err ?? _Err)(result.issues.map((iss) => finalizeIssue(iss, ctx, config())));
+		const e = new ((params?.Err) ?? _Err)(result.issues.map((iss) => finalizeIssue(iss, ctx, config())));
 		captureStackTrace(e, params?.callee);
 		throw e;
 	}
@@ -1589,13 +1592,13 @@ var $ZodObject = /*@__PURE__*/ $constructor("$ZodObject", (inst, def) => {
 		}
 		return propValues;
 	});
-	const isObject$1 = isObject;
+	const isObject$2 = isObject;
 	const catchall = def.catchall;
 	let value;
 	inst._zod.parse = (payload, ctx) => {
 		value ?? (value = _normalized.value);
 		const input = payload.value;
-		if (!isObject$1(input)) {
+		if (!isObject$2(input)) {
 			payload.issues.push({
 				expected: "object",
 				code: "invalid_type",
@@ -1718,7 +1721,7 @@ var $ZodObjectJIT = /*@__PURE__*/ $constructor("$ZodObjectJIT", (inst, def) => {
 		return (payload, ctx) => fn(shape, payload, ctx);
 	};
 	let fastpass;
-	const isObject$2 = isObject;
+	const isObject$1 = isObject;
 	const jit = !globalConfig.jitless;
 	const fastEnabled = jit && allowsEval.value;
 	const catchall = def.catchall;
@@ -1726,7 +1729,7 @@ var $ZodObjectJIT = /*@__PURE__*/ $constructor("$ZodObjectJIT", (inst, def) => {
 	inst._zod.parse = (payload, ctx) => {
 		value ?? (value = _normalized.value);
 		const input = payload.value;
-		if (!isObject$2(input)) {
+		if (!isObject$1(input)) {
 			payload.issues.push({
 				expected: "object",
 				code: "invalid_type",
@@ -1945,7 +1948,7 @@ var $ZodOptional = /*@__PURE__*/ $constructor("$ZodOptional", (inst, def) => {
 	inst._zod.optin = "optional";
 	inst._zod.optout = "optional";
 	defineLazy(inst._zod, "values", () => {
-		return def.innerType._zod.values ? new Set([...def.innerType._zod.values, void 0]) : void 0;
+		return def.innerType._zod.values ? /* @__PURE__ */ new Set([...def.innerType._zod.values, void 0]) : void 0;
 	});
 	defineLazy(inst._zod, "pattern", () => {
 		const pattern = def.innerType._zod.pattern;
@@ -1979,7 +1982,7 @@ var $ZodNullable = /*@__PURE__*/ $constructor("$ZodNullable", (inst, def) => {
 		return pattern ? new RegExp(`^(${cleanRegex(pattern.source)}|null)$`) : void 0;
 	});
 	defineLazy(inst._zod, "values", () => {
-		return def.innerType._zod.values ? new Set([...def.innerType._zod.values, null]) : void 0;
+		return def.innerType._zod.values ? /* @__PURE__ */ new Set([...def.innerType._zod.values, null]) : void 0;
 	});
 	inst._zod.parse = (payload, ctx) => {
 		if (payload.value === null) return payload;
@@ -4587,7 +4590,7 @@ function password(raw) {
 * Internal API-token list — keyValue-shaped collection (name + write-only
 * token + timestamps), custom renderer (`kind:'internalApiToken'`, own
 * create/revoke UI — same trick as url()/perWeekday()). "Internal" = not a
-* general-purpose field type for plugin modules, only for the core account
+* general-purpose field type for plugin shelves, only for the core account
 * settings page. `token` is `kind:'password'` so maskSecrets/preserveTree
 * already mask/preserve it for free.
 */
@@ -4686,7 +4689,7 @@ var TEL_RE = /^\+?[\d\s()-]{4,}$/;
 /** Loose URL: будь-який scheme:// АБО host-з-крапкою (+опц. порт/шлях). Без пробілів. */
 var LINK_RE = /^([a-z][a-z0-9+.-]*:\/\/\S+|[\w-]+(\.[\w-]+)+(:\d+)?(\/\S*)?)$/i;
 /** CSS named colors (CSS Color Module L4) — для f.colorname. */
-var CSS_COLOR_NAMES = new Set([
+var CSS_COLOR_NAMES = /* @__PURE__ */ new Set([
 	"aliceblue",
 	"antiquewhite",
 	"aqua",
@@ -5147,7 +5150,7 @@ var require_data = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		},
 		cs: {
 			name: "Czech",
-			nativeName: "Čeština"
+			nativeName: "čeština"
 		},
 		cu: {
 			name: "Old Church Slavonic",
@@ -5611,7 +5614,7 @@ var require_data = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		},
 		sk: {
 			name: "Slovak",
-			nativeName: "Slovenčina"
+			nativeName: "slovenčtina"
 		},
 		sl: {
 			name: "Slovenian",
@@ -5989,6 +5992,34 @@ function wrapKey(opts, meta) {
 			noEditControl: true
 		}
 	};
+	if (opts.emphasis) m = {
+		...m,
+		hints: {
+			...m.hints,
+			emphasis: opts.emphasis
+		}
+	};
+	if (opts.noLabel) m = {
+		...m,
+		hints: {
+			...m.hints,
+			noLabel: true
+		}
+	};
+	if (opts.role) m = {
+		...m,
+		hints: {
+			...m.hints,
+			role: opts.role
+		}
+	};
+	if (opts.pinned) m = {
+		...m,
+		hints: {
+			...m.hints,
+			pinned: true
+		}
+	};
 	if (opts.default !== void 0) m = {
 		...m,
 		default: opts.default
@@ -6352,8 +6383,8 @@ function relation(raw) {
 			displayKey: o.displayKey ?? "name"
 		},
 		relation: {
-			vault: raw.options.vault,
-			type: raw.options.module
+			library: raw.options.library,
+			type: raw.options.shelf
 		},
 		...multi && { json: true },
 		zod: optionalize(s, required)
@@ -7003,7 +7034,7 @@ function toClient(field) {
 var src_default = definePlugin({
 	id: "orchestrator",
 	version: "1.0.0",
-	dependsOn: ["agent"],
+	dependsOn: ["claude-agent"],
 	settings: defineSettings({
 		label: "orchestrator.settings.label",
 		fields: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coffer-org/plugin-orchestrator",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "type": "module",
   "engines": {
     "node": ">=24"
@@ -25,9 +25,9 @@
     "postpack": "node ../../scripts/swap-exports.mjs src"
   },
   "dependencies": {
-    "@coffer-org/sdk": "^1.3.0",
-    "@coffer-org/server": "^1.3.0",
-    "@coffer-org/plugin-agent": "^1.3.0"
+    "@coffer-org/sdk": "^1.5.0",
+    "@coffer-org/server": "^1.8.0",
+    "@coffer-org/plugin-claude-agent": "^1.4.0"
   },
   "coffer": {
     "schema": "dist/schema.js"