hoi4-agent-tools 2.3.8 → 2.3.10

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 2.3.10 - 2026-08-04
+
+- Routed focus operations to the unique discovered mod containing a requested source when a stale client root points at another mod.
+- Added regression coverage for a stale client context requesting Ireland's focus source without a workspace selector.
+
+## 2.3.9 - 2026-08-04
+
+- Bound omitted-workspace tool calls to the connected MCP client's active filesystem root instead of the server process's original working directory.
+- Added cross-workspace regression coverage proving an Ireland client root cannot be misdirected to a Slop Redux server working directory.
+
 ## 2.3.8 - 2026-08-04
 
 - Regenerated the clean-install lockfile with the release-pinned npm so optional native runtime metadata is complete in CI.

package/dist/hoi4_agent_tools/core/workspace.js

@@ -249,6 +249,42 @@ export class WorkspaceResolver {
             return workspaces[0].id;
         throw new ServiceError('WORKSPACE_CONTEXT_REQUIRED', 'The MCP working directory does not identify one writable mod workspace', { currentDirectory, workspaceIds: workspaces.map(({ id }) => id) });
     }
+    /** Resolve the active mod from filesystem roots advertised by the connected MCP client. */
+    async resolveClientWorkspaceId(rootPaths, principal) {
+        const canonicalRoots = await Promise.all(rootPaths.map((rootPath) => canonicalPath(rootPath)));
+        const matches = this.list(principal).filter((workspace) => workspace.registration.kind === 'mod' &&
+            canonicalRoots.some((rootPath) => isWithin(workspace.modRoot, rootPath) || isWithin(rootPath, workspace.modRoot)));
+        if (matches.length === 1)
+            return matches[0].id;
+        if (matches.length === 0) {
+            throw new ServiceError('WORKSPACE_CONTEXT_NOT_FOUND', 'The active MCP client roots do not identify a registered HOI4 mod workspace');
+        }
+        throw new ServiceError('WORKSPACE_CONTEXT_AMBIGUOUS', 'The active MCP client roots identify more than one HOI4 mod workspace', { workspaceIds: matches.map(({ id }) => id) });
+    }
+    /** Find one mod containing an existing source path when a stale client root selected another mod. */
+    async resolveUniqueModSourceWorkspaceId(relativePath, principal, signal) {
+        const matches = [];
+        for (const workspace of this.list(principal)) {
+            signal?.throwIfAborted();
+            if (workspace.registration.kind !== 'mod')
+                continue;
+            try {
+                const resolved = await this.resolvePath(workspace.id, relativePath, 'read', ['mod'], principal);
+                signal?.throwIfAborted();
+                if ((await lstat(resolved.path)).isFile())
+                    matches.push(workspace.id);
+            }
+            catch (error) {
+                if (error.name === 'AbortError')
+                    throw error;
+            }
+        }
+        if (matches.length === 0)
+            return undefined;
+        if (matches.length === 1)
+            return matches[0];
+        throw new ServiceError('WORKSPACE_SOURCE_AMBIGUOUS', `The requested source exists in more than one mod workspace: ${relativePath}`, { relativePath, workspaceIds: matches });
+    }
     resolveWorkspaceId(workspaceId, principal) {
         if (workspaceId === CURRENT_WORKSPACE_ID)
             return this.resolveCurrentWorkspaceId(principal);

package/dist/hoi4_agent_tools/mcp/server/base-tools.js

@@ -1,4 +1,5 @@
 import { boundedSourceHashEvidence, publicArtifactLink } from '../../core/artifacts.js';
+import { lstat } from 'node:fs/promises';
 import { canonicalJson } from '../../core/canonical.js';
 import { exactChangedFilePatterns, focusDomainScanPatterns, } from '../../core/domain-scan-patterns.js';
 import { ServiceError } from '../../core/result.js';
@@ -8,6 +9,28 @@ import { importContinuousFocusPalettes, importFocusTrees, layoutFocusTreeAsync,
 import { ScriptedGuiStudio } from '../../gui/index.js';
 import { AgentNudger, attributeMapValidationDiagnostics } from '../../map/index.js';
 import { PACKAGE_VERSION } from '../../version.js';
+export async function resolveServerWorkspaceId(engine, context, workspaceId, signal) {
+    if (workspaceId === 'current' && context.resolveCurrentWorkspaceId !== undefined) {
+        return context.resolveCurrentWorkspaceId(signal);
+    }
+    return engine.resolver.resolveWorkspaceId(workspaceId, context.principal);
+}
+export async function resolveServerWorkspaceForSource(engine, context, workspaceId, relativePath, signal) {
+    const resolvedWorkspaceId = await resolveServerWorkspaceId(engine, context, workspaceId, signal);
+    if (workspaceId !== 'current' || relativePath === undefined)
+        return resolvedWorkspaceId;
+    try {
+        const resolved = await engine.resolver.resolvePath(resolvedWorkspaceId, relativePath, 'read', ['mod'], context.principal);
+        signal?.throwIfAborted();
+        if ((await lstat(resolved.path)).isFile())
+            return resolvedWorkspaceId;
+    }
+    catch (error) {
+        if (error.name === 'AbortError')
+            throw error;
+    }
+    return ((await engine.resolver.resolveUniqueModSourceWorkspaceId(relativePath, context.principal, signal)) ?? resolvedWorkspaceId);
+}
 export function requireServerScope(context, scope) {
     if (context.scopes !== undefined && !context.scopes.includes(scope)) {
         throw new ServiceError('AUTH_SCOPE_REQUIRED', `This operation requires the ${scope} scope`, {

package/dist/hoi4_agent_tools/mcp/server/create.js

@@ -1,4 +1,5 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { fileURLToPath } from 'node:url';
 import { PACKAGE_NAME, PACKAGE_VERSION } from '../../version.js';
 import { registerFocusTools } from '../tools/focus.js';
 import { registerGuiTools } from '../tools/gui.js';
@@ -17,12 +18,32 @@ export function createMcpServer(engine, context = {}) {
         capabilities: { logging: {} },
         instructions: SERVER_INSTRUCTIONS,
     });
-    registerFocusTools(server, engine, context);
-    registerGuiTools(server, engine, context);
-    registerMapTools(server, engine, context);
-    registerEventTools(server, engine, context);
-    registerTechnologyTools(server, engine, context);
-    registerProbabilityTools(server, engine, context);
-    registerMcpResources(server, engine, context);
+    const serverContext = {
+        ...context,
+        resolveCurrentWorkspaceId: async (signal) => {
+            const capabilities = server.server.getClientCapabilities();
+            if (capabilities?.roots === undefined) {
+                return engine.resolver.resolveCurrentWorkspaceId(context.principal);
+            }
+            const listed = await server.server.listRoots(undefined, signal === undefined ? undefined : { signal });
+            const rootPaths = listed.roots.flatMap(({ uri }) => {
+                try {
+                    const parsed = new URL(uri);
+                    return parsed.protocol === 'file:' ? [fileURLToPath(parsed)] : [];
+                }
+                catch {
+                    return [];
+                }
+            });
+            return engine.resolver.resolveClientWorkspaceId(rootPaths, context.principal);
+        },
+    };
+    registerFocusTools(server, engine, serverContext);
+    registerGuiTools(server, engine, serverContext);
+    registerMapTools(server, engine, serverContext);
+    registerEventTools(server, engine, serverContext);
+    registerTechnologyTools(server, engine, serverContext);
+    registerProbabilityTools(server, engine, serverContext);
+    registerMcpResources(server, engine, serverContext);
     return server;
 }

package/dist/hoi4_agent_tools/mcp/tools/chaosx.js

@@ -11,6 +11,7 @@ import { GuiAssetCatalog } from '../../gui/assets.js';
 import { ScriptedGuiStudio } from '../../gui/index.js';
 import { buildGuiSourceGraph } from '../../gui/source-graph.js';
 import { PACKAGE_VERSION } from '../../version.js';
+import { resolveServerWorkspaceId } from '../server/base-tools.js';
 import { compactValidatedInputSchema } from '../server/context-schemas.js';
 import { nonNegativeIntegerSchema, sha256Schema } from '../server/output-schemas.js';
 import { progressReporter } from '../server/progress.js';
@@ -341,7 +342,7 @@ export function registerChaosxTools(server, engine, context) {
         outputSchema: chaosxVisualRevisionOutput,
         annotations: readOnly,
     }, async (input, extra) => {
-        const workspaceId = engine.resolver.resolveWorkspaceId(input.workspaceId, context.principal);
+        const workspaceId = await resolveServerWorkspaceId(engine, context, input.workspaceId, extra.signal);
         try {
             const progress = progressReporter(extra);
             await progress.report(0, 2, 'Checking ChaosX scripted-GUI sources');
@@ -379,7 +380,7 @@ export function registerChaosxTools(server, engine, context) {
         outputSchema: chaosxCountryAssetsOutput,
         annotations: artifactProducing,
     }, async (input, extra) => {
-        const workspaceId = engine.resolver.resolveWorkspaceId(input.workspaceId, context.principal);
+        const workspaceId = await resolveServerWorkspaceId(engine, context, input.workspaceId, extra.signal);
         try {
             const progress = progressReporter(extra);
             await progress.report(0, 3, 'Resolving ChaosX country assets');

package/dist/hoi4_agent_tools/mcp/tools/event.js

@@ -9,6 +9,7 @@ import { compactValidatedInputSchema } from '../server/context-schemas.js';
 import { nonNegativeIntegerSchema, sha256Schema } from '../server/output-schemas.js';
 import { progressReporter } from '../server/progress.js';
 import { errorResult, setInlineFilesScanned, strictOperationResultSchema, toolResult, } from '../server/result.js';
+import { resolveServerWorkspaceId } from '../server/base-tools.js';
 const nestedSelectorSchema = compactValidatedInputSchema(eventSelectorSchema, 'Event selector; see docs/events.md.');
 const nestedStateSubjectSchema = compactValidatedInputSchema(eventStateSubjectSchema, 'State kind and name.');
 const nestedImpactSubjectSchema = compactValidatedInputSchema(eventImpactSubjectSchema, 'Impact kind and name.');
@@ -311,7 +312,7 @@ export function registerEventTools(server, engine, context) {
         outputSchema: eventInspectOutputSchema,
         annotations: readOnlyEventTool,
     }, async (input, extra) => {
-        const workspaceId = engine.resolver.resolveWorkspaceId(input.workspaceId, context.principal);
+        const workspaceId = await resolveServerWorkspaceId(engine, context, input.workspaceId, extra.signal);
         try {
             const progress = progressReporter(extra);
             await progress.report(0, 3, 'Analyzing event chain');
@@ -350,7 +351,7 @@ export function registerEventTools(server, engine, context) {
         outputSchema: eventRenderOutputSchema,
         annotations: readOnlyEventTool,
     }, async (input, extra) => {
-        const workspaceId = engine.resolver.resolveWorkspaceId(input.workspaceId, context.principal);
+        const workspaceId = await resolveServerWorkspaceId(engine, context, input.workspaceId, extra.signal);
         try {
             const progress = progressReporter(extra);
             await progress.report(0, 3, 'Rendering event-chain view');
@@ -396,7 +397,7 @@ export function registerEventTools(server, engine, context) {
         outputSchema: eventCompareOutputSchema,
         annotations: readOnlyEventTool,
     }, async (input, extra) => {
-        const workspaceId = engine.resolver.resolveWorkspaceId(input.workspaceId, context.principal);
+        const workspaceId = await resolveServerWorkspaceId(engine, context, input.workspaceId, extra.signal);
         try {
             const progress = progressReporter(extra);
             await progress.report(0, 3, 'Comparing event-chain graphs');

package/dist/hoi4_agent_tools/mcp/tools/focus.js

@@ -13,7 +13,7 @@ import { PACKAGE_VERSION } from '../../version.js';
 import { nonNegativeIntegerSchema, renderHashesSchema, sha256Schema, } from '../server/output-schemas.js';
 import { progressReporter } from '../server/progress.js';
 import { errorResult, setInlineFilesScanned, strictOperationResultSchema, toolResult, } from '../server/result.js';
-import { requireServerScope } from '../server/base-tools.js';
+import { requireServerScope, resolveServerWorkspaceForSource, } from '../server/base-tools.js';
 import { compactValidatedInputSchema } from '../server/context-schemas.js';
 import { autonomousFailureContext, autonomousResultArtifacts, executePlannedTransaction, } from '../server/transaction-execution.js';
 const focusInspectOutputSchema = strictOperationResultSchema(z
@@ -347,7 +347,7 @@ export async function computeFocusVisualRevisions(engine, context, workspaceId,
 }
 async function executeFocusVisualTool(engine, workbench, context, input, extra, rasterize) {
     const { workspaceId: requestedWorkspaceId, relativePath } = input;
-    const workspaceId = engine.resolver.resolveWorkspaceId(requestedWorkspaceId, context.principal);
+    const workspaceId = await resolveServerWorkspaceForSource(engine, context, requestedWorkspaceId, relativePath, extra.signal);
     const outputName = rasterize ? 'raster' : 'render';
     try {
         const progress = progressReporter(extra);
@@ -607,7 +607,7 @@ export function registerFocusTools(server, engine, context) {
         annotations: artifactProducing,
     }, async (input, extra) => {
         const { workspaceId: requestedWorkspaceId, relativePath } = input;
-        const workspaceId = engine.resolver.resolveWorkspaceId(requestedWorkspaceId, context.principal);
+        const workspaceId = await resolveServerWorkspaceForSource(engine, context, requestedWorkspaceId, relativePath, extra.signal);
         try {
             const progress = progressReporter(extra);
             await progress.report(0, 3, 'Building shared workspace index');
@@ -845,7 +845,7 @@ export function registerFocusTools(server, engine, context) {
         },
     }, async (input, extra) => {
         const { workspaceId: requestedWorkspaceId, relativePath, createIfMissing, horizontalSpacing, verticalSpacing, padding, reviewScale, } = input;
-        const workspaceId = engine.resolver.resolveWorkspaceId(requestedWorkspaceId, context.principal);
+        const workspaceId = await resolveServerWorkspaceForSource(engine, context, requestedWorkspaceId, relativePath, extra.signal);
         try {
             requireServerScope(context, 'hoi4:write');
             const progress = progressReporter(extra);

package/dist/hoi4_agent_tools/mcp/tools/gui.js

@@ -8,7 +8,7 @@ import { GuiHelperDocumentSchema, GuiPreviewScenarioSchema, GUI_TEXT_PACKAGE_MAX
 import { encodeGuiInspectionArtifact, projectGuiGraphForArtifact, } from '../../gui/inspection-artifact.js';
 import { workspaceIdSchema, workspaceRelativePathSchema } from '../../schemas/common.js';
 import { PACKAGE_VERSION } from '../../version.js';
-import { requireServerScope } from '../server/base-tools.js';
+import { requireServerScope, resolveServerWorkspaceId, } from '../server/base-tools.js';
 import { compactValidatedInputSchema } from '../server/context-schemas.js';
 import { autonomousFailureContext, autonomousResultArtifacts, executePlannedTransaction, } from '../server/transaction-execution.js';
 import { indexSkippedSourceSchema, nonNegativeIntegerSchema, sha256Schema, } from '../server/output-schemas.js';
@@ -151,7 +151,7 @@ export function registerGuiTools(server, engine, context) {
         outputSchema: guiScanOutputSchema,
         annotations: artifactProducing,
     }, async ({ workspaceId: requestedWorkspaceId, windowName, scenario, relatedScenarios }, extra) => {
-        const workspaceId = engine.resolver.resolveWorkspaceId(requestedWorkspaceId, context.principal);
+        const workspaceId = await resolveServerWorkspaceId(engine, context, requestedWorkspaceId, extra.signal);
         try {
             const progress = progressReporter(extra);
             await progress.report(0, 3, 'Building GUI source graph');
@@ -262,7 +262,7 @@ export function registerGuiTools(server, engine, context) {
         }
     });
     const render = async (input, extra, code) => {
-        const workspaceId = engine.resolver.resolveWorkspaceId(input.workspaceId, context.principal);
+        const workspaceId = await resolveServerWorkspaceId(engine, context, input.workspaceId, extra.signal);
         const { windowName } = input;
         try {
             const progress = progressReporter(extra);
@@ -453,7 +453,7 @@ export function registerGuiTools(server, engine, context) {
             openWorldHint: false,
         },
     }, async (input, extra) => {
-        const workspaceId = engine.resolver.resolveWorkspaceId(input.workspaceId, context.principal);
+        const workspaceId = await resolveServerWorkspaceId(engine, context, input.workspaceId, extra.signal);
         const { relativePath, windowName, scenario } = input;
         try {
             requireServerScope(context, 'hoi4:write');

package/dist/hoi4_agent_tools/mcp/tools/map.js

@@ -6,7 +6,7 @@ import { AgentNudger, allocateMapIdentifiersAsync, exportProvinceGeometryRowRuns
 import { workspaceIdSchema } from '../../schemas/common.js';
 import { mapAllocationRequestSchema, mapOperationSchema } from '../../schemas/map.js';
 import { PACKAGE_VERSION } from '../../version.js';
-import { requireServerScope } from '../server/base-tools.js';
+import { requireServerScope, resolveServerWorkspaceId, } from '../server/base-tools.js';
 import { compactValidatedInputSchema } from '../server/context-schemas.js';
 import { autonomousFailureContext, autonomousResultArtifacts, executePlannedTransaction, } from '../server/transaction-execution.js';
 import { allocationEvidenceSchema, bitmapRenderHashesSchema, nonNegativeIntegerSchema, operationBlockerDataSchema, sha256Schema, } from '../server/output-schemas.js';
@@ -365,7 +365,7 @@ export function registerMapTools(server, engine, context) {
         outputSchema: mapWorkspaceInspectOutputSchema,
         annotations: artifactProducing,
     }, async ({ workspaceId: requestedWorkspaceId, provinceIds, stateIds, regionIds, allocationRequests }, extra) => {
-        const workspaceId = engine.resolver.resolveWorkspaceId(requestedWorkspaceId, context.principal);
+        const workspaceId = await resolveServerWorkspaceId(engine, context, requestedWorkspaceId, extra.signal);
         try {
             const progress = progressReporter(extra);
             await progress.report(0, 3, 'Inspecting and validating the map');
@@ -512,7 +512,7 @@ export function registerMapTools(server, engine, context) {
         outputSchema: mapRenderOutputSchema,
         annotations: artifactProducing,
     }, async ({ workspaceId: requestedWorkspaceId, layer, overlays, scale }, extra) => {
-        const workspaceId = engine.resolver.resolveWorkspaceId(requestedWorkspaceId, context.principal);
+        const workspaceId = await resolveServerWorkspaceId(engine, context, requestedWorkspaceId, extra.signal);
         try {
             const progress = progressReporter(extra);
             await progress.report(0, 3, 'Rendering offline map layer');
@@ -558,7 +558,7 @@ export function registerMapTools(server, engine, context) {
             openWorldHint: false,
         },
     }, async ({ workspaceId: requestedWorkspaceId, operations, diffScale }, extra) => {
-        const workspaceId = engine.resolver.resolveWorkspaceId(requestedWorkspaceId, context.principal);
+        const workspaceId = await resolveServerWorkspaceId(engine, context, requestedWorkspaceId, extra.signal);
         try {
             requireServerScope(context, 'hoi4:write');
             const progress = progressReporter(extra);

package/dist/hoi4_agent_tools/mcp/tools/probability.js

@@ -3,6 +3,7 @@ import { emptyServiceResult } from '../../core/result.js';
 import { ProbabilityAnalyzer, } from '../../probability/service.js';
 import { customWeightedPoolManifestSchema, probabilityAcceptanceBandSchema, probabilityAdapterIdSchema, probabilityDiagnosticThresholdsSchema, probabilityMetricSchema, probabilityOutputSchema, probabilityRenderFilterSchema, probabilityScenarioSetSchema, probabilitySamplingMethodSchema, probabilitySourceSchema, } from '../../schemas/probability.js';
 import { workspaceIdSchema } from '../../schemas/common.js';
+import { resolveServerWorkspaceId } from '../server/base-tools.js';
 import { compactValidatedInputSchema } from '../server/context-schemas.js';
 import { nonNegativeIntegerSchema, sha256Schema } from '../server/output-schemas.js';
 import { progressReporter } from '../server/progress.js';
@@ -150,9 +151,9 @@ const readOnly = {
     idempotentHint: true,
     openWorldHint: false,
 };
-function requestContext(engine, context, workspaceId, refresh, signal) {
+async function requestContext(engine, context, workspaceId, refresh, signal) {
     return {
-        workspaceId: engine.resolver.resolveWorkspaceId(workspaceId, context.principal),
+        workspaceId: await resolveServerWorkspaceId(engine, context, workspaceId, signal),
         ...(context.principal === undefined ? {} : { principal: context.principal }),
         ...(refresh === undefined ? {} : { refresh }),
         signal,
@@ -216,7 +217,7 @@ export function registerProbabilityTools(server, engine, context) {
         annotations: readOnly,
     }, async (input, extra) => {
         const progress = progressReporter(extra);
-        const base = requestContext(engine, context, input.workspaceId, input.refresh, progress.signal);
+        const base = await requestContext(engine, context, input.workspaceId, input.refresh, progress.signal);
         try {
             await progress.report(0, 2, 'Inspecting weighted source');
             const inspected = await analyzer.inspect(base, input.adapter, input.source, input.candidatePool);
@@ -255,7 +256,7 @@ export function registerProbabilityTools(server, engine, context) {
         annotations: readOnly,
     }, async (input, extra) => {
         const progress = progressReporter(extra);
-        const base = requestContext(engine, context, input.workspaceId, input.refresh, progress.signal);
+        const base = await requestContext(engine, context, input.workspaceId, input.refresh, progress.signal);
         try {
             await progress.report(0, 3, 'Scanning and evaluating weighted source');
             const request = {
@@ -279,7 +280,7 @@ export function registerProbabilityTools(server, engine, context) {
         annotations: readOnly,
     }, async (input, extra) => {
         const progress = progressReporter(extra);
-        const base = requestContext(engine, context, input.workspaceId, input.refresh, progress.signal);
+        const base = await requestContext(engine, context, input.workspaceId, input.refresh, progress.signal);
         try {
             await progress.report(0, 3, 'Evaluating parameter sweep');
             const request = {
@@ -303,7 +304,7 @@ export function registerProbabilityTools(server, engine, context) {
         annotations: readOnly,
     }, async (input, extra) => {
         const progress = progressReporter(extra);
-        const base = requestContext(engine, context, input.workspaceId, input.refresh, progress.signal);
+        const base = await requestContext(engine, context, input.workspaceId, input.refresh, progress.signal);
         try {
             await progress.report(0, input.samples, 'Sampling uncertain scenarios');
             const request = {
@@ -327,7 +328,7 @@ export function registerProbabilityTools(server, engine, context) {
         annotations: readOnly,
     }, async (input, extra) => {
         const progress = progressReporter(extra);
-        const base = requestContext(engine, context, input.workspaceId, undefined, progress.signal);
+        const base = await requestContext(engine, context, input.workspaceId, undefined, progress.signal);
         try {
             await progress.report(0, input.maxSteps, 'Analyzing declared sequence');
             const request = {
@@ -351,7 +352,7 @@ export function registerProbabilityTools(server, engine, context) {
         annotations: readOnly,
     }, async (input, extra) => {
         const progress = progressReporter(extra);
-        const base = requestContext(engine, context, input.workspaceId, input.refresh, progress.signal);
+        const base = await requestContext(engine, context, input.workspaceId, input.refresh, progress.signal);
         try {
             await progress.report(0, 4, 'Comparing weighted source');
             const request = {
@@ -375,7 +376,7 @@ export function registerProbabilityTools(server, engine, context) {
         annotations: readOnly,
     }, async (input, extra) => {
         const progress = progressReporter(extra);
-        const base = requestContext(engine, context, input.workspaceId, undefined, progress.signal);
+        const base = await requestContext(engine, context, input.workspaceId, undefined, progress.signal);
         try {
             await progress.report(0, input.outputs.length, 'Rendering analysis resources');
             const request = {

package/dist/hoi4_agent_tools/mcp/tools/technology.js

@@ -9,6 +9,7 @@ import { compactValidatedInputSchema } from '../server/context-schemas.js';
 import { nonNegativeIntegerSchema, sha256Schema } from '../server/output-schemas.js';
 import { progressReporter } from '../server/progress.js';
 import { errorResult, setInlineFilesScanned, strictOperationResultSchema, toolResult, } from '../server/result.js';
+import { resolveServerWorkspaceId } from '../server/base-tools.js';
 const technologyMode = z.enum([
     'scan',
     'folders',
@@ -244,7 +245,7 @@ export function registerTechnologyTools(server, engine, context) {
         outputSchema: analysisOutput,
         annotations: readOnly,
     }, async (input, extra) => {
-        const workspaceId = engine.resolver.resolveWorkspaceId(input.workspaceId, context.principal);
+        const workspaceId = await resolveServerWorkspaceId(engine, context, input.workspaceId, extra.signal);
         try {
             const progress = progressReporter(extra);
             await progress.report(0, 2, 'Analyzing technologies');
@@ -273,7 +274,7 @@ export function registerTechnologyTools(server, engine, context) {
         outputSchema: renderOutput,
         annotations: readOnly,
     }, async (input, extra) => {
-        const workspaceId = engine.resolver.resolveWorkspaceId(input.workspaceId, context.principal);
+        const workspaceId = await resolveServerWorkspaceId(engine, context, input.workspaceId, extra.signal);
         try {
             const progress = progressReporter(extra);
             const request = {
@@ -317,7 +318,7 @@ export function registerTechnologyTools(server, engine, context) {
         outputSchema: compareOutput,
         annotations: readOnly,
     }, async (input, extra) => {
-        const workspaceId = engine.resolver.resolveWorkspaceId(input.workspaceId, context.principal);
+        const workspaceId = await resolveServerWorkspaceId(engine, context, input.workspaceId, extra.signal);
         try {
             const progress = progressReporter(extra);
             const request = {

package/dist/hoi4_agent_tools/version.js

@@ -1,6 +1,6 @@
 import { LATEST_PROTOCOL_VERSION } from '@modelcontextprotocol/sdk/types.js';
 export const PACKAGE_NAME = 'hoi4-agent-tools';
-export const PACKAGE_VERSION = '2.3.8';
+export const PACKAGE_VERSION = '2.3.10';
 export const MCP_PROTOCOL_VERSION = LATEST_PROTOCOL_VERSION;
 export const CONFIG_VERSION = 1;
 export const TRANSACTION_VERSION = 1;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hoi4-agent-tools",
   "mcpName": "io.github.klimPaskov/hoi4-agent-tools",
-  "version": "2.3.8",
+  "version": "2.3.10",
   "description": "Analyze HOI4 events, tech trees, AI weights, and MTTH; build focus trees, GUIs, and maps.",
   "type": "module",
   "license": "Apache-2.0",

package/schemas/configuration.schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.8/schemas/configuration.schema.json",
+  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.10/schemas/configuration.schema.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
   "properties": {

package/schemas/continuous-focus-palette.schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.8/schemas/continuous-focus-palette.schema.json",
+  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.10/schemas/continuous-focus-palette.schema.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
   "properties": {

package/schemas/custom-weighted-pool.schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.8/schemas/custom-weighted-pool.schema.json",
+  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.10/schemas/custom-weighted-pool.schema.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
   "properties": {

package/schemas/event-feature-manifest.schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.8/schemas/event-feature-manifest.schema.json",
+  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.10/schemas/event-feature-manifest.schema.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
   "properties": {

package/schemas/focus-plan.schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.8/schemas/focus-plan.schema.json",
+  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.10/schemas/focus-plan.schema.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
   "properties": {

package/schemas/focus-planning-sidecar.schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.8/schemas/focus-planning-sidecar.schema.json",
+  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.10/schemas/focus-planning-sidecar.schema.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
   "properties": {

package/schemas/gui-animation-source.schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.8/schemas/gui-animation-source.schema.json",
+  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.10/schemas/gui-animation-source.schema.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
   "properties": {

package/schemas/gui-helper.schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.8/schemas/gui-helper.schema.json",
+  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.10/schemas/gui-helper.schema.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
   "properties": {

package/schemas/gui-scenario.schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.8/schemas/gui-scenario.schema.json",
+  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.10/schemas/gui-scenario.schema.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
   "properties": {

package/schemas/map-operation.schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.8/schemas/map-operation.schema.json",
+  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.10/schemas/map-operation.schema.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "oneOf": [
     {

package/schemas/operation-result.schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.8/schemas/operation-result.schema.json",
+  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.10/schemas/operation-result.schema.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
   "properties": {

package/schemas/probability-analysis-result.schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.8/schemas/probability-analysis-result.schema.json",
+  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.10/schemas/probability-analysis-result.schema.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
   "properties": {

package/schemas/probability-compare-input.schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.8/schemas/probability-compare-input.schema.json",
+  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.10/schemas/probability-compare-input.schema.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
   "properties": {

package/schemas/probability-evaluate-input.schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.8/schemas/probability-evaluate-input.schema.json",
+  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.10/schemas/probability-evaluate-input.schema.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
   "properties": {

package/schemas/probability-inspect-input.schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.8/schemas/probability-inspect-input.schema.json",
+  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.10/schemas/probability-inspect-input.schema.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
   "properties": {

package/schemas/probability-render-input.schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.8/schemas/probability-render-input.schema.json",
+  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.10/schemas/probability-render-input.schema.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
   "properties": {

package/schemas/probability-scenario-set.schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.8/schemas/probability-scenario-set.schema.json",
+  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.10/schemas/probability-scenario-set.schema.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
   "properties": {

package/schemas/probability-sequence-input.schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.8/schemas/probability-sequence-input.schema.json",
+  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.10/schemas/probability-sequence-input.schema.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
   "properties": {

package/schemas/probability-simulate-input.schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.8/schemas/probability-simulate-input.schema.json",
+  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.10/schemas/probability-simulate-input.schema.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
   "properties": {

package/schemas/probability-sweep-input.schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.8/schemas/probability-sweep-input.schema.json",
+  "$id": "https://github.com/klimPaskov/hoi4-agent-tools/blob/v2.3.10/schemas/probability-sweep-input.schema.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
   "properties": {

package/server.json

@@ -3,7 +3,7 @@
   "name": "io.github.klimPaskov/hoi4-agent-tools",
   "title": "HOI4 Agent Tools",
   "description": "Analyze HOI4 events, tech trees, AI weights, and MTTH; build focus trees, GUIs, and maps.",
-  "version": "2.3.8",
+  "version": "2.3.10",
   "repository": {
     "url": "https://github.com/klimPaskov/hoi4-agent-tools",
     "source": "github"
@@ -13,7 +13,7 @@
     {
       "registryType": "npm",
       "identifier": "hoi4-agent-tools",
-      "version": "2.3.8",
+      "version": "2.3.10",
       "transport": {
         "type": "stdio"
       }