diff --git a/client/src/components/PromptsTab.tsx b/client/src/components/PromptsTab.tsx
index 466b3d528..fa5905580 100644
--- a/client/src/components/PromptsTab.tsx
+++ b/client/src/components/PromptsTab.tsx
@@ -48,6 +48,7 @@ const PromptsTab = ({
     ref: PromptReference | ResourceReference,
     argName: string,
     value: string,
+    context?: Record<string, string>,
   ) => Promise<string[]>;
   completionsSupported: boolean;
   promptContent: string;
@@ -73,6 +74,7 @@ const PromptsTab = ({
         },
         argName,
         value,
+        promptArgs,
       );
     }
   };
diff --git a/client/src/components/ResourcesTab.tsx b/client/src/components/ResourcesTab.tsx
index 8ec3f91b7..874e0ff7d 100644
--- a/client/src/components/ResourcesTab.tsx
+++ b/client/src/components/ResourcesTab.tsx
@@ -52,6 +52,7 @@ const ResourcesTab = ({
     ref: ResourceReference | PromptReference,
     argName: string,
     value: string,
+    context?: Record<string, string>,
   ) => Promise<string[]>;
   completionsSupported: boolean;
   resourceContent: string;
@@ -94,6 +95,7 @@ const ResourcesTab = ({
         },
         key,
         value,
+        templateValues,
       );
     }
   };
diff --git a/client/src/lib/hooks/useCompletionState.ts b/client/src/lib/hooks/useCompletionState.ts
index 71492e311..26b69a276 100644
--- a/client/src/lib/hooks/useCompletionState.ts
+++ b/client/src/lib/hooks/useCompletionState.ts
@@ -28,6 +28,7 @@ export function useCompletionState(
     ref: ResourceReference | PromptReference,
     argName: string,
     value: string,
+    context?: Record<string, string>,
     signal?: AbortSignal,
   ) => Promise<string[]>,
   completionsSupported: boolean = true,
@@ -66,6 +67,7 @@ export function useCompletionState(
         ref: ResourceReference | PromptReference,
         argName: string,
         value: string,
+        context?: Record<string, string>,
       ) => {
         if (!completionsSupported) {
           return;
@@ -82,10 +84,15 @@ export function useCompletionState(
         }));
 
         try {
+          if (context !== undefined) {
+            delete context[argName];
+          }
+
           const values = await handleCompletion(
             ref,
             argName,
             value,
+            context,
             abortController.signal,
           );
 
@@ -97,6 +104,7 @@ export function useCompletionState(
             }));
           }
         } catch {
+          console.error("completion failed");
           if (!abortController.signal.aborted) {
             setState((prev) => ({
               ...prev,
diff --git a/client/src/lib/hooks/useConnection.ts b/client/src/lib/hooks/useConnection.ts
index 849eb909b..edc21d92f 100644
--- a/client/src/lib/hooks/useConnection.ts
+++ b/client/src/lib/hooks/useConnection.ts
@@ -198,6 +198,7 @@ export function useConnection({
     ref: ResourceReference | PromptReference,
     argName: string,
     value: string,
+    context?: Record<string, string>,
     signal?: AbortSignal,
   ): Promise<string[]> => {
     if (!mcpClient || !completionsSupported) {
@@ -215,6 +216,12 @@ export function useConnection({
       },
     };
 
+    if (context) {
+      request["params"]["context"] = {
+        arguments: context,
+      };
+    }
+
     try {
       const response = await makeRequest(request, CompleteResultSchema, {
         signal,