assistme 0.3.3 → 0.3.5

package/src/mcp/agent-tools-server.ts

@@ -25,10 +25,14 @@ export interface AgentToolsDeps {
   skillManager: SkillManager;
   taskId: string;
   sessionId?: string;
+  /** Called when the agent starts waiting for user input (pauses task timeout). */
+  onUserWaitStart?: () => void;
+  /** Called when user input completes or times out (resumes task timeout). */
+  onUserWaitEnd?: () => void;
 }
 
 export function createAgentToolsServer(deps: AgentToolsDeps): McpSdkServerConfigWithInstance {
-  const { memoryManager, skillManager, taskId, sessionId } = deps;
+  const { memoryManager, skillManager, taskId, sessionId, onUserWaitStart, onUserWaitEnd } = deps;
 
   return createSdkMcpServer({
     name: "assistme-agent",
@@ -582,56 +586,65 @@ export function createAgentToolsServer(deps: AgentToolsDeps): McpSdkServerConfig
             await setActionRequest(taskId, actionData);
             log.info(`Ask user ${actionId}: "${args.question.slice(0, 80)}..."`);
 
-            emitEvent(taskId, "user_action_request", actionData).catch(() => {});
-            // Emit waiting_for_user status so the web UI can show a waiting indicator
-            emitEvent(taskId, "status_change", {
+            // Await event emissions to ensure they reach the DB before we start polling
+            await emitEvent(taskId, "user_action_request", actionData);
+            await emitEvent(taskId, "status_change", {
               status: "waiting_for_user",
               message: args.question,
-            }).catch(() => {});
+            });
+
+            // Pause the task wall-clock timeout while waiting for user
+            onUserWaitStart?.();
 
             const startTime = Date.now();
             const pollInterval = 2000;
 
-            while (Date.now() - startTime < timeout) {
-              const response = await pollActionResponse(taskId);
-              if (response && (!response.action_id || response.action_id === actionId)) {
-                // Response can be either an option click or free-text input
-                const actionKey = (response.action_key || "") as string;
-                const text = (response.text || "") as string;
-                const label = (response.label || actionKey || text) as string;
-                log.info(`User responded: "${label}"`);
-                return {
-                  content: [
-                    {
-                      type: "text",
-                      text: JSON.stringify({
-                        status: "responded",
-                        action_key: actionKey || "custom_input",
-                        label,
-                        text: text || label,
-                      }),
-                    },
-                  ],
-                };
+            try {
+              while (Date.now() - startTime < timeout) {
+                const response = await pollActionResponse(taskId);
+                if (response && (!response.action_id || response.action_id === actionId)) {
+                  const actionKey = (response.action_key || "") as string;
+                  const text = (response.text || "") as string;
+                  const label = (response.label || actionKey || text) as string;
+                  log.info(`User responded: "${label}"`);
+                  return {
+                    content: [
+                      {
+                        type: "text",
+                        text: JSON.stringify({
+                          status: "responded",
+                          action_key: actionKey || "custom_input",
+                          label,
+                          text: text || label,
+                        }),
+                      },
+                    ],
+                  };
+                }
+
+                await new Promise((resolve) => setTimeout(resolve, pollInterval));
               }
 
-              await new Promise((resolve) => setTimeout(resolve, pollInterval));
+              log.warn(`Ask user ${actionId} timed out after ${args.timeout_seconds || 300}s`);
+              return {
+                content: [
+                  {
+                    type: "text",
+                    text: JSON.stringify({
+                      status: "timeout",
+                      message:
+                        "User did not respond within the timeout period. Continue the task with a reasonable default or skip the step that required user input.",
+                    }),
+                  },
+                ],
+              };
+            } finally {
+              // Resume the task timeout regardless of outcome
+              onUserWaitEnd?.();
             }
-
-            log.warn(`Ask user ${actionId} timed out after ${args.timeout_seconds || 300}s`);
-            return {
-              content: [
-                {
-                  type: "text",
-                  text: JSON.stringify({
-                    status: "timeout",
-                    message: "User did not respond within the timeout period.",
-                  }),
-                },
-              ],
-            };
           } catch (err) {
             log.error(`ask_user failed: ${err}`);
+            onUserWaitEnd?.();
             return {
               content: [
                 {

package/src/mcp/browser-server.ts

@@ -92,7 +92,7 @@ export function createBrowserMcpServer(): McpSdkServerConfigWithInstance {
       ),
       tool(
         "browser_type",
-        "Type text into an input field in the user's browser.",
+        "Type text into an input field in the user's browser. If the CSS selector fails, automatically falls back to typing into the currently focused element. Works with contenteditable elements (rich text editors) and cross-origin iframes.",
         {
           selector: z.string().describe("CSS selector of the input element"),
           text: z.string().describe("Text to type"),