@geminixiang/mikan 1.0.0-beta.37 → 1.0.0-beta.39

package/dist/vault/injection.d.ts

@@ -1,10 +1,12 @@
 import type { SandboxConfig, SandboxCredentialCapabilities } from "../sandbox/types.js";
+import type { OfficeAddress } from "../types.js";
 import type { ResolvedVault, VaultInjection } from "./types.js";
 export type { VaultInjection } from "./types.js";
 export declare function resolveVaultInjection(options: {
     vault: ResolvedVault | undefined;
     capabilities: SandboxCredentialCapabilities;
     sandboxType: SandboxConfig["type"];
-    conversationId: string;
+    /** Diagnostic identity for error reports only; no injection decision reads it. */
+    address: OfficeAddress;
 }): VaultInjection;
 //# sourceMappingURL=injection.d.ts.map

package/dist/vault/injection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"injection.d.ts","sourceRoot":"","sources":["../../src/vault/injection.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AACxF,OAAO,KAAK,EAAE,aAAa,EAAsB,cAAc,EAAE,MAAM,YAAY,CAAC;AAEpF,YAAY,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD,wBAAgB,qBAAqB,CAAC,OAAO,EAAE;IAC7C,KAAK,EAAE,aAAa,GAAG,SAAS,CAAC;IACjC,YAAY,EAAE,6BAA6B,CAAC;IAC5C,WAAW,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACnC,cAAc,EAAE,MAAM,CAAC;CACxB,GAAG,cAAc,CA6BjB"}
+{"version":3,"file":"injection.d.ts","sourceRoot":"","sources":["../../src/vault/injection.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AACxF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,aAAa,EAAsB,cAAc,EAAE,MAAM,YAAY,CAAC;AAEpF,YAAY,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD,wBAAgB,qBAAqB,CAAC,OAAO,EAAE;IAC7C,KAAK,EAAE,aAAa,GAAG,SAAS,CAAC;IACjC,YAAY,EAAE,6BAA6B,CAAC;IAC5C,WAAW,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACnC,kFAAkF;IAClF,OAAO,EAAE,aAAa,CAAC;CACxB,GAAG,cAAc,CA6BjB"}

package/dist/vault/injection.js

@@ -1,7 +1,7 @@
 import { existsSync } from "fs";
 import { reportUserFacingError } from "../observability/sentry.js";
 export function resolveVaultInjection(options) {
-    const { vault, capabilities, sandboxType, conversationId } = options;
+    const { vault, capabilities, sandboxType, address } = options;
     if (vault && vault.mounts.length > 0 && !capabilities.fileMounts) {
         throw new Error(`Sandbox type "${sandboxType}" does not support vault file mounts`);
     }
@@ -15,7 +15,7 @@ export function resolveVaultInjection(options) {
                 severity: "warning",
                 context: {
                     sandboxType,
-                    conversationId,
+                    conversationId: address.conversationId,
                     target: mount.target,
                     hasVault: Boolean(vault),
                 },

package/dist/vault/injection.js.map

@@ -1 +1 @@
-{"version":3,"file":"injection.js","sourceRoot":"","sources":["../../src/vault/injection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAMnE,MAAM,UAAU,qBAAqB,CAAC,OAKrC;IACC,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC;IACrE,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;QACjE,MAAM,IAAI,KAAK,CAAC,iBAAiB,WAAW,sCAAsC,CAAC,CAAC;IACtF,CAAC;IAED,MAAM,MAAM,GAAyB,EAAE,CAAC;IACxC,KAAK,MAAM,KAAK,IAAI,KAAK,EAAE,MAAM,IAAI,EAAE,EAAE,CAAC;QACxC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,qBAAqB,CAAC,IAAI,KAAK,CAAC,+BAA+B,CAAC,EAAE;gBAChE,MAAM,EAAE,SAAS;gBACjB,OAAO,EAAE,iBAAiB;gBAC1B,SAAS,EAAE,gBAAgB;gBAC3B,QAAQ,EAAE,SAAS;gBACnB,OAAO,EAAE;oBACP,WAAW;oBACX,cAAc;oBACd,MAAM,EAAE,KAAK,CAAC,MAAM;oBACpB,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC;iBACzB;aACF,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,MAAM,GAAG,GACP,YAAY,CAAC,GAAG,IAAI,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;IACzF,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC;AAC7C,CAAC","sourcesContent":["import { existsSync } from \"fs\";\nimport { reportUserFacingError } from \"../observability/sentry.js\";\nimport type { SandboxConfig, SandboxCredentialCapabilities } from \"../sandbox/types.js\";\nimport type { ResolvedVault, ResolvedVaultMount, VaultInjection } from \"./types.js\";\n\nexport type { VaultInjection } from \"./types.js\";\n\nexport function resolveVaultInjection(options: {\n  vault: ResolvedVault | undefined;\n  capabilities: SandboxCredentialCapabilities;\n  sandboxType: SandboxConfig[\"type\"];\n  conversationId: string;\n}): VaultInjection {\n  const { vault, capabilities, sandboxType, conversationId } = options;\n  if (vault && vault.mounts.length > 0 && !capabilities.fileMounts) {\n    throw new Error(`Sandbox type \"${sandboxType}\" does not support vault file mounts`);\n  }\n\n  const mounts: ResolvedVaultMount[] = [];\n  for (const mount of vault?.mounts ?? []) {\n    if (!existsSync(mount.source)) {\n      reportUserFacingError(new Error(\"Vault mount source is missing\"), {\n        domain: \"sandbox\",\n        surface: \"vault_injection\",\n        operation: \"resolve_mounts\",\n        severity: \"warning\",\n        context: {\n          sandboxType,\n          conversationId,\n          target: mount.target,\n          hasVault: Boolean(vault),\n        },\n      });\n      continue;\n    }\n    mounts.push({ source: mount.source, target: mount.target });\n  }\n\n  const env =\n    capabilities.env && vault && Object.keys(vault.env).length > 0 ? vault.env : undefined;\n  return { ...(env ? { env } : {}), mounts };\n}\n"]}
+{"version":3,"file":"injection.js","sourceRoot":"","sources":["../../src/vault/injection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAOnE,MAAM,UAAU,qBAAqB,CAAC,OAMrC;IACC,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC9D,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;QACjE,MAAM,IAAI,KAAK,CAAC,iBAAiB,WAAW,sCAAsC,CAAC,CAAC;IACtF,CAAC;IAED,MAAM,MAAM,GAAyB,EAAE,CAAC;IACxC,KAAK,MAAM,KAAK,IAAI,KAAK,EAAE,MAAM,IAAI,EAAE,EAAE,CAAC;QACxC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,qBAAqB,CAAC,IAAI,KAAK,CAAC,+BAA+B,CAAC,EAAE;gBAChE,MAAM,EAAE,SAAS;gBACjB,OAAO,EAAE,iBAAiB;gBAC1B,SAAS,EAAE,gBAAgB;gBAC3B,QAAQ,EAAE,SAAS;gBACnB,OAAO,EAAE;oBACP,WAAW;oBACX,cAAc,EAAE,OAAO,CAAC,cAAc;oBACtC,MAAM,EAAE,KAAK,CAAC,MAAM;oBACpB,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC;iBACzB;aACF,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,MAAM,GAAG,GACP,YAAY,CAAC,GAAG,IAAI,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;IACzF,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC;AAC7C,CAAC","sourcesContent":["import { existsSync } from \"fs\";\nimport { reportUserFacingError } from \"../observability/sentry.js\";\nimport type { SandboxConfig, SandboxCredentialCapabilities } from \"../sandbox/types.js\";\nimport type { OfficeAddress } from \"../types.js\";\nimport type { ResolvedVault, ResolvedVaultMount, VaultInjection } from \"./types.js\";\n\nexport type { VaultInjection } from \"./types.js\";\n\nexport function resolveVaultInjection(options: {\n  vault: ResolvedVault | undefined;\n  capabilities: SandboxCredentialCapabilities;\n  sandboxType: SandboxConfig[\"type\"];\n  /** Diagnostic identity for error reports only; no injection decision reads it. */\n  address: OfficeAddress;\n}): VaultInjection {\n  const { vault, capabilities, sandboxType, address } = options;\n  if (vault && vault.mounts.length > 0 && !capabilities.fileMounts) {\n    throw new Error(`Sandbox type \"${sandboxType}\" does not support vault file mounts`);\n  }\n\n  const mounts: ResolvedVaultMount[] = [];\n  for (const mount of vault?.mounts ?? []) {\n    if (!existsSync(mount.source)) {\n      reportUserFacingError(new Error(\"Vault mount source is missing\"), {\n        domain: \"sandbox\",\n        surface: \"vault_injection\",\n        operation: \"resolve_mounts\",\n        severity: \"warning\",\n        context: {\n          sandboxType,\n          conversationId: address.conversationId,\n          target: mount.target,\n          hasVault: Boolean(vault),\n        },\n      });\n      continue;\n    }\n    mounts.push({ source: mount.source, target: mount.target });\n  }\n\n  const env =\n    capabilities.env && vault && Object.keys(vault.env).length > 0 ? vault.env : undefined;\n  return { ...(env ? { env } : {}), mounts };\n}\n"]}

package/dist/web/admin/portal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"portal.d.ts","sourceRoot":"","sources":["../../../src/web/admin/portal.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAG5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAkCvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,YAAY,EAAE,kBAAkB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAClF,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAWtD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,cAAc,EACnB,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,aAAa,GACtB,OAAO,CAAC,OAAO,CAAC,CA6BlB;AAmJD,UAAU,sBAAsB;IAC9B,OAAO,EAAE,aAAa,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,MAAM,EACnB,iBAAiB,EAAE,MAAM,EACzB,KAAK,EAAE,UAAU,GAChB,sBAAsB,CAexB;AA6iCD,UAAU,UAAU;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,QAAQ,GAAG,cAAc,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAwBD,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,UAAU,EAAE,CAuB/F;AA6JD;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAiB9E"}
+{"version":3,"file":"portal.d.ts","sourceRoot":"","sources":["../../../src/web/admin/portal.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAG5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAiCvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,YAAY,EAAE,kBAAkB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAClF,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAWtD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,cAAc,EACnB,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,aAAa,GACtB,OAAO,CAAC,OAAO,CAAC,CA6BlB;AAmJD,UAAU,sBAAsB;IAC9B,OAAO,EAAE,aAAa,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,MAAM,EACnB,iBAAiB,EAAE,MAAM,EACzB,KAAK,EAAE,UAAU,GAChB,sBAAsB,CAexB;AAuiCD,UAAU,UAAU;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,QAAQ,GAAG,cAAc,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAwBD,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,UAAU,EAAE,CAuB/F;AAmJD;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAiB9E"}

package/dist/web/admin/portal.js

@@ -3,7 +3,6 @@ import { basename, join, resolve as pathResolve, sep as pathSep } from "path";
 import { MikanModels, parseFrontmatter, SessionStore } from "../../harness/index.js";
 import { loadConversationAutoReplyConfig, loadConversationWorkspaceOverride, loadGlobalSettings, resolveConversationSettings, saveConversationAutoReplyConfig, } from "../../config.js";
 import { applyConversationSettings, applyConversationWorkspacePolicy, applyGlobalSettings, applyGlobalWorkspacePolicy, } from "../../settings-mutation.js";
-import { effectiveStateDir } from "../../cli/arg-grammar.js";
 import { addPackage, inspectConversationPackages, refreshPackage, removePackage, } from "../../packages/index.js";
 import { escapeHtml } from "../../utils/html.js";
 import { readRawBody } from "../../utils/http-body.js";
@@ -14,9 +13,7 @@ import { credentialAuthorizationKey } from "../../sandbox/identity.js";
 import { resolveWorkspaceProjection } from "../../workspace-projection/index.js";
 import { sharedVaultKey } from "../../vault/index.js";
 import { modelKey, resolveAdminModelAccessStatuses } from "./provider-models.js";
-import { sameOffice } from "../../office-address.js";
-import { assertPlatformName, conversationOfficeDir, createOfficeAddress, } from "../../office-address.js";
-import { listRegisteredOffices } from "../../office-registry.js";
+import { assertPlatformName, createOfficeAddress, listRegisteredOffices, sameOffice, } from "../../office/index.js";
 // ── Handler ────────────────────────────────────────────────────────────────────
 export async function handleAdminRequest(req, res, url, services) {
     if (!url.pathname.startsWith("/admin"))
@@ -200,12 +197,12 @@ function resolveTargetConversation(body, token) {
     const platform = typeof body.platform === "string" ? body.platform.trim() : "";
     return resolveConversationScope(requested, platform, token);
 }
-function requireAdminWorkingDir(res, services) {
-    if (!services.workingDir) {
+function requireAdminWorkspace(res, services) {
+    if (!services.workspace) {
         jsonRes(res, 503, { error: "Working directory not available" });
         return null;
     }
-    return services.workingDir;
+    return services.workspace;
 }
 // ── API handlers ───────────────────────────────────────────────────────────────
 function serveMe(res, token) {
@@ -223,14 +220,14 @@ function serveMe(res, token) {
  * mapping — instead of scanning the workspace. Offices whose directory
  * disappeared are filtered out.
  */
-function listAdminOffices(workingDir) {
-    return listRegisteredOffices()
-        .filter((office) => existsSync(conversationOfficeDir(workingDir, office)))
+function listAdminOffices(workspace) {
+    return listRegisteredOffices(workspace.stateDir)
+        .filter((office) => existsSync(workspace.office(office).dir))
         .map((office) => createOfficeAddress(office.platform, office.conversationId))
         .toSorted((a, b) => a.platform.localeCompare(b.platform) || a.conversationId.localeCompare(b.conversationId));
 }
-function conversationLastActivity(workingDir, office) {
-    const dir = conversationOfficeDir(workingDir, office);
+function conversationLastActivity(workspace, office) {
+    const dir = workspace.office(office).dir;
     if (!existsSync(dir))
         return null;
     let latest = 0;
@@ -271,31 +268,31 @@ function conversationDisplayLabel(services, office) {
     return `${office.platform}:${office.conversationId}`;
 }
 function serveConversationsList(res, services) {
-    const workingDir = requireAdminWorkingDir(res, services);
-    if (!workingDir)
+    const workspace = requireAdminWorkspace(res, services);
+    if (!workspace)
         return;
     const running = services.runtime?.getRunningSessions() ?? [];
-    const conversations = listAdminOffices(workingDir).map((office) => ({
+    const conversations = listAdminOffices(workspace).map((office) => ({
         platform: office.platform,
         conversationId: office.conversationId,
         label: conversationDisplayLabel(services, office),
         running: running.some((session) => sameOffice(session.address, office)),
-        lastActivityAt: conversationLastActivity(workingDir, office),
+        lastActivityAt: conversationLastActivity(workspace, office),
     }));
     jsonRes(res, 200, { conversations });
 }
 function serveSessionUsage(res, services) {
-    const workingDir = requireAdminWorkingDir(res, services);
-    if (!workingDir)
+    const workspace = requireAdminWorkspace(res, services);
+    if (!workspace)
         return;
-    const rows = listAdminOffices(workingDir)
-        .flatMap((office) => listConversationSessionUsage(workingDir, office, conversationDisplayLabel(services, office)))
+    const rows = listAdminOffices(workspace)
+        .flatMap((office) => listConversationSessionUsage(workspace, office, conversationDisplayLabel(services, office)))
         .toSorted((a, b) => b.total - a.total)
         .slice(0, 20);
     jsonRes(res, 200, { sessions: rows });
 }
-function listConversationSessionUsage(workingDir, office, label) {
-    const sessionDir = join(conversationOfficeDir(workingDir, office), "sessions");
+function listConversationSessionUsage(workspace, office, label) {
+    const sessionDir = workspace.office(office).sessionsDir;
     try {
         return readdirSync(sessionDir, { withFileTypes: true })
             .filter((entry) => entry.isFile() && entry.name.endsWith(".jsonl"))
@@ -359,12 +356,12 @@ function emptyBucket(date) {
 }
 /** Per-conversation daily token usage over the last N days (N clamped to 1..7). */
 function serveConversationUsage(res, url, services) {
-    const workingDir = requireAdminWorkingDir(res, services);
-    if (!workingDir)
+    const workspace = requireAdminWorkspace(res, services);
+    if (!workspace)
         return;
     const conversationId = (url.searchParams.get("conversationId") ?? "").trim();
     const platformParam = (url.searchParams.get("platform") ?? "").trim();
-    const office = listAdminOffices(workingDir).find((candidate) => candidate.conversationId === conversationId &&
+    const office = listAdminOffices(workspace).find((candidate) => candidate.conversationId === conversationId &&
         (!platformParam || candidate.platform === platformParam));
     if (!office) {
         jsonRes(res, 400, { error: "Unknown conversationId" });
@@ -385,7 +382,7 @@ function serveConversationUsage(res, url, services) {
     const cutoff = new Date(today);
     cutoff.setDate(today.getDate() - (days - 1));
     const flags = { hasOlder: false };
-    const sessionDir = join(conversationOfficeDir(workingDir, office), "sessions");
+    const sessionDir = workspace.office(office).sessionsDir;
     try {
         for (const entry of readdirSync(sessionDir, { withFileTypes: true })) {
             if (!entry.isFile() || !entry.name.endsWith(".jsonl"))
@@ -461,8 +458,8 @@ function accumulateSessionUsageByDay(sessionFile, cutoff, buckets, flags) {
     }
 }
 function serveConversationState(res, url, services, token) {
-    const workingDir = requireAdminWorkingDir(res, services);
-    if (!workingDir)
+    const workspace = requireAdminWorkspace(res, services);
+    if (!workspace)
         return;
     const scope = resolveConversationFromQuery(url, token);
     if (scope.error) {
@@ -470,15 +467,12 @@ function serveConversationState(res, url, services, token) {
         return;
     }
     const conversationId = scope.conversationId;
-    const dir = conversationOfficeDir(workingDir, scope.address);
+    const office = workspace.office(scope.address);
     const globalConfig = loadGlobalSettings();
-    const conversationConfig = resolveConversationSettings({
-        address: scope.address,
-        conversationDir: dir,
-    });
-    const conversationWorkspace = resolveWorkspaceProjection(workingDir, scope.address);
+    const conversationConfig = resolveConversationSettings(office);
+    const conversationWorkspace = resolveWorkspaceProjection(office);
     const globalWorkspaceSettings = globalConfig.sandbox?.workspace;
-    const autoReply = loadConversationAutoReplyConfig(dir);
+    const autoReply = loadConversationAutoReplyConfig(office.dir);
     jsonRes(res, 200, {
         conversationId,
         provider: conversationConfig.provider,
@@ -489,7 +483,7 @@ function serveConversationState(res, url, services, token) {
         globalThinkingLevel: globalConfig.thinkingLevel,
         workspaceDoorPolicy: conversationWorkspace.doorPolicy,
         workspaceLayout: conversationWorkspace.layout,
-        workspaceOverride: doorPolicyChoiceKey(loadConversationWorkspaceOverride({ address: scope.address, conversationDir: dir })),
+        workspaceOverride: doorPolicyChoiceKey(loadConversationWorkspaceOverride(office)),
         globalWorkspaceDoorPolicy: globalWorkspaceSettings?.doorPolicy ?? "isolated",
         globalWorkspaceLayout: globalWorkspaceSettings?.layout ?? "conversation",
         autoReplyEnabled: autoReply.enabled,
@@ -560,11 +554,11 @@ function serveConversationModelUpdate(res, body, services, token) {
         jsonRes(res, 403, { error: scope.error });
         return;
     }
-    const workingDir = requireAdminWorkingDir(res, services);
-    if (!workingDir)
+    const workspace = requireAdminWorkspace(res, services);
+    if (!workspace)
         return;
     try {
-        const result = applyConversationSettings(services.runtime, workingDir, scope.address, {
+        const result = applyConversationSettings(services.runtime, workspace.office(scope.address), {
             provider,
             model,
             ...(thinkingLevel ? { thinkingLevel } : {}),
@@ -616,11 +610,11 @@ function serveConversationSandboxUpdate(res, body, services, token) {
         jsonRes(res, 403, { error: scope.error });
         return;
     }
-    const workingDir = requireAdminWorkingDir(res, services);
-    if (!workingDir)
+    const workspace = requireAdminWorkspace(res, services);
+    if (!workspace)
         return;
     try {
-        const result = applyConversationWorkspacePolicy(services.runtime, workingDir, scope.address, parsed.choice);
+        const result = applyConversationWorkspacePolicy(services.runtime, workspace.office(scope.address), parsed.choice);
         if (!result.ok) {
             jsonRes(res, 409, { error: "Conversation is busy; retry when the current run finishes" });
             return;
@@ -658,11 +652,11 @@ function serveConversationSlackUpdate(res, body, services, token) {
         jsonRes(res, 403, { error: scope.error });
         return;
     }
-    const workingDir = requireAdminWorkingDir(res, services);
-    if (!workingDir)
+    const workspace = requireAdminWorkspace(res, services);
+    if (!workspace)
         return;
     try {
-        applyConversationSettings(services.runtime, workingDir, scope.address, {
+        applyConversationSettings(services.runtime, workspace.office(scope.address), {
             slack: { replyMode },
         });
         jsonRes(res, 200, { ok: true });
@@ -684,10 +678,10 @@ function serveConversationAutoReplyUpdate(res, body, services, token) {
         jsonRes(res, 403, { error: scope.error });
         return;
     }
-    const workingDir = requireAdminWorkingDir(res, services);
-    if (!workingDir)
+    const workspace = requireAdminWorkspace(res, services);
+    if (!workspace)
         return;
-    const dir = conversationOfficeDir(workingDir, scope.address);
+    const dir = workspace.office(scope.address).dir;
     try {
         const existing = loadConversationAutoReplyConfig(dir);
         saveConversationAutoReplyConfig(dir, {
@@ -706,8 +700,8 @@ function serveConversationSessionLink(res, body, services, token) {
         jsonRes(res, 403, { error: scope.error });
         return;
     }
-    const workingDir = requireAdminWorkingDir(res, services);
-    if (!workingDir)
+    const workspace = requireAdminWorkspace(res, services);
+    if (!workspace)
         return;
     if (!services.sessionViewTokenStore) {
         jsonRes(res, 503, { error: "Session view token store not available" });
@@ -719,7 +713,7 @@ function serveConversationSessionLink(res, body, services, token) {
         });
         return;
     }
-    const sessionFile = resolveExistingSessionFile(conversationOfficeDir(workingDir, scope.address), scope.conversationId);
+    const sessionFile = resolveExistingSessionFile(workspace.office(scope.address).dir, scope.conversationId);
     if (!sessionFile) {
         jsonRes(res, 404, { error: "No session file found for this conversation" });
         return;
@@ -957,10 +951,10 @@ function serveWorkspaceTree(res, url, services, token) {
         jsonRes(res, 403, { error: scope.error });
         return;
     }
-    const workingDir = requireAdminWorkingDir(res, services);
-    if (!workingDir)
+    const workspace = requireAdminWorkspace(res, services);
+    if (!workspace)
         return;
-    const convDir = conversationOfficeDir(workingDir, scope.address);
+    const convDir = workspace.office(scope.address).dir;
     if (!existsSync(convDir)) {
         jsonRes(res, 200, { conversationId: scope.conversationId, tree: null });
         return;
@@ -1051,8 +1045,8 @@ function serveWorkspaceFile(res, url, services, token) {
         jsonRes(res, 403, { error: scope.error });
         return;
     }
-    const workingDir = requireAdminWorkingDir(res, services);
-    if (!workingDir)
+    const workspace = requireAdminWorkspace(res, services);
+    if (!workspace)
         return;
     const requestedPath = (url.searchParams.get("path") ?? "").trim();
     if (!requestedPath) {
@@ -1063,7 +1057,7 @@ function serveWorkspaceFile(res, url, services, token) {
         jsonRes(res, 403, { error: "Workspace path is not exposed" });
         return;
     }
-    const convDir = conversationOfficeDir(workingDir, scope.address);
+    const convDir = workspace.office(scope.address).dir;
     const safe = safeJoinUnderRoot(convDir, requestedPath);
     if (safe.error) {
         jsonRes(res, 400, { error: safe.error });
@@ -1130,14 +1124,12 @@ async function servePackagesList(res, url, services, token) {
         jsonRes(res, 403, { error: scope.error });
         return;
     }
-    const workingDir = requireAdminWorkingDir(res, services);
-    if (!workingDir)
+    const workspace = requireAdminWorkspace(res, services);
+    if (!workspace)
         return;
     try {
         const inventory = await inspectConversationPackages({
-            address: scope.address,
-            stateDir: effectiveStateDir(),
-            conversationDir: conversationOfficeDir(workingDir, scope.address),
+            office: workspace.office(scope.address),
         });
         jsonRes(res, 200, { conversationId: scope.conversationId, ...inventory });
     }
@@ -1167,14 +1159,11 @@ function servePackageMutation(res, body, services, token) {
         jsonRes(res, 403, { error: scope.error });
         return;
     }
-    const workingDir = requireAdminWorkingDir(res, services);
-    if (!workingDir)
+    const workspace = requireAdminWorkspace(res, services);
+    if (!workspace)
         return;
     const context = {
-        address: scope.address,
-        stateDir: effectiveStateDir(),
-        conversationDir: conversationOfficeDir(workingDir, scope.address),
-        workingDir,
+        office: workspace.office(scope.address),
         runtime: services.runtime,
     };
     try {
@@ -1203,11 +1192,11 @@ function serveSkillsList(res, url, services, token) {
         jsonRes(res, 403, { error: scope.error });
         return;
     }
-    const workingDir = requireAdminWorkingDir(res, services);
-    if (!workingDir)
+    const workspace = requireAdminWorkspace(res, services);
+    if (!workspace)
         return;
-    const global = readSkillsFromDir(join(workingDir, "skills"), "global");
-    const conversation = readSkillsFromDir(join(conversationOfficeDir(workingDir, scope.address), "skills"), "conversation");
+    const global = readSkillsFromDir(workspace.skillsDir, "global");
+    const conversation = readSkillsFromDir(workspace.office(scope.address).skillsDir, "conversation");
     jsonRes(res, 200, {
         conversationId: scope.conversationId,
         skills: [...global, ...conversation],
@@ -1219,8 +1208,8 @@ function serveSkillFile(res, url, services, token) {
         jsonRes(res, 403, { error: scope.error });
         return;
     }
-    const workingDir = requireAdminWorkingDir(res, services);
-    if (!workingDir)
+    const workspace = requireAdminWorkspace(res, services);
+    if (!workspace)
         return;
     const source = (url.searchParams.get("source") ?? "").trim();
     const directory = (url.searchParams.get("directory") ?? "").trim();
@@ -1235,9 +1224,7 @@ function serveSkillFile(res, url, services, token) {
         jsonRes(res, 400, { error: "Invalid skill directory" });
         return;
     }
-    const skillsRoot = source === "global"
-        ? join(workingDir, "skills")
-        : join(conversationOfficeDir(workingDir, scope.address), "skills");
+    const skillsRoot = source === "global" ? workspace.skillsDir : workspace.office(scope.address).skillsDir;
     const safe = safeJoinUnderRoot(skillsRoot, join(directory, "SKILL.md"));
     if (safe.error) {
         jsonRes(res, 400, { error: safe.error });
@@ -1297,15 +1284,15 @@ async function serveConversationEventsList(res, url, services, token) {
     jsonRes(res, 200, { conversationId: scope.conversationId, events });
 }
 function serveEventsFile(res, url, services) {
-    const workingDir = requireAdminWorkingDir(res, services);
-    if (!workingDir)
+    const workspace = requireAdminWorkspace(res, services);
+    if (!workspace)
         return;
     const name = (url.searchParams.get("name") ?? "").trim();
     if (!name || name.includes("/") || name.includes("\\") || name.includes("..")) {
         jsonRes(res, 400, { error: "Invalid name" });
         return;
     }
-    const filePath = join(workingDir, "events", name);
+    const filePath = join(workspace.eventsDir, name);
     let stats;
     try {
         stats = statSync(filePath);