Clarify pending WebMCP form submissions

Author: rgarcia

server/cmd/api/api/webmcp_test.go

@@ -98,11 +98,14 @@ func TestInvokeWebMCPToolReturnsPageResult(t *testing.T) {
 	require.Equal(t, true, body.Output.(map[string]any)["ok"])
 }
 
-func TestInvokeWebMCPToolReturnsAwaitingUserAction(t *testing.T) {
+func TestInvokeWebMCPToolReturnsAwaitingSubmission(t *testing.T) {
 	client := &fakeWebMCPClient{result: webmcpclient.InvocationResult{
 		InvocationID: "invocation-1",
-		Status:       "awaiting_user_action",
-		Output:       map[string]any{"message": "Form fields populated; submission has not started."},
+		Status:       "awaiting_submission",
+		Output: map[string]any{
+			"form_populated": true,
+			"submitted":      false,
+		},
 	}}
 	service := &ApiService{webmcp: client}
 
@@ -111,8 +114,9 @@ func TestInvokeWebMCPToolReturnsAwaitingUserAction(t *testing.T) {
 	})
 	require.NoError(t, err)
 	body := response.(oapi.InvokeWebMCPTool200JSONResponse)
-	require.Equal(t, oapi.WebMCPInvocationResultStatusAwaitingUserAction, body.Status)
-	require.Equal(t, "Form fields populated; submission has not started.", body.Output.(map[string]any)["message"])
+	require.Equal(t, oapi.WebMCPInvocationResultStatusAwaitingSubmission, body.Status)
+	require.Equal(t, true, body.Output.(map[string]any)["form_populated"])
+	require.Equal(t, false, body.Output.(map[string]any)["submitted"])
 }
 
 func TestInvokeWebMCPToolReportsUnknownOutcome(t *testing.T) {

server/lib/oapi/oapi.go

@@ -327,7 +327,7 @@ func (c *connection) invoke(ctx context.Context, toolRef string, input map[strin
 		return InvocationResult{}, ErrToolNotFound
 	}
 	sessionID, frameID, name := tool.sessionID, tool.frameID, tool.name
-	awaitingUserAction := tool.declarative && (tool.annotations == nil || !tool.annotations.Autosubmit)
+	awaitingSubmission := tool.declarative && (tool.annotations == nil || !tool.annotations.Autosubmit)
 	c.stateMu.RUnlock()
 	if !c.sessionExists(sessionID) {
 		return InvocationResult{}, ErrToolNotFound
@@ -356,7 +356,7 @@ func (c *connection) invoke(ctx context.Context, toolRef string, input map[strin
 	}
 
 	key := invocationKey{sessionID: sessionID, invocationID: started.InvocationID}
-	if awaitingUserAction {
+	if awaitingSubmission {
 		c.stateMu.Lock()
 		if response, completed := c.invocations[key]; completed {
 			delete(c.invocations, key)
@@ -372,9 +372,10 @@ func (c *connection) invoke(ctx context.Context, toolRef string, input map[strin
 		c.stateMu.Unlock()
 		return InvocationResult{
 			InvocationID: started.InvocationID,
-			Status:       "awaiting_user_action",
+			Status:       "awaiting_submission",
 			Output: map[string]any{
-				"message": "Form fields populated; submission has not started.",
+				"form_populated": true,
+				"submitted":      false,
 			},
 		}, nil
 	}

server/lib/webmcpclient/client.go

@@ -507,7 +507,7 @@ func TestInvocationPreservesIframeResponseAfterParentNavigation(t *testing.T) {
 	require.Equal(t, "Completed", result.Status)
 }
 
-func TestNonAutosubmitDeclarativeInvocationReturnsAfterPopulatingForm(t *testing.T) {
+func TestNonAutosubmitDeclarativeInvocationAwaitsSubmissionAfterPopulatingForm(t *testing.T) {
 	fake := newFakeCDP(t, false)
 	fake.nonAutosubmitDeclarative = true
 	manager := NewManager(staticUpstream{url: fake.url})
@@ -519,8 +519,9 @@ func TestNonAutosubmitDeclarativeInvocationReturnsAfterPopulatingForm(t *testing
 	result, err := manager.Invoke(ctx, toolRef, map[string]any{"cardNumber": "4242424242424242"})
 	require.NoError(t, err)
 	require.Equal(t, "invocation-1", result.InvocationID)
-	require.Equal(t, "awaiting_user_action", result.Status)
-	require.Equal(t, "Form fields populated; submission has not started.", result.Output.(map[string]any)["message"])
+	require.Equal(t, "awaiting_submission", result.Status)
+	require.Equal(t, true, result.Output.(map[string]any)["form_populated"])
+	require.Equal(t, false, result.Output.(map[string]any)["submitted"])
 }
 
 func TestInvocationReturnsCompletedResponseBeforeTargetDetach(t *testing.T) {

server/lib/webmcpclient/client_test.go

@@ -1390,7 +1390,7 @@ paths:
       summary: Invoke a discovered WebMCP tool
       description: |
         Invokes the exact live registration identified by tool_ref. Non-autosubmit declarative form
-        tools return after their fields are populated with an awaiting_user_action status. Other tools
+        tools return after their fields are populated with an awaiting_submission status. Other tools
         wait for a terminal result, including across navigation. If the request times out after invocation
         begins, the server reports outcome_unknown and never retries the tool automatically.
       operationId: invokeWebMCPTool
@@ -6345,8 +6345,8 @@ components:
           type: string
         status:
           type: string
-          enum: [completed, canceled, error, awaiting_user_action]
-          description: awaiting_user_action means a non-autosubmit declarative form was populated but not submitted.
+          enum: [completed, canceled, error, awaiting_submission]
+          description: awaiting_submission means a non-autosubmit declarative form was populated but not submitted.
         output:
           description: Untrusted page-provided output. Callers must treat it as potentially malicious input.
         error_text:

server/openapi.yaml

@@ -72,15 +72,16 @@ test('returns non-autosubmit form activation without waiting for submission', as
     fetchImpl: async () =>
       jsonResponse({
         invocation_id: 'invocation-1',
-        status: 'awaiting_user_action',
-        output: {message: 'Form fields populated; submission has not started.'},
+        status: 'awaiting_submission',
+        output: {form_populated: true, submitted: false},
       }),
   });
 
   const result = await client.invokeTool('wmcp_fill', {email: 'buyer@example.com'});
-  assert.equal(result.status, 'awaiting_user_action');
+  assert.equal(result.status, 'awaiting_submission');
   assert.deepEqual(result.output, {
-    message: 'Form fields populated; submission has not started.',
+    form_populated: true,
+    submitted: false,
   });
 });
 

server/runtime/webmcp.test.ts

@@ -22,7 +22,7 @@ export interface WebMCPTool {
 
 export interface WebMCPInvocationResult {
   invocation_id: string;
-  status: 'completed' | 'canceled' | 'error' | 'awaiting_user_action';
+  status: 'completed' | 'canceled' | 'error' | 'awaiting_submission';
   output?: unknown;
   error_text?: string;
 }