archgraph-argo 0.10.4 → 0.10.6

package/argo/defaults/design/KG/SystemArchitecture.json

@@ -1,83 +1,83 @@
-{
-    "name": "System",
-    "description": "Exported from EA package System\r\n\r\nImported from: D:\\Projects\\Argo\\design\\KG\\SystemArchitecture.json\r\nSchema: .argo/schema/SystemArchitecture.schema.json",
-    "elements": [
-        {
-            "id": "1240",
-            "name": "Application Cooperation Viewpoint",
-            "alias": "1211",
-            "type": "Grouping",
-            "subdiagram_views": [
-                {
-                    "view_id": "169",
-                    "view_name": "Application Cooperation"
-                }
-            ]
-        },
-        {
-            "id": "1249",
-            "name": "Implementation and Migration Viewpoint",
-            "alias": "1211",
-            "type": "Grouping",
-            "subdiagram_views": [
-                {
-                    "view_id": "176",
-                    "view_name": "AgentCapabilities"
-                },
-                {
-                    "view_id": "174",
-                    "view_name": "Implementation and Migration"
-                }
-            ]
-        }
-    ],
-    "relationships": [
-        {
-            "id": "1161",
-            "statement": "Implementation and Migration Viewpoint --(Association)--> Application Cooperation Viewpoint",
-            "name": "Association",
-            "type": "Association",
-            "source_id": "1249",
-            "target_id": "1240",
-            "source_name": "Implementation and Migration Viewpoint",
-            "target_name": "Application Cooperation Viewpoint"
-        }
-    ],
-    "views": [
-        {
-            "view_id": "176",
-            "view_name": "AgentCapabilities",
-            "parent_element_id": "1249",
-            "parent_element_name": "Implementation and Migration Viewpoint",
-            "included_elements": [],
-            "included_relationships": []
-        },
-        {
-            "view_id": "174",
-            "view_name": "Implementation and Migration",
-            "parent_element_id": "1249",
-            "parent_element_name": "Implementation and Migration Viewpoint",
-            "included_elements": [],
-            "included_relationships": []
-        },
-        {
-            "view_id": "169",
-            "view_name": "Application Cooperation",
-            "parent_element_id": "1240",
-            "parent_element_name": "Application Cooperation Viewpoint",
-            "included_elements": [],
-            "included_relationships": []
-        },
-        {
-            "view_id": "170",
-            "view_name": "SystemArchitecture",
-            "included_elements": [
-                "1249",
-                "1240"
-            ],
-            "included_relationships": [
-                "1161"
-            ]
-        }
-    ]
+{
+    "name": "System",
+    "description": "Exported from EA package System",
+    "elements": [
+        {
+            "id": "1240",
+            "name": "Application Cooperation Viewpoint",
+            "alias": "1211",
+            "type": "Grouping",
+            "subdiagram_views": [
+                {
+                    "view_id": "169",
+                    "view_name": "Application Cooperation"
+                }
+            ]
+        },
+        {
+            "id": "1249",
+            "name": "Implementation and Migration Viewpoint",
+            "alias": "1211",
+            "type": "Grouping",
+            "subdiagram_views": [
+                {
+                    "view_id": "176",
+                    "view_name": "AgentCapabilities"
+                },
+                {
+                    "view_id": "174",
+                    "view_name": "Implementation and Migration"
+                }
+            ]
+        }
+    ],
+    "relationships": [
+        {
+            "id": "1161",
+            "statement": "Implementation and Migration Viewpoint --(Association)--> Application Cooperation Viewpoint",
+            "name": "Association",
+            "type": "Association",
+            "source_id": "1249",
+            "target_id": "1240",
+            "source_name": "Implementation and Migration Viewpoint",
+            "target_name": "Application Cooperation Viewpoint"
+        }
+    ],
+    "views": [
+        {
+            "view_id": "176",
+            "view_name": "AgentCapabilities",
+            "parent_element_id": "1249",
+            "parent_element_name": "Implementation and Migration Viewpoint",
+            "included_elements": [],
+            "included_relationships": []
+        },
+        {
+            "view_id": "174",
+            "view_name": "Implementation and Migration",
+            "parent_element_id": "1249",
+            "parent_element_name": "Implementation and Migration Viewpoint",
+            "included_elements": [],
+            "included_relationships": []
+        },
+        {
+            "view_id": "169",
+            "view_name": "Application Cooperation",
+            "parent_element_id": "1240",
+            "parent_element_name": "Application Cooperation Viewpoint",
+            "included_elements": [],
+            "included_relationships": []
+        },
+        {
+            "view_id": "170",
+            "view_name": "SystemArchitecture",
+            "included_elements": [
+                "1249",
+                "1240"
+            ],
+            "included_relationships": [
+                "1161"
+            ]
+        }
+    ]
 }

package/argo/rules/archgraph.instructions.md

@@ -95,4 +95,8 @@ You MUST read/write the intent architecture through the tools provided by the AR
 13. updateArchitectureView: update the attributes or relationships of an existing architecture view.
 14. removeArchitectureView: remove an existing architecture view.
 15. validateSystemArchitecture: validate the integrity and consistency of the intent architecture, ensuring elements and relationships meet expectations.
+
+<Attention>
+you MUST make sure the knowledge graph the ARGO MCP server is handling is actually the one in this repository (design/KG/SystemArchitecture.json) and not some other knowledge graph; otherwise, you MUST stop and report the issue to your human partner before doing anything else.
+</Attention>
 </ToolsGuideline>

package/argo/scripts/argo-mcp-server.js

@@ -306,14 +306,14 @@ const TOOLS = [
 ];
 
 // Every tool accepts an optional per-call `workspaceRoot` (absolute path,
-// honored only when listed in ARGO_WORKSPACE_ROOTS). The DeepSeek Harness
-// bridge injects the current session's workspace directory here automatically.
+// honored unconditionally when provided). The DeepSeek Harness bridge injects
+// the current session's workspace directory here automatically.
 // (tools/list dedupes with systemArchitectureMcp/validatorMcp tools, which
 // carry the same field; this covers the local-only rows like initializeWorkspace.)
 const WORKSPACE_ROOT_PARAM = Object.freeze({
   type: 'string',
   description:
-    'Optional absolute workspace root for this call. Honored only when listed in ARGO_WORKSPACE_ROOTS; otherwise the server launch directory is used.',
+    'Optional absolute workspace root for this call. When provided it is used as-is; otherwise the server launch directory is used.',
 });
 for (const tool of TOOLS) {
   const inputSchema = tool && tool.inputSchema;
@@ -395,8 +395,8 @@ function resolveWorkspaceRoot() {
 }
 
 function resolveWorkspaceRoot(args) {
-  // Per-call workspaceRoot override (honored only when in the
-  // ARGO_WORKSPACE_ROOTS allowlist); defaults to the launch-directory root.
+  // Per-call workspaceRoot override, honored unconditionally when provided;
+  // defaults to the launch-directory root.
   return resolveCallWorkspaceRoot(args);
 }
 
@@ -405,7 +405,9 @@ async function callTool(name, args = {}, progressToken = null, dependencies = un
   if (name === 'initializeWorkspace') {
     const workspace = await initializeWorkspace(resolveWorkspaceRoot(args));
     const composition = canonicalSemanticInitStorage.getStore()
-      || systemArchitectureMcp.createDefaultCanonicalSemanticInitComposition();
+      || systemArchitectureMcp.createDefaultCanonicalSemanticInitComposition({
+        repositoryRoot: resolveWorkspaceRoot(args),
+      });
     const semanticLifecycle = await runCanonicalSemanticInit(composition, {
       repositoryRoot: resolveWorkspaceRoot(args),
       workspace,
@@ -675,7 +677,9 @@ async function handleRequest(request, dependencies = undefined) {
       ) {
         activeDependencies = {
           semanticOperatorJourney:
-            await systemArchitectureMcp.createDefaultProductionSemanticOperatorJourney(),
+            await systemArchitectureMcp.createDefaultProductionSemanticOperatorJourney({
+              repositoryRoot: resolveWorkspaceRoot(params.arguments),
+            }),
         };
       }
       const result = await callTool(

package/argo/scripts/argo-paths.js

@@ -125,17 +125,14 @@ function normalizeRelativePath(value) {
  * Resolve the workspace root for one tool call.
  *
  * Defaults to the launch-directory root (`getWorkspaceRoot()`). A per-call
- * `workspaceRoot` argument (absolute path) is honored only when it appears in
- * the `ARGO_WORKSPACE_ROOTS` allowlist (semicolon or comma separated absolute
- * paths). Without an allowlist the override is ignored, so existing
- * deployments keep launch-directory resolution with zero behavior change.
- * This powers the DeepSeek Harness bridge, which injects the current session's
+ * `workspaceRoot` argument (absolute path) is honored unconditionally when
+ * present, so the caller decides which workspace this call operates on. This
+ * powers the DeepSeek Harness bridge, which injects the current session's
  * workspace directory into every call so one dsh instance can follow the
  * workspace the user switched to.
  *
  * @param {object} [args] - tool call arguments (may carry `workspaceRoot`).
  * @returns {string} resolved absolute workspace root.
- * @throws when the requested root is not in the allowlist.
  */
 function resolveCallWorkspaceRoot(args = {}) {
   const requested =
@@ -145,22 +142,7 @@ function resolveCallWorkspaceRoot(args = {}) {
   if (requested === '') {
     return getWorkspaceRoot();
   }
-  const allowlist = (process.env.ARGO_WORKSPACE_ROOTS || '')
-    .split(/[;,]/)
-    .map((entry) => entry.trim())
-    .filter(Boolean)
-    .map((entry) => path.resolve(entry));
-  if (allowlist.length === 0) {
-    return getWorkspaceRoot();
-  }
-  const resolved = path.resolve(requested);
-  const allowed = allowlist.some(
-    (root) => resolved === root || resolved.startsWith(root + path.sep),
-  );
-  if (!allowed) {
-    throw new Error(`workspaceRoot not in ARGO_WORKSPACE_ROOTS allowlist: ${requested}`);
-  }
-  return resolved;
+  return path.resolve(requested);
 }
 
 module.exports = {

package/argo/scripts/systemarchitecture-mcp-server.js

@@ -382,12 +382,12 @@ const TOOLS = [
 ];
 
 // Every tool accepts an optional per-call `workspaceRoot` (absolute path,
-// honored only when listed in ARGO_WORKSPACE_ROOTS). The DeepSeek Harness
-// bridge injects the current session's workspace directory here automatically.
+// honored unconditionally when provided). The DeepSeek Harness bridge injects
+// the current session's workspace directory here automatically.
 const WORKSPACE_ROOT_PARAM = Object.freeze({
   type: 'string',
   description:
-    'Optional absolute workspace root for this call. Honored only when listed in ARGO_WORKSPACE_ROOTS; otherwise the server launch directory is used.',
+    'Optional absolute workspace root for this call. When provided it is used as-is; otherwise the server launch directory is used.',
 });
 for (const tool of TOOLS) {
   const inputSchema = tool && tool.inputSchema;
@@ -466,8 +466,8 @@ function mutationInputSchema() {
 }
 
 function resolveWorkspaceRoot(args) {
-  // Per-call workspaceRoot override (honored only when in the
-  // ARGO_WORKSPACE_ROOTS allowlist); defaults to the launch-directory root.
+  // Per-call workspaceRoot override, honored unconditionally when provided;
+  // defaults to the launch-directory root.
   return resolveCallWorkspaceRoot(args);
 }
 
@@ -1418,7 +1418,7 @@ async function attachMutationEmbeddingLifecycle(context, result, document) {
     const lifecycle = require(
       './graph-rag/mutationEmbeddingVectorLifecycle.js'
     ).createPersistentMutationEmbeddingLifecycle({
-      repositoryRoot: resolveWorkspaceRoot(),
+      repositoryRoot: context.workspaceRoot,
     });
     const embeddingLifecycle = await lifecycle.reconcile({
       canonicalWrite: {
@@ -1946,7 +1946,7 @@ async function callTool(name, args = {}, dependencies = undefined) {
 
   if (name === 'generateArchitectureDiffPlantuml') {
     return toolResult(architectureDiffPlantuml.generateArchitectureDiffPlantuml({
-      workspaceRoot: resolveWorkspaceRoot(),
+      workspaceRoot: resolveWorkspaceRoot(args),
       architecturePath: args.architecturePath,
       outputDir: args.outputDir,
     }));
@@ -2026,7 +2026,12 @@ async function resolveSemanticOperatorJourney(dependencies) {
 }
 
 async function executeSemanticSystemArchitectureQuery(args, dependencies) {
-  const context = await loadContext(args);
+  const context = await loadContext({
+    ...(args || {}),
+    ...(dependencies && dependencies.repositoryRoot
+      ? { workspaceRoot: dependencies.repositoryRoot }
+      : {}),
+  });
   const query = args.query;
   const contractOptions = semanticContractOptions(args, dependencies);
   const canonicalSubsetContract = isCanonicalSubsetSemanticContract(query, contractOptions);
@@ -2642,6 +2647,7 @@ async function createDefaultProductionSemanticOperatorJourney(options = {}) {
     querySystemArchitecture: request => executeSemanticSystemArchitectureQuery(request, {
       semanticRetrievalBoundary: retrieval,
       canonicalSubsetForNoAnchor: true,
+      repositoryRoot: workspaceRoot,
     }),
   });
   return Object.freeze({
@@ -2650,8 +2656,8 @@ async function createDefaultProductionSemanticOperatorJourney(options = {}) {
   });
 }
 
-function createDefaultCanonicalSemanticInitComposition() {
-  const repositoryRoot = resolveWorkspaceRoot();
+function createDefaultCanonicalSemanticInitComposition(options = {}) {
+  const repositoryRoot = options.repositoryRoot || resolveWorkspaceRoot();
   const readinessStore = createProductionSemanticReadinessStore({ repositoryRoot });
   const graphPath = resolveWorkspacePath(repositoryRoot, DEFAULT_GRAPH_PATH);
   const canonicalGraph = readJson(graphPath.absolutePath, graphPath.relativePath);
@@ -2671,7 +2677,7 @@ function createDefaultCanonicalSemanticInitComposition() {
     }),
     productionGraphRagRuntime: Object.freeze({
       async runSemanticBackfill(request) {
-        const runtime = await createDefaultProductionSemanticRuntime();
+        const runtime = await createDefaultProductionSemanticRuntime({ repositoryRoot });
         try {
           return await runtime.runSemanticBackfill(request);
         } finally {
@@ -2739,9 +2745,9 @@ function createDefaultCanonicalSemanticInitComposition() {
   });
 }
 
-async function createDefaultProductionSemanticRuntime() {
-  const workspaceRoot = resolveWorkspaceRoot();
-  const configuration = await resolveDefaultSemanticConfiguration();
+async function createDefaultProductionSemanticRuntime(options = {}) {
+  const workspaceRoot = options.repositoryRoot || resolveWorkspaceRoot();
+  const configuration = await resolveDefaultSemanticConfiguration(workspaceRoot);
   const neo4j = require('neo4j-driver');
   const driver = neo4j.driver(
     configuration.neo4jDatabaseUrl,
@@ -2854,7 +2860,7 @@ async function createDefaultProductionSemanticRuntime() {
   });
 }
 
-async function resolveDefaultSemanticConfiguration() {
+async function resolveDefaultSemanticConfiguration(repositoryRoot) {
   let external;
   try {
     external = resolveExternalProductionConfig({
@@ -2862,7 +2868,7 @@ async function resolveDefaultSemanticConfiguration() {
       neo4jUsername: process.env.ARGO_NEO4J_DATABASE_USERNAME,
       neo4jPassword: process.env.ARGO_NEO4J_DATABASE_PASSWORD,
       embeddingCredential: process.env.QWEN_KEY,
-      neo4jDatabase: process.env.ARGO_NEO4J_DATABASE || getDefaultSemanticNeo4jDatabaseName(),
+      neo4jDatabase: process.env.ARGO_NEO4J_DATABASE || getDefaultSemanticNeo4jDatabaseName(repositoryRoot),
     }, {
       operation: 'semantic-backfill',
       sourceKeys: new Map([
@@ -2896,8 +2902,8 @@ async function resolveDefaultSemanticConfiguration() {
   });
 }
 
-function getDefaultSemanticNeo4jDatabaseName() {
-  const repoName = path.basename(resolveWorkspaceRoot());
+function getDefaultSemanticNeo4jDatabaseName(repositoryRoot) {
+  const repoName = path.basename(repositoryRoot || resolveWorkspaceRoot());
   const normalized = String(repoName)
     .toLowerCase()
     .replace(/[^a-z0-9.-]+/g, '-')
@@ -3011,7 +3017,9 @@ async function handleRequest(request, dependencies = undefined) {
         && params.arguments.query.purpose !== 'graph-tidy'
       ) {
         activeDependencies = {
-          semanticOperatorJourney: await createDefaultProductionSemanticOperatorJourney(),
+          semanticOperatorJourney: await createDefaultProductionSemanticOperatorJourney({
+            repositoryRoot: resolveWorkspaceRoot(params.arguments),
+          }),
           canonicalSubsetForNoAnchor: true,
         };
       }

package/argo/scripts/validator-mcp-server.js

@@ -87,12 +87,12 @@ const TOOLS = [
 ];
 
 // Every tool accepts an optional per-call `workspaceRoot` (absolute path,
-// honored only when listed in ARGO_WORKSPACE_ROOTS). The DeepSeek Harness
-// bridge injects the current session's workspace directory here automatically.
+// honored unconditionally when provided). The DeepSeek Harness bridge injects
+// the current session's workspace directory here automatically.
 const WORKSPACE_ROOT_PARAM = Object.freeze({
   type: 'string',
   description:
-    'Optional absolute workspace root for this call. Honored only when listed in ARGO_WORKSPACE_ROOTS; otherwise the server launch directory is used.',
+    'Optional absolute workspace root for this call. When provided it is used as-is; otherwise the server launch directory is used.',
 });
 for (const tool of TOOLS) {
   const inputSchema = tool && tool.inputSchema;
@@ -104,8 +104,8 @@ for (const tool of TOOLS) {
 }
 
 function resolveWorkspaceRoot(args) {
-  // Per-call workspaceRoot override (honored only when in the
-  // ARGO_WORKSPACE_ROOTS allowlist); defaults to the launch-directory root.
+  // Per-call workspaceRoot override, honored unconditionally when provided;
+  // defaults to the launch-directory root.
   return resolveCallWorkspaceRoot(args);
 }
 

package/install-argo.ps1

@@ -389,8 +389,7 @@ function New-DshWorkspaceBridge {
     # (SessionHeader.cwd) as the per-call `workspaceRoot`, so ONE dsh instance
     # follows whichever workspace the user switched to - no model-visible
     # parameters, no internal tool names, no restart. The argo server honors
-    # workspaceRoot only when listed in ARGO_WORKSPACE_ROOTS (install-argo.ps1
-    # -DshWorkspaces).
+    # the injected workspaceRoot unconditionally.
     param(
         [string]$DshHome
     )
@@ -405,8 +404,7 @@ function New-DshWorkspaceBridge {
 // directory (SessionHeader.cwd) as the per-call `workspaceRoot` argument, so
 // one dsh instance follows whichever workspace the user switched to - the
 // model sees no extra parameters and no internal tool names. The argo server
-// honors workspaceRoot only when the workspace is listed in its
-// ARGO_WORKSPACE_ROOTS allowlist.
+// honors the injected workspaceRoot unconditionally.
 //
 // Zero dependencies on purpose: implements the minimal MCP stdio client
 // (JSON-RPC 2.0, one JSON object per line) with Node built-ins only, so the
@@ -495,8 +493,11 @@ export async function apply(ctx, config) {
         render: (_args, value) => value.content,
       },
       execute: async (args, exec) => {
+        // SessionHeader.cwd (the durable session workspace), NOT
+        // requestHeader() — that returns the request EpochHeader
+        // (config/system/tools) which has no cwd field.
         const sessionCwd = exec && exec.agent && exec.agent.session
-          ? exec.agent.session.requestHeader().cwd
+          ? exec.agent.session.header?.cwd
           : undefined
         const injected = { ...(args && typeof args === 'object' ? args : {}) }
         if (typeof sessionCwd === 'string' && sessionCwd !== '') {
@@ -699,8 +700,8 @@ if ($SkipDsh) {
     # server (no dsh-mcp-client row), registers every tool as mcp__argo__* and
     # injects the current session's workspace (SessionHeader.cwd) as the
     # per-call workspaceRoot, so one dsh instance follows the workspace the
-    # user switched to. The server honors workspaceRoot only when the workspace
-    # is listed in ARGO_WORKSPACE_ROOTS (pass -DshWorkspaces "D:/a;D:/b").
+    # user switched to. The server honors the injected workspaceRoot
+    # unconditionally.
     $bridgeDshPath = New-DshWorkspaceBridge -DshHome $DshHome
     if ($bridgeDshPath) {
         $bridgeUrl = 'file:///' + (($bridgeDshPath -replace '\\', '/').TrimStart('/'))
@@ -730,16 +731,9 @@ if ($SkipDsh) {
 
     Write-Host '  Restart `dsh web` to activate the MCP bridge and the wakeup plugin;'
     Write-Host '  new sessions pick up the global rule and the argo-init skill automatically.'
-    if ($DshWorkspaces) {
-        Write-Host "  Workspace following enabled: ARGO_WORKSPACE_ROOTS=$DshWorkspaces"
-        Write-Host '  The argo tools (mcp__argo__*) now auto-follow the workspace the user switched to'
-        Write-Host '  in one dsh instance - no restart needed between workspaces.'
-    } else {
-        Write-Host '  Multi-workspace: to let one dsh instance follow whichever workspace the user'
-        Write-Host '  switches to, re-run with -DshWorkspaces "D:/proj-a;D:/proj-b" (the argo server'
-        Write-Host '  only honors workspaces listed in ARGO_WORKSPACE_ROOTS). Without it the server'
-        Write-Host '  keeps resolving from the directory dsh was launched from.'
-    }
+    Write-Host '  The argo tools (mcp__argo__*) auto-follow the workspace the user switched to'
+    Write-Host '  in one dsh instance - no restart needed between workspaces (the server honors'
+    Write-Host '  the injected workspaceRoot unconditionally).'
 }
 
 if ($SkipDeps) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "archgraph-argo",
-  "version": "0.10.4",
+  "version": "0.10.6",
   "description": "Deploy the ArchGraph ARGO toolchain, skills, and rules (schema, scripts, argo-init skill, global rule) with one command.",
   "license": "MIT",
   "bin": {
@@ -27,8 +27,5 @@
   },
   "engines": {
     "node": ">=18"
-  },
-  "dependencies": {
-    "archgraph-argo": "^0.10.3"
   }
 }