@geminixiang/mikan 1.0.0-beta.2 → 1.0.0-beta.21

package/dist/web/admin/portal.js

@@ -1,13 +1,14 @@
-import { existsSync, readdirSync, readFileSync, rmSync, statSync } from "fs";
+import { existsSync, readdirSync, readFileSync, statSync } from "fs";
 import { basename, join, resolve as pathResolve, sep as pathSep } from "path";
-import { MikanModels, SessionStore } from "../../harness/index.js";
-import { loadConversationAutoReplyConfig, loadGlobalSettings, resolveConversationSettings, saveConversationAutoReplyConfig, updateConversationSettings, updateGlobalSettings, } from "../../config.js";
+import { MikanModels, parseFrontmatter, SessionStore } from "../../harness/index.js";
+import { loadConversationAutoReplyConfig, loadGlobalSettings, resolveConversationSettings, saveConversationAutoReplyConfig, } from "../../config.js";
+import { applyConversationSettings, applyGlobalSettings } from "../../settings-mutation.js";
 import { escapeHtml } from "../../utils/html.js";
 import { readRawBody } from "../../utils/http-body.js";
-import { renderPortalShell } from "../../portal-shell.js";
+import { renderPortalShell } from "../portal-shell.js";
 import { resolveExistingSessionFile } from "../session-view/service.js";
 import { PRODUCT_NAME } from "../../platform-messages.js";
-import { resolveActorVaultKey } from "../../vault/routing.js";
+import { actorKey } from "../../sandbox/identity.js";
 import { sharedVaultKey } from "../../vault/index.js";
 import { modelKey, resolveAdminModelAccessStatuses } from "./provider-models.js";
 // ── Handler ────────────────────────────────────────────────────────────────────
@@ -88,7 +89,7 @@ async function routeApiRequest(req, res, url, services) {
             return;
         }
         if (url.pathname === "/admin/api/events") {
-            serveEventsList(res, services);
+            await serveEventsList(res, services);
             return;
         }
         if (url.pathname === "/admin/api/events/file") {
@@ -96,7 +97,7 @@ async function routeApiRequest(req, res, url, services) {
             return;
         }
         if (url.pathname === "/admin/api/conversations/events") {
-            serveConversationEventsList(res, url, services, token);
+            await serveConversationEventsList(res, url, services, token);
             return;
         }
         jsonRes(res, 404, { error: "Not found" });
@@ -140,19 +141,19 @@ async function routeApiRequest(req, res, url, services) {
         return;
     }
     if (url.pathname === "/admin/api/conversations/events/delete") {
-        serveConversationEventDelete(res, body, services, token);
+        await serveConversationEventDelete(res, body, services, token);
         return;
     }
     if (url.pathname === "/admin/api/settings/model") {
-        serveGlobalModelUpdate(res, body);
+        serveGlobalModelUpdate(res, body, services);
         return;
     }
     if (url.pathname === "/admin/api/settings/sandbox") {
-        serveGlobalSandboxUpdate(res, body);
+        serveGlobalSandboxUpdate(res, body, services);
         return;
     }
     if (url.pathname === "/admin/api/settings/slack") {
-        serveGlobalSlackUpdate(res, body);
+        serveGlobalSlackUpdate(res, body, services);
         return;
     }
     jsonRes(res, 404, { error: "Not found" });
@@ -465,8 +466,8 @@ function serveConversationState(res, url, services, token) {
         globalProvider: globalConfig.provider,
         globalModel: globalConfig.model,
         globalThinkingLevel: globalConfig.thinkingLevel,
-        sandboxImageWorkspaceMount: conversationConfig.sandboxImageWorkspaceMount ?? null,
-        globalSandboxImageWorkspaceMount: globalConfig.sandboxImageWorkspaceMount ?? null,
+        sandboxImageWorkspaceMount: conversationConfig.sandbox?.image?.workspaceMount ?? null,
+        globalSandboxImageWorkspaceMount: globalConfig.sandbox?.image?.workspaceMount ?? null,
         autoReplyEnabled: autoReply.enabled,
         autoReplyRules: autoReply.rules,
         slack: {
@@ -482,12 +483,12 @@ function serveGlobalSettings(res) {
             provider: config.provider,
             model: config.model,
             thinkingLevel: config.thinkingLevel,
-            sandboxCpus: config.sandboxCpus ?? null,
-            sandboxMemory: config.sandboxMemory ?? null,
-            sandboxBoostCpus: config.sandboxBoostCpus ?? null,
-            sandboxBoostMemory: config.sandboxBoostMemory ?? null,
-            sandboxImageWorkspaceMount: config.sandboxImageWorkspaceMount ?? null,
-            defaultSharedVault: config.defaultSharedVault ?? null,
+            sandboxCpus: config.sandbox?.cpus ?? null,
+            sandboxMemory: config.sandbox?.memory ?? null,
+            sandboxBoostCpus: config.sandbox?.boost?.cpus ?? null,
+            sandboxBoostMemory: config.sandbox?.boost?.memory ?? null,
+            sandboxImageWorkspaceMount: config.sandbox?.image?.workspaceMount ?? null,
+            defaultSharedVault: config.sandbox?.defaultSharedVault ?? null,
             slack: {
                 replyMode: config.slack?.replyMode ?? "top-level",
             },
@@ -518,7 +519,7 @@ async function serveModelsList(res) {
         jsonRes(res, 500, { error: err instanceof Error ? err.message : String(err) });
     }
 }
-const VALID_THINKING_LEVELS = new Set(["off", "minimal", "low", "medium", "high", "xhigh"]);
+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() : "";
@@ -537,18 +538,19 @@ function serveConversationModelUpdate(res, body, services, token) {
     const workingDir = requireAdminWorkingDir(res, services);
     if (!workingDir)
         return;
-    const dir = join(workingDir, scope.conversationId);
     try {
-        updateConversationSettings(dir, {
+        const result = applyConversationSettings(services.runtime, workingDir, scope.conversationId, {
             provider,
             model,
             ...(thinkingLevel ? { thinkingLevel } : {}),
         });
-        let runtimeSwitched = null;
-        if (services.runtime) {
-            runtimeSwitched = services.runtime.switchConversationModel(scope.conversationId, provider, model);
+        if (!result.ok) {
+            jsonRes(res, 409, {
+                error: "Conversation has a running job; retry after it finishes (or /stop it).",
+            });
+            return;
         }
-        jsonRes(res, 200, { ok: true, runtimeSwitched });
+        jsonRes(res, 200, { ok: true, runtimeSwitched: result.runtimeSwitched });
     }
     catch (err) {
         jsonRes(res, 500, { error: err instanceof Error ? err.message : String(err) });
@@ -568,9 +570,10 @@ function serveConversationSandboxUpdate(res, body, services, token) {
     const workingDir = requireAdminWorkingDir(res, services);
     if (!workingDir)
         return;
-    const dir = join(workingDir, scope.conversationId);
     try {
-        updateConversationSettings(dir, { sandboxImageWorkspaceMount: workspaceMount });
+        applyConversationSettings(services.runtime, workingDir, scope.conversationId, {
+            sandbox: { image: { workspaceMount } },
+        });
         jsonRes(res, 200, { ok: true });
     }
     catch (err) {
@@ -591,9 +594,10 @@ function serveConversationSlackUpdate(res, body, services, token) {
     const workingDir = requireAdminWorkingDir(res, services);
     if (!workingDir)
         return;
-    const dir = join(workingDir, scope.conversationId);
     try {
-        updateConversationSettings(dir, { slack: { replyMode } });
+        applyConversationSettings(services.runtime, workingDir, scope.conversationId, {
+            slack: { replyMode },
+        });
         jsonRes(res, 200, { ok: true });
     }
     catch (err) {
@@ -688,7 +692,10 @@ function serveConversationLoginLink(res, body, services, token) {
     }
     else {
         try {
-            vaultId = resolveActorVaultKey(services.sandbox, token.platformUserId, scope.conversationId);
+            vaultId = actorKey(services.sandbox, {
+                userId: token.platformUserId,
+                conversationId: scope.conversationId,
+            });
         }
         catch (err) {
             jsonRes(res, 500, { error: err instanceof Error ? err.message : String(err) });
@@ -704,7 +711,7 @@ function serveConversationLoginLink(res, body, services, token) {
         jsonRes(res, 500, { error: err instanceof Error ? err.message : String(err) });
     }
 }
-function serveGlobalModelUpdate(res, body) {
+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)
@@ -715,55 +722,57 @@ function serveGlobalModelUpdate(res, body) {
         return;
     }
     try {
-        updateGlobalSettings({
+        const result = applyGlobalSettings(services.runtime, {
             provider,
             model,
             ...(thinkingLevel ? { thinkingLevel } : {}),
         });
-        jsonRes(res, 200, { ok: true });
+        jsonRes(res, 200, { ok: true, staleConversations: result.staleConversations });
     }
     catch (err) {
         jsonRes(res, 500, { error: err instanceof Error ? err.message : String(err) });
     }
 }
-function serveGlobalSlackUpdate(res, body) {
+function serveGlobalSlackUpdate(res, body, services) {
     const replyMode = body.replyMode;
     if (replyMode !== "top-level" && replyMode !== "thread") {
         jsonRes(res, 400, { error: "replyMode must be 'top-level' or 'thread'" });
         return;
     }
     try {
-        updateGlobalSettings({ slack: { replyMode } });
+        applyGlobalSettings(services.runtime, { slack: { replyMode } });
         jsonRes(res, 200, { ok: true });
     }
     catch (err) {
         jsonRes(res, 500, { error: err instanceof Error ? err.message : String(err) });
     }
 }
-function serveGlobalSandboxUpdate(res, body) {
+function serveGlobalSandboxUpdate(res, body, services) {
     const cpus = typeof body.cpus === "string" ? body.cpus.trim() : "";
     const memory = typeof body.memory === "string" ? body.memory.trim() : "";
     const boostCpus = typeof body.boostCpus === "string" ? body.boostCpus.trim() : "";
     const boostMemory = typeof body.boostMemory === "string" ? body.boostMemory.trim() : "";
     const workspaceMount = body.workspaceMount;
     const validMount = workspaceMount === "private" || workspaceMount === "full";
-    const update = {};
-    if (cpus)
-        update.sandboxCpus = cpus;
-    if (memory)
-        update.sandboxMemory = memory;
-    if (boostCpus)
-        update.sandboxBoostCpus = boostCpus;
-    if (boostMemory)
-        update.sandboxBoostMemory = boostMemory;
-    if (validMount)
-        update.sandboxImageWorkspaceMount = workspaceMount;
+    const update = {
+        ...(cpus ? { cpus } : {}),
+        ...(memory ? { memory } : {}),
+        ...(boostCpus || boostMemory
+            ? {
+                boost: {
+                    ...(boostCpus ? { cpus: boostCpus } : {}),
+                    ...(boostMemory ? { memory: boostMemory } : {}),
+                },
+            }
+            : {}),
+        ...(validMount ? { image: { workspaceMount: workspaceMount } } : {}),
+    };
     if (Object.keys(update).length === 0) {
         jsonRes(res, 400, { error: "No valid sandbox fields provided" });
         return;
     }
     try {
-        updateGlobalSettings(update);
+        applyGlobalSettings(services.runtime, { sandbox: update });
         jsonRes(res, 200, { ok: true });
     }
     catch (err) {
@@ -994,7 +1003,12 @@ function serveWorkspaceFile(res, url, services, token) {
     }
     servePreviewFile(res, safe.absolute, { path: requestedPath }, "File not found");
 }
-function parseSkillFrontmatter(filePath) {
+/**
+ * Read skill metadata via the harness frontmatter parser (the owning module).
+ * The portal historically accepted frontmatter keys case-insensitively, so
+ * the lookup — not the parser — preserves that leniency.
+ */
+function readSkillMeta(filePath) {
     let text;
     try {
         text = readFileSync(filePath, "utf-8");
@@ -1002,31 +1016,18 @@ function parseSkillFrontmatter(filePath) {
     catch {
         return {};
     }
-    if (!text.startsWith("---"))
-        return {};
-    const end = text.indexOf("\n---", 3);
-    if (end < 0)
-        return {};
-    const block = text.slice(3, end);
+    const { values } = parseFrontmatter(text);
     const out = {};
-    for (const line of block.split("\n")) {
-        const colon = line.indexOf(":");
-        if (colon < 0)
-            continue;
-        const key = line.slice(0, colon).trim().toLowerCase();
-        let value = line.slice(colon + 1).trim();
-        if ((value.startsWith('"') && value.endsWith('"')) ||
-            (value.startsWith("'") && value.endsWith("'"))) {
-            value = value.slice(1, -1);
-        }
-        if (key === "name")
+    for (const [key, value] of Object.entries(values)) {
+        const normalized = key.toLowerCase();
+        if (normalized === "name")
             out.name = value;
-        if (key === "description")
+        if (normalized === "description")
             out.description = value;
     }
     return out;
 }
-function readSkillsFromDir(skillsDir, source) {
+export function readSkillsFromDir(skillsDir, source) {
     if (!existsSync(skillsDir))
         return [];
     const out = [];
@@ -1043,7 +1044,7 @@ function readSkillsFromDir(skillsDir, source) {
         const skillMd = join(skillsDir, entry.name, "SKILL.md");
         if (!existsSync(skillMd))
             continue;
-        const meta = parseSkillFrontmatter(skillMd);
+        const meta = readSkillMeta(skillMd);
         out.push({
             name: meta.name ?? entry.name,
             description: meta.description ?? "",
@@ -1104,75 +1105,53 @@ function serveSkillFile(res, url, services, token) {
 }
 // ── Events ─────────────────────────────────────────────────────────────────────
 const EVENTS_FILE_MAX_BYTES = 64 * 1024;
-function listAllEvents(workingDir) {
-    const dir = join(workingDir, "events");
-    if (!existsSync(dir))
-        return [];
-    let entries;
-    try {
-        entries = readdirSync(dir, { withFileTypes: true });
-    }
-    catch {
-        return [];
-    }
-    return entries
-        .filter((e) => e.isFile() && e.name.endsWith(".json"))
-        .map((e) => {
-        const filePath = join(dir, e.name);
-        let stats;
-        try {
-            stats = statSync(filePath);
-        }
-        catch {
-            return null;
-        }
-        let parsed = null;
-        try {
-            parsed = JSON.parse(readFileSync(filePath, "utf-8"));
-        }
-        catch {
-            // Keep entry; just omit parsed fields.
-        }
-        const meta = parsed && typeof parsed === "object" ? parsed : {};
-        // events.ts accepts `channelId` as a legacy alias for `conversationId`.
-        const conversationId = typeof meta.conversationId === "string"
-            ? meta.conversationId
-            : typeof meta.channelId === "string"
-                ? meta.channelId
-                : null;
+/**
+ * List events through the owning store, whose payloads are validated by the
+ * event-format module (files that fail validation stay visible with a null
+ * payload so operators can delete them).
+ */
+export async function listAllEvents(store) {
+    const entries = await store.list();
+    return entries.map((entry) => {
+        const payload = entry.payload;
         return {
-            name: e.name,
-            size: stats.size,
-            mtimeMs: stats.mtimeMs,
-            type: typeof meta.type === "string" ? meta.type : null,
-            platform: typeof meta.platform === "string" ? meta.platform : null,
-            conversationId,
-            text: typeof meta.text === "string" ? meta.text : null,
-            at: typeof meta.at === "string" ? meta.at : null,
-            schedule: typeof meta.schedule === "string" ? meta.schedule : null,
-            timezone: typeof meta.timezone === "string" ? meta.timezone : null,
+            name: entry.filename,
+            size: entry.size,
+            mtimeMs: entry.mtimeMs,
+            type: payload?.type ?? null,
+            platform: payload?.platform ?? null,
+            conversationId: payload?.conversationId ?? null,
+            text: payload?.text ?? null,
+            at: payload?.type === "one-shot" ? payload.at : null,
+            schedule: payload?.type === "periodic" ? payload.schedule : null,
+            timezone: payload?.type === "periodic" ? payload.timezone : null,
         };
-    })
-        .filter((e) => e !== null)
-        .toSorted((a, b) => a.name.localeCompare(b.name));
+    });
 }
-function serveEventsList(res, services) {
-    const workingDir = requireAdminWorkingDir(res, services);
-    if (!workingDir)
+function requireAdminEventStore(res, services) {
+    if (!services.eventStore) {
+        jsonRes(res, 503, { error: "Working directory not available" });
+        return null;
+    }
+    return services.eventStore;
+}
+async function serveEventsList(res, services) {
+    const store = requireAdminEventStore(res, services);
+    if (!store)
         return;
-    jsonRes(res, 200, { events: listAllEvents(workingDir) });
+    jsonRes(res, 200, { events: await listAllEvents(store) });
 }
 /** Per-conversation listing — filter all events by conversationId match. */
-function serveConversationEventsList(res, url, services, token) {
+async function serveConversationEventsList(res, url, services, token) {
     const scope = resolveConversationFromQuery(url, token);
     if (scope.error) {
         jsonRes(res, 403, { error: scope.error });
         return;
     }
-    const workingDir = requireAdminWorkingDir(res, services);
-    if (!workingDir)
+    const store = requireAdminEventStore(res, services);
+    if (!store)
         return;
-    const events = listAllEvents(workingDir).filter((e) => e.conversationId === scope.conversationId);
+    const events = (await listAllEvents(store)).filter((e) => e.conversationId === scope.conversationId);
     jsonRes(res, 200, { conversationId: scope.conversationId, events });
 }
 function serveEventsFile(res, url, services) {
@@ -1212,7 +1191,7 @@ function serveEventsFile(res, url, services) {
     jsonRes(res, 200, { name, content: raw });
 }
 /** Delete a single event file scoped to the caller's conversation. */
-function serveConversationEventDelete(res, body, services, token) {
+async function serveConversationEventDelete(res, body, services, token) {
     const scope = resolveTargetConversation(body, token);
     if (scope.error) {
         jsonRes(res, 403, { error: scope.error });
@@ -1223,38 +1202,24 @@ function serveConversationEventDelete(res, body, services, token) {
         jsonRes(res, 400, { error: "Invalid name" });
         return;
     }
-    const workingDir = requireAdminWorkingDir(res, services);
-    if (!workingDir)
+    const store = requireAdminEventStore(res, services);
+    if (!store)
         return;
-    const filePath = join(workingDir, "events", name);
-    let raw;
+    let payload;
     try {
-        raw = readFileSync(filePath, "utf-8");
+        payload = (await store.read(name)).payload;
     }
     catch {
         jsonRes(res, 404, { error: "Event not found" });
         return;
     }
-    let parsed = {};
-    try {
-        const j = JSON.parse(raw);
-        if (j && typeof j === "object")
-            parsed = j;
-    }
-    catch {
-        // Malformed events cannot be associated with a conversation below.
-    }
-    const eventConvId = typeof parsed.conversationId === "string"
-        ? parsed.conversationId
-        : typeof parsed.channelId === "string"
-            ? parsed.channelId
-            : null;
-    if (eventConvId !== scope.conversationId) {
+    // The store normalizes the legacy `channelId` alias into `conversationId`.
+    if (payload?.conversationId !== scope.conversationId) {
         jsonRes(res, 403, { error: "Event does not belong to this conversation." });
         return;
     }
     try {
-        rmSync(filePath, { force: true });
+        await store.delete(name);
         jsonRes(res, 200, { ok: true });
     }
     catch (err) {
@@ -1578,7 +1543,7 @@ function renderAdminPage(token) {
     }
 
     function renderSettings(data) {
-      const thinking = ['off','minimal','low','medium','high','xhigh'];
+      const thinking = ['off','minimal','low','medium','high','xhigh','max'];
       const thinkingOpts = thinking.map((t) =>
         '<option value="' + t + '"' + (data.thinkingLevel === t ? ' selected' : '') + '>' + t + '</option>'
       ).join('');
@@ -1647,9 +1612,7 @@ function renderAdminPage(token) {
           conversationId: activeConversationId, provider, model, thinkingLevel,
         });
         result.style.display = 'block'; result.className = 'inline-result ok';
-        result.textContent = data.runtimeSwitched === false
-          ? 'Saved — running session pinned; new model applies on next start.'
-          : 'Saved ✓';
+        result.textContent = 'Saved ✓';
       } catch (err) {
         result.style.display = 'block'; result.className = 'inline-result err';
         result.textContent = err.message;
@@ -2130,7 +2093,7 @@ function renderAdminPage(token) {
     }
 
     function renderGlobalSettings(data) {
-      const thinking = ['off','minimal','low','medium','high','xhigh'];
+      const thinking = ['off','minimal','low','medium','high','xhigh','max'];
       const thinkingOpts = thinking.map((t) =>
         '<option value="' + t + '"' + (data.thinkingLevel === t ? ' selected' : '') + '>' + t + '</option>'
       ).join('');