assistme 0.3.0 → 0.3.1

package/dist/index.js

@@ -3408,17 +3408,17 @@ ${content}`;
           response += `**Your task:** Analyze this job description and decompose it into 4-10 automatable skills.
 
 `;
-          response += `**IMPORTANT \u2014 You MUST use request_user_confirmation before creating skills:**
+          response += `**IMPORTANT \u2014 You MUST use ask_user before creating skills:**
 `;
           response += `1. Analyze the job and draft a list of proposed skills (name, emoji, one-line description for each).
 `;
-          response += `2. Call \`request_user_confirmation\` with the formatted skill list as "message" and these options:
+          response += `2. Call \`ask_user\` with the formatted skill list as "question" and these options:
 `;
           response += `   - options: [{label: "Approve All", action_key: "approve_all", description: "Create all proposed skills"}, {label: "Cancel", action_key: "cancel", description: "Do not create any skills"}]
 `;
           response += `3. WAIT for the response. If action_key is "approve_all", create all skills using \`skill_create\`. If "cancel", stop.
 `;
-          response += `4. Do NOT ask for confirmation in text. Do NOT create skills without calling request_user_confirmation first.
+          response += `4. Do NOT ask for confirmation in text. Do NOT create skills without calling ask_user first.
 
 `;
           response += `For each skill, call \`skill_create\` with:
@@ -3585,92 +3585,34 @@ ${content}`;
           };
         }
       ),
-      // ── User Interaction Tools ──────────────────────────────────
+      // ── User Interaction Tool ───────────────────────────────────
       tool(
-        "request_user_input",
-        "Ask the user a clarifying question and wait for their free-text response. Use this when you need information that cannot be inferred from context, memory, or the workspace \u2014 e.g. which account to use, specific preferences, ambiguous instructions, or missing parameters for a skill. Do NOT use this for information you can discover yourself (git remote, file contents, etc.).",
+        "ask_user",
+        "Ask the user a question via the web UI and wait for their response. Shows a message with optional predefined option buttons PLUS a free-text input field \u2014 the user can either click a suggested option or type a custom answer. ALWAYS provide options when you can suggest likely answers. Do NOT use this for information you can discover yourself (git remote, file contents, etc.).",
         {
-          question: z.string().describe("The question to ask the user (supports markdown). Be specific about what you need and why."),
-          placeholder: z.string().optional().describe("Placeholder text for the input field (e.g. 'https://github.com/owner/repo')"),
-          timeout_seconds: z.number().optional().describe("How long to wait for response (default: 300)")
-        },
-        async (args) => {
-          const actionId = `input_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
-          const timeout = (args.timeout_seconds || 300) * 1e3;
-          const actionData = {
-            id: actionId,
-            type: "input",
-            message: args.question,
-            placeholder: args.placeholder || "",
-            created_at: (/* @__PURE__ */ new Date()).toISOString()
-          };
-          try {
-            await setActionRequest(taskId, actionData);
-            log.info(`Input request ${actionId}: "${args.question.slice(0, 80)}..."`);
-            emitEvent(taskId, "user_action_request", actionData).catch(() => {
-            });
-            const startTime = Date.now();
-            const pollInterval = 2e3;
-            while (Date.now() - startTime < timeout) {
-              const response = await pollActionResponse(taskId);
-              if (response && (!response.action_id || response.action_id === actionId)) {
-                const text = response.text || response.value || "";
-                log.info(`User input received: "${text.slice(0, 80)}"`);
-                return {
-                  content: [{
-                    type: "text",
-                    text: JSON.stringify({ status: "responded", text })
-                  }]
-                };
-              }
-              await new Promise((resolve2) => setTimeout(resolve2, pollInterval));
-            }
-            log.warn(`Input request ${actionId} timed out`);
-            return {
-              content: [{
-                type: "text",
-                text: JSON.stringify({
-                  status: "timeout",
-                  message: "User did not respond within the timeout period."
-                })
-              }]
-            };
-          } catch (err) {
-            log.error(`request_user_input failed: ${err}`);
-            return {
-              content: [{
-                type: "text",
-                text: `Failed to request user input: ${err instanceof Error ? err.message : err}`
-              }]
-            };
-          }
-        }
-      ),
-      tool(
-        "request_user_confirmation",
-        "Pause and ask the user for approval or input via the web UI. Returns the user's chosen action_key. Use this BEFORE creating skills, making irreversible changes, etc. The agent will block until the user responds or the timeout expires.",
-        {
-          message: z.string().describe("What to show the user (supports markdown)"),
+          question: z.string().describe("The question to ask (supports markdown). Be specific about what you need and why."),
           options: z.array(z.object({
             label: z.string().describe("Button label shown to user"),
             action_key: z.string().describe("Machine-readable key returned when selected"),
             description: z.string().optional().describe("Tooltip/description for this option")
-          })).describe("Buttons/options to show the user"),
+          })).optional().describe("Suggested options shown as buttons. The user can always type a custom answer instead."),
+          placeholder: z.string().optional().describe("Placeholder text for the free-text input field"),
           timeout_seconds: z.number().optional().describe("How long to wait for response (default: 300)")
         },
         async (args) => {
-          const actionId = `action_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
+          const actionId = `ask_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
           const timeout = (args.timeout_seconds || 300) * 1e3;
           const actionData = {
             id: actionId,
-            type: "confirmation",
-            message: args.message,
-            options: args.options,
+            type: "ask_user",
+            message: args.question,
+            options: args.options || [],
+            placeholder: args.placeholder || "",
             created_at: (/* @__PURE__ */ new Date()).toISOString()
           };
           try {
             await setActionRequest(taskId, actionData);
-            log.info(`Action request ${actionId} stored in metadata, waiting for user response...`);
+            log.info(`Ask user ${actionId}: "${args.question.slice(0, 80)}..."`);
             emitEvent(taskId, "user_action_request", actionData).catch(() => {
             });
             const startTime = Date.now();
@@ -3678,23 +3620,25 @@ ${content}`;
             while (Date.now() - startTime < timeout) {
               const response = await pollActionResponse(taskId);
               if (response && (!response.action_id || response.action_id === actionId)) {
-                const actionKey = response.action_key || response.action || "";
-                const label = response.label || actionKey;
-                log.info(`User responded: ${label} (${actionKey})`);
+                const actionKey = response.action_key || "";
+                const text = response.text || "";
+                const label = response.label || actionKey || text;
+                log.info(`User responded: "${label}"`);
                 return {
                   content: [{
                     type: "text",
                     text: JSON.stringify({
                       status: "responded",
-                      action_key: actionKey,
-                      label
+                      action_key: actionKey || "custom_input",
+                      label,
+                      text: text || label
                     })
                   }]
                 };
               }
               await new Promise((resolve2) => setTimeout(resolve2, pollInterval));
             }
-            log.warn(`Action request ${actionId} timed out after ${args.timeout_seconds || 300}s`);
+            log.warn(`Ask user ${actionId} timed out after ${args.timeout_seconds || 300}s`);
             return {
               content: [{
                 type: "text",
@@ -3705,11 +3649,11 @@ ${content}`;
               }]
             };
           } catch (err) {
-            log.error(`request_user_confirmation failed: ${err}`);
+            log.error(`ask_user failed: ${err}`);
             return {
               content: [{
                 type: "text",
-                text: `Failed to request user confirmation: ${err instanceof Error ? err.message : err}`
+                text: `Failed to ask user: ${err instanceof Error ? err.message : err}`
               }]
             };
           }
@@ -4021,7 +3965,7 @@ Available capabilities:
 
 5. JOB AUTOMATION:
    - When the user describes their job/role/daily work, use skill_generate to decompose it into automatable skills
-   - ALWAYS use request_user_confirmation to get user approval before creating skills \u2014 never create skills without approval
+   - ALWAYS use ask_user to get user approval before creating skills \u2014 never create skills without approval
    - Use job_run to start a job \u2014 it gives you the job's goal and available skills as capabilities
    - When running a job, be AGENTIC: decide dynamically what to do based on what you discover
    - Do NOT follow a fixed sequence \u2014 if checking Slack reveals a task that needs GitHub, go do GitHub immediately
@@ -4055,9 +3999,10 @@ Guidelines:
 - When you learn something about the user (preferences, habits), use memory_store to remember it
 
 CRITICAL \u2014 Ask before you guess:
-- Before executing a task, verify you have all required information. If anything is ambiguous or missing, use request_user_input to ask.
+- Before executing a task, verify you have all required information. If anything is ambiguous or missing, use ask_user to ask.
 - First try to resolve unknowns yourself: check memories, read workspace files (e.g. git remote, config files), or infer from conversation history.
-- If you still lack a critical piece of information after self-resolution, ASK the user via request_user_input. Do NOT guess, assume defaults, or proceed with incomplete information.
+- If you still lack a critical piece of information after self-resolution, ASK the user via ask_user. Do NOT guess, assume defaults, or proceed with incomplete information.
+- When asking, provide suggested options as buttons whenever possible \u2014 the user can always type a custom answer instead.
 - Examples of when to ask: which account/repo/project to target, what format the user wants, which of multiple options to choose, credentials or URLs that cannot be inferred.
 - Keep questions specific and actionable. Explain what you already know and what exactly you need.
 - After receiving the answer, store it with memory_store if it is likely to be useful in future conversations.
@@ -4178,8 +4123,7 @@ var TaskProcessor = class {
         "mcp__assistme-agent__skill_add",
         "mcp__assistme-agent__skill_publish",
         // User interaction
-        "mcp__assistme-agent__request_user_input",
-        "mcp__assistme-agent__request_user_confirmation",
+        "mcp__assistme-agent__ask_user",
         // Job automation tools
         "mcp__assistme-agent__job_run",
         "mcp__assistme-agent__job_schedule",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assistme",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "AssistMe CLI Agent - AI-powered assistant that controls your real browser",
   "type": "module",
   "main": "dist/index.js",

package/src/agent/mcp-servers.ts

@@ -453,12 +453,12 @@ export function createAgentToolsServer(deps: AgentToolsDeps): McpSdkServerConfig
           }
 
           response += `**Your task:** Analyze this job description and decompose it into 4-10 automatable skills.\n\n`;
-          response += `**IMPORTANT — You MUST use request_user_confirmation before creating skills:**\n`;
+          response += `**IMPORTANT — You MUST use ask_user before creating skills:**\n`;
           response += `1. Analyze the job and draft a list of proposed skills (name, emoji, one-line description for each).\n`;
-          response += `2. Call \`request_user_confirmation\` with the formatted skill list as "message" and these options:\n`;
+          response += `2. Call \`ask_user\` with the formatted skill list as "question" and these options:\n`;
           response += `   - options: [{label: "Approve All", action_key: "approve_all", description: "Create all proposed skills"}, {label: "Cancel", action_key: "cancel", description: "Do not create any skills"}]\n`;
           response += `3. WAIT for the response. If action_key is "approve_all", create all skills using \`skill_create\`. If "cancel", stop.\n`;
-          response += `4. Do NOT ask for confirmation in text. Do NOT create skills without calling request_user_confirmation first.\n\n`;
+          response += `4. Do NOT ask for confirmation in text. Do NOT create skills without calling ask_user first.\n\n`;
           response += `For each skill, call \`skill_create\` with:\n`;
           response += `- name: kebab-case name (e.g. "slack-message-check")\n`;
           response += `- description: one-line description\n`;
@@ -616,131 +616,63 @@ export function createAgentToolsServer(deps: AgentToolsDeps): McpSdkServerConfig
         }
       ),
 
-      // ── User Interaction Tools ──────────────────────────────────
+      // ── User Interaction Tool ───────────────────────────────────
 
       tool(
-        "request_user_input",
-        "Ask the user a clarifying question and wait for their free-text response. " +
-          "Use this when you need information that cannot be inferred from context, memory, or the workspace — " +
-          "e.g. which account to use, specific preferences, ambiguous instructions, or missing parameters for a skill. " +
+        "ask_user",
+        "Ask the user a question via the web UI and wait for their response. " +
+          "Shows a message with optional predefined option buttons PLUS a free-text input field — " +
+          "the user can either click a suggested option or type a custom answer. " +
+          "ALWAYS provide options when you can suggest likely answers. " +
           "Do NOT use this for information you can discover yourself (git remote, file contents, etc.).",
         {
-          question: z.string().describe("The question to ask the user (supports markdown). Be specific about what you need and why."),
-          placeholder: z.string().optional().describe("Placeholder text for the input field (e.g. 'https://github.com/owner/repo')"),
-          timeout_seconds: z.number().optional().describe("How long to wait for response (default: 300)"),
-        },
-        async (args) => {
-          const actionId = `input_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
-          const timeout = (args.timeout_seconds || 300) * 1000;
-
-          const actionData = {
-            id: actionId,
-            type: "input",
-            message: args.question,
-            placeholder: args.placeholder || "",
-            created_at: new Date().toISOString(),
-          };
-
-          try {
-            await setActionRequest(taskId, actionData);
-            log.info(`Input request ${actionId}: "${args.question.slice(0, 80)}..."`);
-
-            emitEvent(taskId, "user_action_request", actionData).catch(() => {});
-
-            const startTime = Date.now();
-            const pollInterval = 2000;
-
-            while (Date.now() - startTime < timeout) {
-              const response = await pollActionResponse(taskId);
-              // Match response to this specific request by action_id
-              if (response && (!response.action_id || response.action_id === actionId)) {
-                const text = (response.text || response.value || "") as string;
-                log.info(`User input received: "${text.slice(0, 80)}"`);
-                return {
-                  content: [{
-                    type: "text",
-                    text: JSON.stringify({ status: "responded", text }),
-                  }],
-                };
-              }
-
-              await new Promise((resolve) => setTimeout(resolve, pollInterval));
-            }
-
-            log.warn(`Input request ${actionId} timed out`);
-            return {
-              content: [{
-                type: "text",
-                text: JSON.stringify({
-                  status: "timeout",
-                  message: "User did not respond within the timeout period.",
-                }),
-              }],
-            };
-          } catch (err) {
-            log.error(`request_user_input failed: ${err}`);
-            return {
-              content: [{
-                type: "text",
-                text: `Failed to request user input: ${err instanceof Error ? err.message : err}`,
-              }],
-            };
-          }
-        }
-      ),
-
-      tool(
-        "request_user_confirmation",
-        "Pause and ask the user for approval or input via the web UI. " +
-          "Returns the user's chosen action_key. Use this BEFORE creating skills, making irreversible changes, etc. " +
-          "The agent will block until the user responds or the timeout expires.",
-        {
-          message: z.string().describe("What to show the user (supports markdown)"),
+          question: z.string().describe("The question to ask (supports markdown). Be specific about what you need and why."),
           options: z.array(z.object({
             label: z.string().describe("Button label shown to user"),
             action_key: z.string().describe("Machine-readable key returned when selected"),
             description: z.string().optional().describe("Tooltip/description for this option"),
-          })).describe("Buttons/options to show the user"),
+          })).optional().describe("Suggested options shown as buttons. The user can always type a custom answer instead."),
+          placeholder: z.string().optional().describe("Placeholder text for the free-text input field"),
           timeout_seconds: z.number().optional().describe("How long to wait for response (default: 300)"),
         },
         async (args) => {
-          const actionId = `action_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
+          const actionId = `ask_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
           const timeout = (args.timeout_seconds || 300) * 1000;
 
           const actionData = {
             id: actionId,
-            type: "confirmation",
-            message: args.message,
-            options: args.options,
+            type: "ask_user",
+            message: args.question,
+            options: args.options || [],
+            placeholder: args.placeholder || "",
             created_at: new Date().toISOString(),
           };
 
           try {
-            // Store action request in message metadata via RPC — UI reads this
             await setActionRequest(taskId, actionData);
-            log.info(`Action request ${actionId} stored in metadata, waiting for user response...`);
+            log.info(`Ask user ${actionId}: "${args.question.slice(0, 80)}..."`);
 
-            // Also emit event for real-time notification (best-effort)
             emitEvent(taskId, "user_action_request", actionData).catch(() => {});
 
-            // Poll for response
             const startTime = Date.now();
             const pollInterval = 2000;
 
             while (Date.now() - startTime < timeout) {
               const response = await pollActionResponse(taskId);
-              // Match response to this specific request by action_id
               if (response && (!response.action_id || response.action_id === actionId)) {
-                const actionKey = (response.action_key || response.action || "") as string;
-                const label = (response.label || actionKey) as string;
-                log.info(`User responded: ${label} (${actionKey})`);
+                // 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,
+                      action_key: actionKey || "custom_input",
                       label,
+                      text: text || label,
                     }),
                   }],
                 };
@@ -749,7 +681,7 @@ export function createAgentToolsServer(deps: AgentToolsDeps): McpSdkServerConfig
               await new Promise((resolve) => setTimeout(resolve, pollInterval));
             }
 
-            log.warn(`Action request ${actionId} timed out after ${args.timeout_seconds || 300}s`);
+            log.warn(`Ask user ${actionId} timed out after ${args.timeout_seconds || 300}s`);
             return {
               content: [{
                 type: "text",
@@ -760,11 +692,11 @@ export function createAgentToolsServer(deps: AgentToolsDeps): McpSdkServerConfig
               }],
             };
           } catch (err) {
-            log.error(`request_user_confirmation failed: ${err}`);
+            log.error(`ask_user failed: ${err}`);
             return {
               content: [{
                 type: "text",
-                text: `Failed to request user confirmation: ${err instanceof Error ? err.message : err}`,
+                text: `Failed to ask user: ${err instanceof Error ? err.message : err}`,
               }],
             };
           }

package/src/agent/processor.ts

@@ -81,7 +81,7 @@ Available capabilities:
 
 5. JOB AUTOMATION:
    - When the user describes their job/role/daily work, use skill_generate to decompose it into automatable skills
-   - ALWAYS use request_user_confirmation to get user approval before creating skills — never create skills without approval
+   - ALWAYS use ask_user to get user approval before creating skills — never create skills without approval
    - Use job_run to start a job — it gives you the job's goal and available skills as capabilities
    - When running a job, be AGENTIC: decide dynamically what to do based on what you discover
    - Do NOT follow a fixed sequence — if checking Slack reveals a task that needs GitHub, go do GitHub immediately
@@ -115,9 +115,10 @@ Guidelines:
 - When you learn something about the user (preferences, habits), use memory_store to remember it
 
 CRITICAL — Ask before you guess:
-- Before executing a task, verify you have all required information. If anything is ambiguous or missing, use request_user_input to ask.
+- Before executing a task, verify you have all required information. If anything is ambiguous or missing, use ask_user to ask.
 - First try to resolve unknowns yourself: check memories, read workspace files (e.g. git remote, config files), or infer from conversation history.
-- If you still lack a critical piece of information after self-resolution, ASK the user via request_user_input. Do NOT guess, assume defaults, or proceed with incomplete information.
+- If you still lack a critical piece of information after self-resolution, ASK the user via ask_user. Do NOT guess, assume defaults, or proceed with incomplete information.
+- When asking, provide suggested options as buttons whenever possible — the user can always type a custom answer instead.
 - Examples of when to ask: which account/repo/project to target, what format the user wants, which of multiple options to choose, credentials or URLs that cannot be inferred.
 - Keep questions specific and actionable. Explain what you already know and what exactly you need.
 - After receiving the answer, store it with memory_store if it is likely to be useful in future conversations.
@@ -277,8 +278,7 @@ export class TaskProcessor {
         "mcp__assistme-agent__skill_add",
         "mcp__assistme-agent__skill_publish",
         // User interaction
-        "mcp__assistme-agent__request_user_input",
-        "mcp__assistme-agent__request_user_confirmation",
+        "mcp__assistme-agent__ask_user",
         // Job automation tools
         "mcp__assistme-agent__job_run",
         "mcp__assistme-agent__job_schedule",