@geminixiang/mikan 1.0.0-beta.78 → 1.0.0-beta.79

package/dist/adapters/web/admin/portal.js

@@ -2,7 +2,8 @@ import { validateEventFilename } from "../../../events/index.js";
 import { existsSync, lstatSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync, } from "node:fs";
 import { basename, join, resolve as pathResolve, sep as pathSep } from "node:path";
 import { atomicWritePrivateFile } from "../../../file-guards.js";
-import { MikanModels, parseFrontmatter, validateSkill } from "../../../harness/index.js";
+import { MikanModels } from "../../../harness/models.js";
+import { parseFrontmatter, validateSkill } from "../../../harness/skills.js";
 import { SessionStore } from "../../../sessions/session-store.js";
 import { InMemoryTokenStore } from "../token-store.js";
 import { adminViewFunctionsScript, adminViewStartupScript, adminViewStyles, } from "./client-assets.js";
@@ -13,12 +14,12 @@ export class InMemoryAdminTokenStore extends InMemoryTokenStore {
         return this.createRecord(ADMIN_TOKEN_TTL_MS, {
             platform: args.platform,
             platformUserId: args.platformUserId,
-            ...(args.platformUserName ? { platformUserName: args.platformUserName } : {}),
+            platformUserName: args.platformUserName || undefined,
             conversationId: args.conversationId,
         });
     }
 }
-import { loadOfficeVisibilityOverride, loadGlobalSettings, loadScopeMcpServers, resolveConversationSettings, } from "../../../settings/index.js";
+import { isThinkingLevel, loadOfficeVisibilityOverride, loadGlobalSettings, loadScopeMcpServers, resolveConversationSettings, } from "../../../settings/index.js";
 import { findMcpPreset, listMcpPresets, materializeMcpPreset } from "../../../harness/mcp.js";
 import { loadMcpTools } from "../../../harness/mcp.js";
 import { isValidMcpServerName, parseStandardMcpServers, redactMcpUrl, } from "../../../harness/mcp.js";
@@ -31,6 +32,7 @@ import { resolveWorkspaceProjection } from "../../../office/projection.js";
 import { sharedVaultKey } from "../../../vault/index.js";
 import { modelKey, resolveAdminModelAccessStatuses } from "./provider-models.js";
 import { assertPlatformName, createOfficeAddress, listRegisteredOffices, sameOffice, } from "../../../office/index.js";
+import { errorMessage } from "../../../unknown-values.js";
 export async function handleAdminRequest(req, res, url, services) {
     if (!url.pathname.startsWith("/admin"))
         return false;
@@ -460,7 +462,7 @@ function serveGlobalSettings(res) {
         });
     }
     catch (err) {
-        jsonRes(res, 500, { error: err instanceof Error ? err.message : String(err) });
+        jsonRes(res, 500, { error: errorMessage(err) });
     }
 }
 async function serveModelsList(res) {
@@ -481,16 +483,13 @@ async function serveModelsList(res) {
         jsonRes(res, 200, { models });
     }
     catch (err) {
-        jsonRes(res, 500, { error: err instanceof Error ? err.message : String(err) });
+        jsonRes(res, 500, { error: errorMessage(err) });
     }
 }
-const VALID_THINKING_LEVELS = new Set(["off", "minimal", "low", "medium", "high", "xhigh", "max"]);
 function serveConversationModelUpdate(res, body, services, token) {
     const provider = typeof body.provider === "string" ? body.provider.trim() : "";
     const model = typeof body.model === "string" ? body.model.trim() : "";
-    const thinkingLevel = typeof body.thinkingLevel === "string" && VALID_THINKING_LEVELS.has(body.thinkingLevel)
-        ? body.thinkingLevel
-        : undefined;
+    const thinkingLevel = isThinkingLevel(body.thinkingLevel) ? body.thinkingLevel : undefined;
     if (!provider || !model) {
         jsonRes(res, 400, { error: "Missing provider or model" });
         return;
@@ -503,7 +502,7 @@ function serveConversationModelUpdate(res, body, services, token) {
         const result = applyConversationSettings(services.runtime, workspace.office(scope.address), {
             provider,
             model,
-            ...(thinkingLevel ? { thinkingLevel } : {}),
+            thinkingLevel,
         });
         if (!result.ok) {
             jsonRes(res, 409, {
@@ -514,7 +513,7 @@ function serveConversationModelUpdate(res, body, services, token) {
         jsonRes(res, 200, { ok: true, runtimeSwitched: result.runtimeSwitched });
     }
     catch (err) {
-        jsonRes(res, 500, { error: err instanceof Error ? err.message : String(err) });
+        jsonRes(res, 500, { error: errorMessage(err) });
     }
 }
 function serveConversationVisibilityUpdate(res, body, services, token) {
@@ -535,7 +534,7 @@ function serveConversationVisibilityUpdate(res, body, services, token) {
         jsonRes(res, 200, { ok: true });
     }
     catch (err) {
-        jsonRes(res, 500, { error: err instanceof Error ? err.message : String(err) });
+        jsonRes(res, 500, { error: errorMessage(err) });
     }
 }
 function serveConversationSlackUpdate(res, body, services, token) {
@@ -588,7 +587,7 @@ function serveConversationSessionLink(res, body, services, token) {
         jsonRes(res, 200, { ok: true, url });
     }
     catch (err) {
-        jsonRes(res, 500, { error: err instanceof Error ? err.message : String(err) });
+        jsonRes(res, 500, { error: errorMessage(err) });
     }
 }
 function serveConversationLoginLink(res, body, services, token) {
@@ -623,7 +622,7 @@ function serveConversationLoginLink(res, body, services, token) {
             });
         }
         catch (err) {
-            jsonRes(res, 500, { error: err instanceof Error ? err.message : String(err) });
+            jsonRes(res, 500, { error: errorMessage(err) });
             return;
         }
     }
@@ -633,15 +632,13 @@ function serveConversationLoginLink(res, body, services, token) {
         jsonRes(res, 200, { ok: true, url, vaultId });
     }
     catch (err) {
-        jsonRes(res, 500, { error: err instanceof Error ? err.message : String(err) });
+        jsonRes(res, 500, { error: errorMessage(err) });
     }
 }
 function serveGlobalModelUpdate(res, body, services) {
     const provider = typeof body.provider === "string" ? body.provider.trim() : "";
     const model = typeof body.model === "string" ? body.model.trim() : "";
-    const thinkingLevel = typeof body.thinkingLevel === "string" && VALID_THINKING_LEVELS.has(body.thinkingLevel)
-        ? body.thinkingLevel
-        : undefined;
+    const thinkingLevel = isThinkingLevel(body.thinkingLevel) ? body.thinkingLevel : undefined;
     if (!provider || !model) {
         jsonRes(res, 400, { error: "Missing provider or model" });
         return;
@@ -650,7 +647,7 @@ function serveGlobalModelUpdate(res, body, services) {
         const result = applyGlobalSettings(services.runtime, {
             provider,
             model,
-            ...(thinkingLevel ? { thinkingLevel } : {}),
+            thinkingLevel,
         });
         return {
             ok: true,
@@ -700,7 +697,7 @@ function respondWithSettingsUpdate(res, update) {
         jsonRes(res, 200, update());
     }
     catch (err) {
-        jsonRes(res, 500, { error: err instanceof Error ? err.message : String(err) });
+        jsonRes(res, 500, { error: errorMessage(err) });
     }
 }
 const WORKSPACE_TREE_MAX_DEPTH = 4;
@@ -792,7 +789,7 @@ function buildTree(startDir, relPrefix) {
             path: rel,
             type: "dir",
             children,
-            ...(truncated ? { truncated: true } : {}),
+            truncated: truncated ? true : undefined,
         };
     };
     const node = walk(startDir, relPrefix, 0);
@@ -871,7 +868,7 @@ function servePreviewFile(res, absolutePath, metadata, notFoundMessage) {
         buf = readFileSync(absolutePath);
     }
     catch (err) {
-        jsonRes(res, 500, { error: err instanceof Error ? err.message : String(err) });
+        jsonRes(res, 500, { error: errorMessage(err) });
         return;
     }
     if (!looksTextual(buf)) {
@@ -986,10 +983,10 @@ function redactMcpServers(map) {
     return Object.fromEntries(Object.entries(map).map(([name, config]) => [
         name,
         {
-            ...(config.command !== undefined ? { command: config.command } : {}),
-            ...(config.args !== undefined ? { args: config.args } : {}),
-            ...(config.url !== undefined ? { url: redactMcpUrl(config.url) } : {}),
-            ...(config.disabled !== undefined ? { disabled: config.disabled } : {}),
+            command: config.command,
+            args: config.args,
+            url: config.url !== undefined ? redactMcpUrl(config.url) : undefined,
+            disabled: config.disabled,
             envKeys: Object.keys(config.env ?? {}),
             headerKeys: Object.keys(config.headers ?? {}),
         },
@@ -1053,7 +1050,7 @@ function planMcpMutation(action, body, current) {
             next[name] = materializeMcpPreset(preset, mcpStringMap(body.credentials) ?? {});
         }
         catch (err) {
-            return { status: 400, error: err instanceof Error ? err.message : String(err) };
+            return { status: 400, error: errorMessage(err) };
         }
         return { next, touched: { [name]: next[name] } };
     }
@@ -1213,7 +1210,7 @@ async function serveSkillMutation(res, body, services, token) {
             rmSync(safe.absolute, { recursive: true, force: true });
         }
         catch (err) {
-            jsonRes(res, 500, { error: err instanceof Error ? err.message : String(err) });
+            jsonRes(res, 500, { error: errorMessage(err) });
             return;
         }
         jsonRes(res, 200, { ok: true });
@@ -1240,7 +1237,7 @@ async function serveSkillMutation(res, body, services, token) {
         atomicWritePrivateFile(join(safe.absolute, "SKILL.md"), frontmatter + content.trim() + "\n");
     }
     catch (err) {
-        jsonRes(res, 500, { error: err instanceof Error ? err.message : String(err) });
+        jsonRes(res, 500, { error: errorMessage(err) });
         return;
     }
     jsonRes(res, 200, { ok: true, name, directory, source: resolved.source });
@@ -1328,7 +1325,7 @@ async function serveConversationEventDelete(res, body, services, token) {
         jsonRes(res, 200, { ok: true });
     }
     catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
+        const message = errorMessage(err);
         jsonRes(res, /not found/.test(message) ? 404 : 500, { error: message });
     }
 }