@harperfast/harper 5.2.0-beta.4 → 5.2.1

package/dist/resources/models/v1/translation.js

@@ -0,0 +1,298 @@
+"use strict";
+/**
+ * OpenAI ↔ Harper internal shape mappers for the `/v1/*` gateway (#631).
+ *
+ * All functions are pure (no I/O, no side-effects) so they can be unit-tested
+ * in isolation without a running Harper instance.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.translateMessages = translateMessages;
+exports.translateTools = translateTools;
+exports.toGenerateInput = toGenerateInput;
+exports.validateChatRequest = validateChatRequest;
+exports.toGenerateOpts = toGenerateOpts;
+exports.toEmbedOpts = toEmbedOpts;
+exports.toChatCompletion = toChatCompletion;
+exports.toEmbedResponse = toEmbedResponse;
+const node_crypto_1 = require("node:crypto");
+// ---------------------------------------------------------------------------
+// OpenAI request → Harper internal
+// ---------------------------------------------------------------------------
+/**
+ * Map an OpenAI `messages` array to Harper `Message[]`.
+ * Normalises `tool_calls[].function.arguments` from JSON strings to parsed
+ * objects (Harper's internal contract); maps `tool_call_id` to `toolCallId`.
+ */
+function translateMessages(oaiMessages) {
+    return oaiMessages.map((m) => {
+        // Content parts are flattened to the text Harper's Message.content expects; shapes
+        // that cannot be flattened are rejected up front by validateChatRequest.
+        const content = Array.isArray(m.content)
+            ? m.content.map((part) => part.text).join('')
+            : (m.content ?? '');
+        const base = {
+            // `developer` is OpenAI's successor to `system` (the API itself treats the two
+            // identically, converting `system` to `developer` on models that use the newer
+            // hierarchy). Harper's internal Message union carries the channel as `system`,
+            // which every provider adapter maps to its system-instruction slot — so the
+            // instruction's priority is preserved rather than degraded to `user`. Roles
+            // outside the union are rejected up front by validateChatRequest, so the cast
+            // below is over a vetted set.
+            role: m.role === 'developer' ? 'system' : m.role,
+            content,
+        };
+        if (m.tool_calls?.length) {
+            base.toolCalls = m.tool_calls.map((tc) => {
+                let args;
+                try {
+                    args = JSON.parse(tc.function.arguments);
+                }
+                catch {
+                    // Preserve unparseable argument strings under a sentinel key rather
+                    // than dropping them — backend can decide what to do.
+                    args = { _raw: tc.function.arguments };
+                }
+                return { id: tc.id, name: tc.function.name, arguments: args };
+            });
+        }
+        if (m.tool_call_id)
+            base.toolCallId = m.tool_call_id;
+        return base;
+    });
+}
+/** Map OpenAI `tools[]` to Harper `ToolDef[]`. */
+function translateTools(oaiTools) {
+    return oaiTools.map((t) => ({
+        name: t.function.name,
+        description: t.function.description ?? '',
+        parameters: t.function.parameters ?? {},
+    }));
+}
+/**
+ * Build Harper `GenerateInput` from translated messages and tool definitions.
+ * Uses the object form `{ messages, tools }` when tools are present, so that
+ * tool definitions travel alongside messages per Harper's type contract.
+ */
+function toGenerateInput(messages, tools) {
+    if (tools?.length)
+        return { messages, tools };
+    return messages;
+}
+/** `tool_choice` values the internal contract can faithfully represent. */
+function isRepresentableToolChoice(choice) {
+    return choice === undefined || choice === null || choice === 'auto' || choice === 'none';
+}
+/**
+ * Validate the OpenAI wire shapes this gateway maps, returning a client-facing
+ * message for a 400 or `null` when the request is well-formed.
+ *
+ * Kept separate from the mappers so malformed nested input (`messages: [null]`,
+ * `tool_calls: [{}]`, `tools: [{}]`) becomes an OpenAI-shaped 400 instead of a
+ * TypeError escaping the handler as an RFC 9457 500.
+ */
+function validateChatRequest(body) {
+    const req = body;
+    // Top-level fields that control routing and framing first: a non-string `model`
+    // would silently invoke the configured default model (potentially expensive), and a
+    // truthy non-boolean `stream` ("false") would return SSE the client didn't ask for.
+    if (req.model !== undefined && typeof req.model !== 'string')
+        return "'model' must be a string";
+    if (req.stream !== undefined && typeof req.stream !== 'boolean')
+        return "'stream' must be a boolean";
+    if (req.temperature !== undefined) {
+        if (typeof req.temperature !== 'number' || !Number.isFinite(req.temperature)) {
+            return "'temperature' must be a finite number";
+        }
+        if (req.temperature < 0 || req.temperature > 2)
+            return "'temperature' must be between 0 and 2";
+    }
+    for (const field of ['max_tokens', 'max_completion_tokens']) {
+        const value = req[field];
+        if (value === undefined)
+            continue;
+        if (typeof value !== 'number' || !Number.isInteger(value) || value < 1) {
+            return `'${field}' must be a positive integer`;
+        }
+    }
+    if (!Array.isArray(req.messages) || req.messages.length === 0)
+        return "'messages' must be a non-empty array";
+    for (let i = 0; i < req.messages.length; i++) {
+        const m = req.messages[i];
+        if (!m || typeof m !== 'object' || Array.isArray(m))
+            return `'messages[${i}]' must be an object`;
+        if (typeof m.role !== 'string')
+            return `'messages[${i}].role' must be a string`;
+        // Closed set: translateMessages casts into Harper's Message union, so an
+        // unknown role must be a loud 400 here — previously it was cast through and
+        // provider adapters degraded it to 'user', silently changing its priority.
+        // 'developer' is accepted and carried as 'system' (see translateMessages);
+        // the deprecated 'function' role is deliberately not supported.
+        if (!['system', 'developer', 'user', 'assistant', 'tool'].includes(m.role)) {
+            return `'messages[${i}].role' must be one of 'system', 'developer', 'user', 'assistant', 'tool'`;
+        }
+        // OpenAI allows content parts: [{ type: 'text', text: '...' }, ...]. Harper's
+        // Message.content is a string, so those are flattened in translateMessages; reject
+        // shapes we cannot flatten rather than passing a non-string downstream.
+        if (m.content !== undefined && m.content !== null && typeof m.content !== 'string') {
+            if (!Array.isArray(m.content))
+                return `'messages[${i}].content' must be a string, array of parts, or null`;
+            for (let p = 0; p < m.content.length; p++) {
+                const part = m.content[p];
+                if (!part || typeof part !== 'object')
+                    return `'messages[${i}].content[${p}]' must be an object`;
+                if (part.type !== 'text' || typeof part.text !== 'string') {
+                    return `'messages[${i}].content[${p}]' must be a text part ({ type: 'text', text: string }); other part types are not supported yet`;
+                }
+            }
+        }
+        if (m.tool_calls !== undefined) {
+            if (!Array.isArray(m.tool_calls))
+                return `'messages[${i}].tool_calls' must be an array`;
+            for (let j = 0; j < m.tool_calls.length; j++) {
+                const tc = m.tool_calls[j];
+                const at = `'messages[${i}].tool_calls[${j}]`;
+                if (!tc || typeof tc !== 'object')
+                    return `${at}' must be an object`;
+                if (!tc.function || typeof tc.function !== 'object')
+                    return `${at}.function' is required`;
+                if (typeof tc.function.name !== 'string')
+                    return `${at}.function.name' must be a string`;
+                if (typeof tc.function.arguments !== 'string')
+                    return `${at}.function.arguments' must be a JSON string`;
+            }
+        }
+    }
+    if (req.tools !== undefined) {
+        if (!Array.isArray(req.tools))
+            return "'tools' must be an array";
+        for (let i = 0; i < req.tools.length; i++) {
+            const t = req.tools[i];
+            if (!t || typeof t !== 'object')
+                return `'tools[${i}]' must be an object`;
+            if (!t.function || typeof t.function !== 'object')
+                return `'tools[${i}].function' is required`;
+            if (typeof t.function.name !== 'string')
+                return `'tools[${i}].function.name' must be a string`;
+        }
+    }
+    if (!isRepresentableToolChoice(req.tool_choice)) {
+        // Better a clear 400 than silently downgrading 'required'/named selection to 'auto'.
+        return "'tool_choice' supports 'auto' and 'none'; 'required' and named function selection are not supported yet";
+    }
+    if (req.response_format !== undefined) {
+        const rf = req.response_format;
+        if (!rf || typeof rf !== 'object' || Array.isArray(rf))
+            return "'response_format' must be an object";
+        if (rf.type === 'json_schema') {
+            const wrapper = rf.json_schema;
+            if (!wrapper || typeof wrapper !== 'object') {
+                return "'response_format.json_schema' is required when type is 'json_schema'";
+            }
+            if (!wrapper.schema || typeof wrapper.schema !== 'object') {
+                return "'response_format.json_schema.schema' must be a JSON Schema object";
+            }
+        }
+    }
+    return null;
+}
+/**
+ * Map an OpenAI chat-completion request body to `GenerateOpts`.
+ *
+ * `tool_choice` is honored by the caller, not here: `'none'` omits tools from the
+ * generate input entirely, and unrepresentable choices are rejected up front by
+ * `validateChatRequest`. Full in-process tool-call orchestration is #612 (out of
+ * scope for #631), so tool calls are always returned to the caller to invoke.
+ *
+ * Assumes `validateChatRequest` has already passed.
+ */
+function toGenerateOpts(body) {
+    const opts = { toolMode: 'return' };
+    if (typeof body.model === 'string')
+        opts.model = body.model;
+    if (typeof body.temperature === 'number')
+        opts.temperature = body.temperature;
+    const maxTokens = body.max_completion_tokens ?? body.max_tokens;
+    if (typeof maxTokens === 'number')
+        opts.maxTokens = maxTokens;
+    if (body.response_format) {
+        const rf = body.response_format;
+        if (rf.type === 'json_object') {
+            opts.responseFormat = 'json';
+        }
+        else if (rf.type === 'json_schema') {
+            // The wire value is a wrapper ({ name, strict, schema }); Harper's contract wants
+            // the JSON Schema itself. Passing the wrapper makes the backend wrap it again and
+            // send metadata where the provider expects the schema.
+            opts.responseFormat = { schema: rf.json_schema.schema };
+        }
+        else {
+            opts.responseFormat = 'text';
+        }
+    }
+    return opts;
+}
+/** Map an OpenAI embeddings request body to `EmbedOpts`. */
+function toEmbedOpts(body) {
+    const opts = {};
+    if (typeof body.model === 'string')
+        opts.model = body.model;
+    return opts;
+}
+function toOAIToolCalls(toolCalls) {
+    return toolCalls.map((tc) => ({
+        id: tc.id,
+        type: 'function',
+        // Guard against backends that return arguments as a pre-serialised JSON string;
+        // passing a string through JSON.stringify would double-encode it.
+        function: {
+            name: tc.name,
+            arguments: typeof tc.arguments === 'string' ? tc.arguments : JSON.stringify(tc.arguments),
+        },
+    }));
+}
+/** Map a Harper `GenerateResult` to an OpenAI `chat.completion` response object. */
+function toChatCompletion(result, model, id) {
+    const completionId = id ?? `chatcmpl-${(0, node_crypto_1.randomUUID)().replaceAll('-', '')}`;
+    const hasTools = !!result.toolCalls?.length;
+    const message = {
+        role: 'assistant',
+        // OpenAI sets content to null when there are tool calls and no text content.
+        content: result.content || (hasTools ? null : ''),
+    };
+    if (hasTools)
+        message.tool_calls = toOAIToolCalls(result.toolCalls);
+    const usage = result.usage ?? {};
+    return {
+        id: completionId,
+        object: 'chat.completion',
+        created: Math.floor(Date.now() / 1000),
+        model,
+        choices: [{ index: 0, message, finish_reason: result.finishReason }],
+        usage: {
+            prompt_tokens: usage.promptTokens ?? 0,
+            completion_tokens: usage.completionTokens ?? 0,
+            total_tokens: (usage.promptTokens ?? 0) + (usage.completionTokens ?? 0),
+        },
+    };
+}
+/** Map `Float32Array[]` from `models.embed()` to an OpenAI embeddings response. */
+function toEmbedResponse(vecs, model, usage) {
+    return {
+        object: 'list',
+        data: vecs.map((vec, index) => ({
+            embedding: Array.from(vec),
+            index,
+            object: 'embedding',
+        })),
+        model,
+        // Embeddings have no completion side, so OpenAI reports the same count in both
+        // fields. Harper backends spell it `embeddingTokens` (with `promptTokens` as a
+        // fallback for backends that report it that way); mapping must be symmetric —
+        // a backend supplying only embeddingTokens must not leave prompt_tokens at 0.
+        usage: {
+            prompt_tokens: usage?.embeddingTokens ?? usage?.promptTokens ?? 0,
+            total_tokens: usage?.embeddingTokens ?? usage?.promptTokens ?? 0,
+        },
+    };
+}
+//# sourceMappingURL=translation.js.map

package/dist/resources/models/v1/translation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"translation.js","sourceRoot":"","sources":["../../../../resources/models/v1/translation.ts"],"names":[],"mappings":"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"}

package/dist/resources/roles.d.ts

@@ -2,4 +2,4 @@
  * This is the component for handling role declarations in the Harper system. This will read roles.yaml for role
  * definitions and ensure that they are created in the system database.
  */
-export declare function handleApplication(scope: import('../components/Scope.ts').Scope): void;
+export declare function handleApplication(scope: import('../components/Scope.ts').Scope, ensureRoleFn?: (role: any) => Promise<unknown>): void;

package/dist/resources/roles.js

@@ -14,21 +14,67 @@ const USERS_NOT_DBS = hdbTerms_ts_1.RESERVED_DATABASE_NAMES;
  * This is the component for handling role declarations in the Harper system. This will read roles.yaml for role
  * definitions and ensure that they are created in the system database.
  */
-function handleApplication(scope) {
-    scope.handleEntry(async (entry) => {
-        if (entry.eventType === 'unlink')
+function handleApplication(scope, ensureRoleFn = ensureRole) {
+    const rolesByFile = new Map();
+    const contentsByFile = new Map();
+    let pending = Promise.resolve();
+    const enqueue = (operation) => {
+        const queued = pending.then(operation);
+        pending = queued.catch(() => { });
+        return queued;
+    };
+    const entryHandler = scope.handleEntry((entry) => enqueue(async () => {
+        if (entry.entryType !== 'file')
             return;
-        return handleFile(entry.contents);
+        const previousRoles = rolesByFile.get(entry.absolutePath) ?? new Set();
+        if (entry.eventType === 'unlink') {
+            rolesByFile.delete(entry.absolutePath);
+            contentsByFile.delete(entry.absolutePath);
+            warnForStaleRoles(scope, previousRoles, rolesByFile);
+            return;
+        }
+        contentsByFile.set(entry.absolutePath, entry.contents);
+        const currentRoles = await handleFile(entry.contents, ensureRoleFn);
+        rolesByFile.set(entry.absolutePath, currentRoles);
+        warnForStaleRoles(scope, new Set([...previousRoles].filter((roleName) => !currentRoles.has(roleName))), rolesByFile);
+    }));
+    if (!entryHandler)
+        return;
+    scope.on('deploy:end', () => {
+        void entryHandler.ready
+            .then(() => enqueue(async () => {
+            for (const contents of contentsByFile.values()) {
+                try {
+                    await handleFile(contents, ensureRoleFn);
+                }
+                catch (error) {
+                    scope.logger.error?.('Could not reconcile a roles file after deploy:', error);
+                }
+            }
+        }))
+            .catch((error) => scope.logger.error?.('Could not reconcile roles after deploy:', error));
     });
 }
+function warnForStaleRoles(scope, removedRoles, rolesByFile) {
+    const stillDeclared = new Set();
+    for (const roleNames of rolesByFile.values())
+        for (const roleName of roleNames)
+            stillDeclared.add(roleName);
+    const staleRoles = [...removedRoles].filter((roleName) => !stillDeclared.has(roleName));
+    if (staleRoles.length === 0)
+        return;
+    scope.logger.warn(`Role definitions removed for ${staleRoles.join(', ')}; existing roles and grants remain active until explicitly altered or deleted`);
+}
 /**
  * This function will handle the roles.yaml file content that has been read, and ensure that the roles are translated to
  * the right shape and created in the system database.
  * @param rolesContent
  */
-async function handleFile(rolesContent) {
+async function handleFile(rolesContent, ensureRoleFn) {
     let rolesToDefine = (0, yaml_1.parseDocument)(rolesContent.toString(), { simpleKeys: true }).toJSON();
+    const roleNames = new Set();
     for (let roleName in rolesToDefine) {
+        roleNames.add(roleName);
         let role = rolesToDefine[roleName];
         if (!role.permission) {
             // we allow the permission object to be collapsed into the root object for convenience
@@ -82,8 +128,9 @@ async function handleFile(rolesContent) {
             }
         }
         role.role = role.id = roleName;
-        await ensureRole(role);
+        await ensureRoleFn(role);
     }
+    return roleNames;
 }
 async function ensureRole(role) {
     const roleTable = (0, databases_ts_1.getDatabases)().system.hdb_role;
@@ -91,10 +138,10 @@ async function ensureRole(role) {
     for await (let existingRole of roleTable.search([{ attribute: 'role', value: role.role }])) {
         // use the existing role id so we can update in place. Legacy roles may have a UUID for the id instead of the role name
         const { __createdtime__, __updatedtime__, ...existingRoleData } = existingRole;
+        role.id = existingRole.id;
         if ((0, lodash_1.isEqual)(existingRoleData, role)) {
             return;
         }
-        role.id = existingRole.id;
         return (0, role_ts_1.alterRole)(role);
     }
     return (0, role_ts_1.addRole)(role);

package/dist/resources/roles.js.map

@@ -1 +1 @@
-{"version":3,"file":"roles.js","sourceRoot":"","sources":["../../resources/roles.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"roles.js","sourceRoot":"","sources":["../../resources/roles.ts"],"names":[],"mappings":"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"}

package/dist/resources/transaction.js

@@ -40,9 +40,6 @@ function transaction(ctx, callback) {
     if (context.sourceApply)
         transaction.sourceApply = true;
     transaction.setContext(context);
-    // create a resource cache so that multiple requests to the same resource return the same resource
-    if (!context.resourceCache)
-        context.resourceCache = new Map();
     let result;
     try {
         result =

package/dist/resources/transaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../resources/transaction.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../resources/transaction.ts"],"names":[],"mappings":"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"}