@geminixiang/mikan 1.0.0-beta.94 → 1.0.0-beta.95

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

@@ -2,7 +2,7 @@ import { validateEventFilename } from "../../../events/index.js";
 import { existsSync, lstatSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync, } from "node:fs";
 import { basename, join, matchesGlob, resolve as pathResolve, sep as pathSep } from "node:path";
 import { atomicWritePrivateFile } from "../../../file-guards.js";
-import { MikanModels } from "../../../harness/models.js";
+import { defaultModelsJsonPath, MikanModels } from "../../../harness/models.js";
 import { formatSkillsForPrompt, loadOfficeSkills, resolveSkillEnabled, validateSkill, } from "../../../harness/skills.js";
 import { SessionStore } from "../../../sessions/session-store.js";
 import { InMemoryTokenStore } from "../token-store.js";
@@ -83,9 +83,9 @@ async function routeGetApiRequest(res, url, services) {
         case "/admin/api/conversation-state":
             return serveConversationState(res, url, services, token);
         case "/admin/api/settings/global":
-            return serveGlobalSettings(res);
+            return serveGlobalSettings(res, services.workspace);
         case "/admin/api/models":
-            return serveModelsList(res);
+            return serveModelsList(res, services.workspace);
         case "/admin/api/workspace/tree":
             return serveWorkspaceTree(res, url, services, token);
         case "/admin/api/workspace/file":
@@ -162,21 +162,12 @@ function resolveTargetConversation(body, token) {
     const platform = typeof body.platform === "string" ? body.platform.trim() : "";
     return resolveConversationScope(requested, platform, token);
 }
-function requireAdminWorkspace(res, services) {
-    if (!services.workspace) {
-        jsonRes(res, 503, { error: "Working directory not available" });
-        return null;
-    }
-    return services.workspace;
-}
-function requireConversationWorkspace(res, body, services, token) {
-    const scope = resolveTargetConversation(body, token);
+function scopedOffice(res, services, scope) {
     if (scope.error) {
         jsonRes(res, 403, { error: scope.error });
         return undefined;
     }
-    const workspace = requireAdminWorkspace(res, services);
-    return workspace ? { scope, workspace } : undefined;
+    return services.workspace.office(scope.address);
 }
 function listAdminOffices(workspace) {
     return listRegisteredOffices(workspace.stateDir)
@@ -224,9 +215,7 @@ function conversationDisplayLabel(services, office) {
     return `${office.platform}:${office.conversationId}`;
 }
 function serveConversationsList(res, services) {
-    const workspace = requireAdminWorkspace(res, services);
-    if (!workspace)
-        return;
+    const { workspace } = services;
     const running = services.runtime?.getRunningSessions() ?? [];
     const conversations = listAdminOffices(workspace).map((office) => ({
         platform: office.platform,
@@ -238,9 +227,7 @@ function serveConversationsList(res, services) {
     jsonRes(res, 200, { conversations });
 }
 async function serveSessionUsage(res, services) {
-    const workspace = requireAdminWorkspace(res, services);
-    if (!workspace)
-        return;
+    const { workspace } = services;
     const usageLists = [];
     for (const office of listAdminOffices(workspace)) {
         usageLists.push(await listConversationSessionUsage(workspace, office, conversationDisplayLabel(services, office)));
@@ -315,9 +302,7 @@ function emptyBucket(date) {
     return { date, input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0, cost: 0 };
 }
 async function serveConversationUsage(res, url, services) {
-    const workspace = requireAdminWorkspace(res, services);
-    if (!workspace)
-        return;
+    const { workspace } = services;
     const conversationId = (url.searchParams.get("conversationId") ?? "").trim();
     const platformParam = (url.searchParams.get("platform") ?? "").trim();
     const office = listAdminOffices(workspace).find((candidate) => candidate.conversationId === conversationId &&
@@ -406,17 +391,12 @@ async function accumulateSessionUsageByDay(office, sessionKey, cutoff, buckets,
     catch { }
 }
 function serveConversationState(res, url, services, token) {
-    const workspace = requireAdminWorkspace(res, services);
-    if (!workspace)
+    const { workspace } = services;
+    const office = scopedOffice(res, services, resolveConversationFromQuery(url, token));
+    if (!office)
         return;
-    const scope = resolveConversationFromQuery(url, token);
-    if (scope.error) {
-        jsonRes(res, 400, { error: scope.error });
-        return;
-    }
-    const conversationId = scope.conversationId;
-    const office = workspace.office(scope.address);
-    const globalConfig = loadGlobalSettings();
+    const conversationId = office.address.conversationId;
+    const globalConfig = loadGlobalSettings(workspace.stateDir);
     const conversationConfig = resolveConversationSettings(office);
     const conversationWorkspace = resolveWorkspaceProjection(office);
     jsonRes(res, 200, {
@@ -436,9 +416,9 @@ function serveConversationState(res, url, services, token) {
         },
     });
 }
-function serveGlobalSettings(res) {
+function serveGlobalSettings(res, workspace) {
     try {
-        const config = loadGlobalSettings();
+        const config = loadGlobalSettings(workspace.stateDir);
         jsonRes(res, 200, {
             provider: config.provider,
             model: config.model,
@@ -457,9 +437,11 @@ function serveGlobalSettings(res) {
         jsonRes(res, 500, { error: errorMessage(err) });
     }
 }
-async function serveModelsList(res) {
+async function serveModelsList(res, workspace) {
     try {
-        const registry = MikanModels.create();
+        const registry = MikanModels.create({
+            modelsJsonPath: defaultModelsJsonPath(workspace.stateDir),
+        });
         const availableModels = await registry.getAvailable();
         const statuses = await resolveAdminModelAccessStatuses(registry, availableModels);
         const models = availableModels.map((model) => ({
@@ -478,24 +460,25 @@ async function serveModelsList(res) {
         jsonRes(res, 500, { error: errorMessage(err) });
     }
 }
-function serveConversationModelUpdate(res, body, services, token) {
+function readModelSelection(res, body) {
     const provider = typeof body.provider === "string" ? body.provider.trim() : "";
     const model = typeof body.model === "string" ? body.model.trim() : "";
-    const thinkingLevel = isThinkingLevel(body.thinkingLevel) ? body.thinkingLevel : undefined;
     if (!provider || !model) {
         jsonRes(res, 400, { error: "Missing provider or model" });
-        return;
+        return undefined;
     }
-    const target = requireConversationWorkspace(res, body, services, token);
-    if (!target)
+    const thinkingLevel = isThinkingLevel(body.thinkingLevel) ? body.thinkingLevel : undefined;
+    return { provider, model, thinkingLevel };
+}
+function serveConversationModelUpdate(res, body, services, token) {
+    const selection = readModelSelection(res, body);
+    if (!selection)
+        return;
+    const office = scopedOffice(res, services, resolveTargetConversation(body, token));
+    if (!office)
         return;
-    const { scope, workspace } = target;
     try {
-        const result = applyConversationSettings(services.runtime, workspace.office(scope.address), {
-            provider,
-            model,
-            thinkingLevel,
-        });
+        const result = applyConversationSettings(services.runtime, office, selection);
         if (!result.ok) {
             jsonRes(res, 409, {
                 error: "Conversation has a running job; retry after it finishes (or /stop it).",
@@ -513,12 +496,11 @@ function serveConversationVisibilityUpdate(res, body, services, token) {
         jsonRes(res, 400, { error: "visibility must be 'private' or 'default'" });
         return;
     }
-    const target = requireConversationWorkspace(res, body, services, token);
-    if (!target)
+    const office = scopedOffice(res, services, resolveTargetConversation(body, token));
+    if (!office)
         return;
-    const { scope, workspace } = target;
     try {
-        const result = applyOfficeVisibility(services.runtime, workspace.office(scope.address), body.visibility === "private" ? "private" : null);
+        const result = applyOfficeVisibility(services.runtime, office, body.visibility === "private" ? "private" : null);
         if (!result.ok) {
             jsonRes(res, 409, { error: "Conversation is busy; retry when the current run finishes" });
             return;
@@ -535,22 +517,20 @@ function serveConversationSlackUpdate(res, body, services, token) {
         jsonRes(res, 400, { error: "replyMode must be 'top-level' or 'thread'" });
         return;
     }
-    const target = requireConversationWorkspace(res, body, services, token);
-    if (!target)
+    const office = scopedOffice(res, services, resolveTargetConversation(body, token));
+    if (!office)
         return;
-    const { scope, workspace } = target;
     respondWithSettingsUpdate(res, () => {
-        applyConversationSettings(services.runtime, workspace.office(scope.address), {
+        applyConversationSettings(services.runtime, office, {
             slack: { replyMode },
         });
         return { ok: true };
     });
 }
 async function serveConversationSessionLink(res, body, services, token) {
-    const target = requireConversationWorkspace(res, body, services, token);
-    if (!target)
+    const office = scopedOffice(res, services, resolveTargetConversation(body, token));
+    if (!office)
         return;
-    const { scope, workspace } = target;
     if (!services.sessionViewTokenStore) {
         jsonRes(res, 503, { error: "Session view token store not available" });
         return;
@@ -561,8 +541,7 @@ async function serveConversationSessionLink(res, body, services, token) {
         });
         return;
     }
-    const office = workspace.office(scope.address);
-    if (!(await SessionStore.exists(office, scope.conversationId))) {
+    if (!(await SessionStore.exists(office, office.address.conversationId))) {
         jsonRes(res, 404, { error: "No session found for this conversation" });
         return;
     }
@@ -570,8 +549,8 @@ async function serveConversationSessionLink(res, body, services, token) {
         const { token: viewToken } = services.sessionViewTokenStore.create({
             platform: token.platform,
             platformUserId: token.platformUserId,
-            conversationId: scope.conversationId,
-            sessionKey: scope.conversationId,
+            conversationId: office.address.conversationId,
+            sessionKey: office.address.conversationId,
             office,
             platformUserName: token.platformUserName,
         });
@@ -583,11 +562,9 @@ async function serveConversationSessionLink(res, body, services, token) {
     }
 }
 function serveConversationLoginLink(res, body, services, token) {
-    const scope = resolveTargetConversation(body, token);
-    if (scope.error) {
-        jsonRes(res, 403, { error: scope.error });
+    const office = scopedOffice(res, services, resolveTargetConversation(body, token));
+    if (!office)
         return;
-    }
     if (!services.portalBaseUrl) {
         jsonRes(res, 503, { error: "Portal URL not configured." });
         return;
@@ -610,7 +587,7 @@ function serveConversationLoginLink(res, body, services, token) {
         try {
             vaultId = credentialAuthorizationKey(services.sandbox, {
                 userId: token.platformUserId,
-                address: scope.address,
+                address: office.address,
             });
         }
         catch (err) {
@@ -619,7 +596,7 @@ function serveConversationLoginLink(res, body, services, token) {
         }
     }
     try {
-        const { token: linkToken } = services.linkTokenStore.create(token.platform, token.platformUserId, scope.conversationId, vaultId, "");
+        const { token: linkToken } = services.linkTokenStore.create(token.platform, token.platformUserId, office.address.conversationId, vaultId, "");
         const url = `${services.portalBaseUrl}/link?token=${encodeURIComponent(linkToken)}`;
         jsonRes(res, 200, { ok: true, url, vaultId });
     }
@@ -628,19 +605,11 @@ function serveConversationLoginLink(res, body, services, token) {
     }
 }
 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 = isThinkingLevel(body.thinkingLevel) ? body.thinkingLevel : undefined;
-    if (!provider || !model) {
-        jsonRes(res, 400, { error: "Missing provider or model" });
+    const selection = readModelSelection(res, body);
+    if (!selection)
         return;
-    }
     respondWithSettingsUpdate(res, () => {
-        const result = applyGlobalSettings(services.runtime, {
-            provider,
-            model,
-            thinkingLevel,
-        });
+        const result = applyGlobalSettings(services.runtime, services.workspace.stateDir, selection);
         return {
             ok: true,
             staleConversations: result.staleConversations.map((office) => `${office.platform}:${office.conversationId}`),
@@ -654,7 +623,7 @@ function serveGlobalSlackUpdate(res, body, services) {
         return;
     }
     respondWithSettingsUpdate(res, () => {
-        applyGlobalSettings(services.runtime, { slack: { replyMode } });
+        applyGlobalSettings(services.runtime, services.workspace.stateDir, { slack: { replyMode } });
         return { ok: true };
     });
 }
@@ -680,7 +649,7 @@ function serveGlobalSandboxUpdate(res, body, services) {
         return;
     }
     respondWithSettingsUpdate(res, () => {
-        applyGlobalSettings(services.runtime, { sandbox: update });
+        applyGlobalSettings(services.runtime, services.workspace.stateDir, { sandbox: update });
         return { ok: true };
     });
 }
@@ -783,17 +752,12 @@ function buildTree(startDir, relPrefix) {
     return node;
 }
 function serveWorkspaceTree(res, url, services, token) {
-    const scope = resolveConversationFromQuery(url, token);
-    if (scope.error) {
-        jsonRes(res, 403, { error: scope.error });
-        return;
-    }
-    const workspace = requireAdminWorkspace(res, services);
-    if (!workspace)
+    const office = scopedOffice(res, services, resolveConversationFromQuery(url, token));
+    if (!office)
         return;
-    const convDir = workspace.office(scope.address).dir;
+    const convDir = office.dir;
     if (!existsSync(convDir)) {
-        jsonRes(res, 200, { conversationId: scope.conversationId, tree: null });
+        jsonRes(res, 200, { conversationId: office.address.conversationId, tree: null });
         return;
     }
     const requestedSub = (url.searchParams.get("path") ?? "").trim();
@@ -808,7 +772,7 @@ function serveWorkspaceTree(res, url, services, token) {
     }
     const tree = buildTree(startSafe.absolute, requestedSub);
     jsonRes(res, 200, {
-        conversationId: scope.conversationId,
+        conversationId: office.address.conversationId,
         root: requestedSub || ".",
         tree,
     });
@@ -877,13 +841,8 @@ function servePreviewFile(res, absolutePath, metadata, notFoundMessage) {
     });
 }
 function serveWorkspaceFile(res, url, services, token) {
-    const scope = resolveConversationFromQuery(url, token);
-    if (scope.error) {
-        jsonRes(res, 403, { error: scope.error });
-        return;
-    }
-    const workspace = requireAdminWorkspace(res, services);
-    if (!workspace)
+    const office = scopedOffice(res, services, resolveConversationFromQuery(url, token));
+    if (!office)
         return;
     const requestedPath = (url.searchParams.get("path") ?? "").trim();
     if (!requestedPath) {
@@ -894,7 +853,7 @@ function serveWorkspaceFile(res, url, services, token) {
         jsonRes(res, 403, { error: "Workspace path is not exposed" });
         return;
     }
-    const convDir = workspace.office(scope.address).dir;
+    const convDir = office.dir;
     const safe = safeJoinUnderRoot(convDir, requestedPath);
     if (safe.error) {
         jsonRes(res, 400, { error: safe.error });
@@ -903,17 +862,12 @@ function serveWorkspaceFile(res, url, services, token) {
     servePreviewFile(res, safe.absolute, { path: requestedPath }, "File not found");
 }
 function serveMcpServersList(res, url, services, token) {
-    const scope = resolveConversationFromQuery(url, token);
-    if (scope.error) {
-        jsonRes(res, 403, { error: scope.error });
-        return;
-    }
-    const workspace = requireAdminWorkspace(res, services);
-    if (!workspace)
+    const office = scopedOffice(res, services, resolveConversationFromQuery(url, token));
+    if (!office)
         return;
-    const servers = loadScopeMcpServers(workspace.office(scope.address));
+    const servers = loadScopeMcpServers(office);
     jsonRes(res, 200, {
-        conversationId: scope.conversationId,
+        conversationId: office.address.conversationId,
         presets: listMcpPresets(),
         global: redactMcpServers(servers.global),
         conversation: redactMcpServers(servers.conversation),
@@ -1017,15 +971,10 @@ async function serveMcpServerMutation(res, body, services, token) {
         return;
     }
     const mutationScope = body.scope === "global" ? "global" : "conversation";
-    const scope = resolveTargetConversation(body, token);
-    if (scope.error) {
-        jsonRes(res, 403, { error: scope.error });
-        return;
-    }
-    const workspace = requireAdminWorkspace(res, services);
-    if (!workspace)
+    const office = scopedOffice(res, services, resolveTargetConversation(body, token));
+    if (!office)
         return;
-    const office = workspace.office(scope.address);
+    const { workspace } = services;
     const maps = loadScopeMcpServers(office);
     const current = mutationScope === "global" ? maps.global : maps.conversation;
     if (action === "test") {
@@ -1045,7 +994,7 @@ async function serveMcpServerMutation(res, body, services, token) {
         return;
     }
     const result = mutationScope === "global"
-        ? applyGlobalSettings(services.runtime, { mcpServers: plan.next })
+        ? applyGlobalSettings(services.runtime, workspace.stateDir, { mcpServers: plan.next })
         : applyConversationSettings(services.runtime, office, { mcpServers: plan.next });
     if (!result.ok) {
         jsonRes(res, 409, { error: "Conversation is busy; try again shortly." });
@@ -1105,36 +1054,27 @@ function officeSkillListing(workspace, office) {
     };
 }
 function serveSkillsList(res, url, services, token) {
-    const scope = resolveConversationFromQuery(url, token);
-    if (scope.error) {
-        jsonRes(res, 403, { error: scope.error });
+    const office = scopedOffice(res, services, resolveConversationFromQuery(url, token));
+    if (!office)
         return;
-    }
-    const workspace = requireAdminWorkspace(res, services);
-    if (!workspace)
-        return;
-    jsonRes(res, 200, officeSkillListing(workspace, workspace.office(scope.address)));
+    const { workspace } = services;
+    jsonRes(res, 200, officeSkillListing(workspace, office));
 }
 const SKILL_TOGGLE_STATES = {
     global: ["load", "unload"],
     conversation: ["inherit", "load", "unload"],
 };
 function serveSkillToggle(res, body, services, token) {
-    const scope = resolveTargetConversation(body, token);
-    if (scope.error) {
-        jsonRes(res, 403, { error: scope.error });
-        return;
-    }
-    const workspace = requireAdminWorkspace(res, services);
-    if (!workspace)
+    const office = scopedOffice(res, services, resolveTargetConversation(body, token));
+    if (!office)
         return;
+    const { workspace } = services;
     const target = body.scope === "global" || body.scope === "conversation" ? body.scope : undefined;
     const state = typeof body.state === "string" ? body.state : "";
     if (!target || !SKILL_TOGGLE_STATES[target].includes(state)) {
         jsonRes(res, 400, { error: "Invalid scope or state" });
         return;
     }
-    const office = workspace.office(scope.address);
     const skill = officeSkillListing(workspace, office).skills.find((entry) => entry.source === body.source && entry.directory === body.directory);
     if (!skill) {
         jsonRes(res, 404, { error: "Skill not found" });
@@ -1143,18 +1083,14 @@ function serveSkillToggle(res, body, services, token) {
     const patterns = loadSkillPatterns(office)[target].filter((pattern) => pattern.slice(1) !== skill.directory);
     if (state !== "inherit")
         patterns.push(`${state === "load" ? "+" : "-"}${skill.directory}`);
-    updateSkillPatterns(target === "global" ? undefined : office, patterns);
+    updateSkillPatterns(office, target, patterns);
     jsonRes(res, 200, officeSkillListing(workspace, office));
 }
 function serveSkillFile(res, url, services, token) {
-    const scope = resolveConversationFromQuery(url, token);
-    if (scope.error) {
-        jsonRes(res, 403, { error: scope.error });
-        return;
-    }
-    const workspace = requireAdminWorkspace(res, services);
-    if (!workspace)
+    const office = scopedOffice(res, services, resolveConversationFromQuery(url, token));
+    if (!office)
         return;
+    const { workspace } = services;
     const source = (url.searchParams.get("source") ?? "").trim();
     const directory = (url.searchParams.get("directory") ?? "").trim();
     if (source !== "global" && source !== "conversation") {
@@ -1168,7 +1104,7 @@ function serveSkillFile(res, url, services, token) {
         jsonRes(res, 400, { error: "Invalid skill directory" });
         return;
     }
-    const skillsRoot = source === "global" ? workspace.skillsDir : workspace.office(scope.address).skillsDir;
+    const skillsRoot = source === "global" ? workspace.skillsDir : office.skillsDir;
     const safe = safeJoinUnderRoot(skillsRoot, join(directory, "SKILL.md"));
     if (safe.error) {
         jsonRes(res, 400, { error: safe.error });
@@ -1177,12 +1113,12 @@ function serveSkillFile(res, url, services, token) {
     servePreviewFile(res, safe.absolute, { source, directory }, "Skill file not found");
 }
 const SKILL_DIRECTORY_PATTERN = /^[a-z0-9-]+$/;
-function resolveSkillsRoot(workspace, scope, source) {
+function resolveSkillsRoot(office, source) {
     if (source !== "global" && source !== "conversation") {
         return { error: "Invalid skill source" };
     }
     return {
-        root: source === "global" ? workspace.skillsDir : workspace.office(scope.address).skillsDir,
+        root: source === "global" ? office.workspace.skillsDir : office.skillsDir,
         source,
     };
 }
@@ -1192,15 +1128,10 @@ async function serveSkillMutation(res, body, services, token) {
         jsonRes(res, 400, { error: "action must be 'save' or 'delete'" });
         return;
     }
-    const scope = resolveTargetConversation(body, token);
-    if (scope.error) {
-        jsonRes(res, 403, { error: scope.error });
-        return;
-    }
-    const workspace = requireAdminWorkspace(res, services);
-    if (!workspace)
+    const office = scopedOffice(res, services, resolveTargetConversation(body, token));
+    if (!office)
         return;
-    const resolved = resolveSkillsRoot(workspace, scope, body.source);
+    const resolved = resolveSkillsRoot(office, body.source);
     if ("error" in resolved) {
         jsonRes(res, 400, { error: resolved.error });
         return;
@@ -1286,9 +1217,7 @@ function requireAdminEventStore(res, services, office) {
     return services.eventStore(office);
 }
 async function serveEventsList(res, services) {
-    const workspace = requireAdminWorkspace(res, services);
-    if (!workspace)
-        return;
+    const { workspace } = services;
     if (!services.eventStore) {
         jsonRes(res, 503, { error: "Working directory not available" });
         return;
@@ -1300,28 +1229,21 @@ async function serveEventsList(res, services) {
     jsonRes(res, 200, { events });
 }
 async function serveConversationEventsList(res, url, services, token) {
-    const scope = resolveConversationFromQuery(url, token);
-    if (scope.error) {
-        jsonRes(res, 403, { error: scope.error });
+    const office = scopedOffice(res, services, resolveConversationFromQuery(url, token));
+    if (!office)
         return;
-    }
-    const workspace = requireAdminWorkspace(res, services);
-    if (!workspace)
-        return;
-    const store = requireAdminEventStore(res, services, workspace.office(scope.address));
+    const store = requireAdminEventStore(res, services, office);
     if (!store)
         return;
     jsonRes(res, 200, {
-        conversationId: scope.conversationId,
+        conversationId: office.address.conversationId,
         events: await listOfficeEvents(store),
     });
 }
 async function serveConversationEventDelete(res, body, services, token) {
-    const scope = resolveTargetConversation(body, token);
-    if (scope.error) {
-        jsonRes(res, 403, { error: scope.error });
+    const office = scopedOffice(res, services, resolveTargetConversation(body, token));
+    if (!office)
         return;
-    }
     let name;
     try {
         name = validateEventFilename(typeof body.name === "string" ? body.name : "");
@@ -1330,10 +1252,7 @@ async function serveConversationEventDelete(res, body, services, token) {
         jsonRes(res, 400, { error: "Invalid name" });
         return;
     }
-    const workspace = requireAdminWorkspace(res, services);
-    if (!workspace)
-        return;
-    const store = requireAdminEventStore(res, services, workspace.office(scope.address));
+    const store = requireAdminEventStore(res, services, office);
     if (!store)
         return;
     try {