@vibescope/mcp-server 0.2.1 → 0.2.2

package/dist/handlers/file-checkouts.d.ts

@@ -6,12 +6,14 @@
  * - checkin_file: Check in a file after editing
  * - get_file_checkouts: Get active checkouts for a project
  * - abandon_checkout: Force release a checkout
+ * - is_file_available: Check if a file is available for checkout
  */
 import type { Handler, HandlerRegistry } from './types.js';
 export declare const checkoutFile: Handler;
 export declare const checkinFile: Handler;
 export declare const getFileCheckouts: Handler;
 export declare const abandonCheckout: Handler;
+export declare const isFileAvailable: Handler;
 /**
  * File Checkouts handlers registry
  */

package/dist/handlers/file-checkouts.js

@@ -6,6 +6,7 @@
  * - checkin_file: Check in a file after editing
  * - get_file_checkouts: Get active checkouts for a project
  * - abandon_checkout: Force release a checkout
+ * - is_file_available: Check if a file is available for checkout
  */
 import { parseArgs, uuidValidator, createEnumValidator } from '../validators.js';
 import { getApiClient } from '../api-client.js';
@@ -33,12 +34,16 @@ const abandonCheckoutSchema = {
     project_id: { type: 'string', validate: uuidValidator },
     file_path: { type: 'string' },
 };
+const isFileAvailableSchema = {
+    project_id: { type: 'string', required: true, validate: uuidValidator },
+    file_path: { type: 'string', required: true },
+};
 export const checkoutFile = async (args, ctx) => {
     const { project_id, file_path, reason } = parseArgs(args, checkoutFileSchema);
     const apiClient = getApiClient();
     const response = await apiClient.checkoutFile(project_id, file_path, reason, ctx.session.currentSessionId || undefined);
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to checkout file');
+        return { result: { error: response.error || 'Failed to checkout file' }, isError: true };
     }
     return { result: response.data };
 };
@@ -46,7 +51,7 @@ export const checkinFile = async (args, ctx) => {
     const { checkout_id, project_id, file_path, summary } = parseArgs(args, checkinFileSchema);
     // Validate that either checkout_id or both project_id and file_path are provided
     if (!checkout_id && (!project_id || !file_path)) {
-        throw new Error('Either checkout_id or both project_id and file_path are required');
+        return { result: { error: 'Either checkout_id or both project_id and file_path are required' }, isError: true };
     }
     const apiClient = getApiClient();
     const response = await apiClient.checkinFile({
@@ -56,7 +61,7 @@ export const checkinFile = async (args, ctx) => {
         summary
     }, ctx.session.currentSessionId || undefined);
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to checkin file');
+        return { result: { error: response.error || 'Failed to checkin file' }, isError: true };
     }
     return { result: response.data };
 };
@@ -69,7 +74,7 @@ export const getFileCheckouts = async (args, _ctx) => {
         limit
     });
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to get file checkouts');
+        return { result: { error: response.error || 'Failed to get file checkouts' }, isError: true };
     }
     return { result: response.data };
 };
@@ -77,7 +82,7 @@ export const abandonCheckout = async (args, _ctx) => {
     const { checkout_id, project_id, file_path } = parseArgs(args, abandonCheckoutSchema);
     // Validate that either checkout_id or both project_id and file_path are provided
     if (!checkout_id && (!project_id || !file_path)) {
-        throw new Error('Either checkout_id or both project_id and file_path are required');
+        return { result: { error: 'Either checkout_id or both project_id and file_path are required' }, isError: true };
     }
     const apiClient = getApiClient();
     const response = await apiClient.abandonCheckout({
@@ -86,10 +91,36 @@ export const abandonCheckout = async (args, _ctx) => {
         file_path
     });
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to abandon checkout');
+        return { result: { error: response.error || 'Failed to abandon checkout' }, isError: true };
     }
     return { result: response.data };
 };
+export const isFileAvailable = async (args, _ctx) => {
+    const { project_id, file_path } = parseArgs(args, isFileAvailableSchema);
+    const apiClient = getApiClient();
+    const response = await apiClient.getFileCheckouts(project_id, {
+        status: 'checked_out',
+        file_path,
+        limit: 1
+    });
+    if (!response.ok) {
+        return { result: { error: response.error || 'Failed to check file availability' }, isError: true };
+    }
+    const checkouts = response.data?.checkouts || [];
+    const activeCheckout = checkouts.length > 0 ? checkouts[0] : null;
+    return {
+        result: {
+            available: !activeCheckout,
+            file_path,
+            checked_out_by: activeCheckout ? {
+                checkout_id: activeCheckout.id,
+                checked_out_by: activeCheckout.checked_out_by,
+                checked_out_at: activeCheckout.checked_out_at,
+                reason: activeCheckout.checkout_reason
+            } : null
+        }
+    };
+};
 /**
  * File Checkouts handlers registry
  */
@@ -98,4 +129,5 @@ export const fileCheckoutHandlers = {
     checkin_file: checkinFile,
     get_file_checkouts: getFileCheckouts,
     abandon_checkout: abandonCheckout,
+    is_file_available: isFileAvailable,
 };

package/dist/handlers/findings.js

@@ -8,6 +8,7 @@
  * - update_finding
  * - delete_finding
  */
+import { success, error } from './types.js';
 import { parseArgs, uuidValidator, createEnumValidator } from '../validators.js';
 import { getApiClient } from '../api-client.js';
 const VALID_FINDING_CATEGORIES = ['performance', 'security', 'code_quality', 'accessibility', 'documentation', 'architecture', 'testing', 'other'];
@@ -69,9 +70,9 @@ export const addFinding = async (args, ctx) => {
         related_task_id
     }, ctx.session.currentSessionId || undefined);
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to add finding');
+        return error(response.error || 'Failed to add finding');
     }
-    return { result: response.data };
+    return success(response.data);
 };
 export const getFindings = async (args, _ctx) => {
     const { project_id, category, severity, status, limit, offset, search_query, summary_only } = parseArgs(args, getFindingsSchema);
@@ -86,9 +87,9 @@ export const getFindings = async (args, _ctx) => {
         summary_only
     });
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to get findings');
+        return error(response.error || 'Failed to get findings');
     }
-    return { result: response.data };
+    return success(response.data);
 };
 /**
  * Get aggregate statistics about findings for a project.
@@ -100,9 +101,9 @@ export const getFindingsStats = async (args, _ctx) => {
     const apiClient = getApiClient();
     const response = await apiClient.getFindingsStats(project_id);
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to get findings stats');
+        return error(response.error || 'Failed to get findings stats');
     }
-    return { result: response.data };
+    return success(response.data);
 };
 export const updateFinding = async (args, _ctx) => {
     const { finding_id, title, description, severity, status, resolution_note } = parseArgs(args, updateFindingSchema);
@@ -115,18 +116,18 @@ export const updateFinding = async (args, _ctx) => {
         resolution_note
     });
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to update finding');
+        return error(response.error || 'Failed to update finding');
     }
-    return { result: response.data };
+    return success(response.data);
 };
 export const deleteFinding = async (args, _ctx) => {
     const { finding_id } = parseArgs(args, deleteFindingSchema);
     const apiClient = getApiClient();
     const response = await apiClient.deleteFinding(finding_id);
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to delete finding');
+        return error(response.error || 'Failed to delete finding');
     }
-    return { result: response.data };
+    return success(response.data);
 };
 /**
  * Query aggregated project knowledge in a single call.
@@ -145,9 +146,9 @@ export const queryKnowledgeBase = async (args, _ctx) => {
         search_query
     });
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to query knowledge base');
+        return error(response.error || 'Failed to query knowledge base');
     }
-    return { result: response.data };
+    return success(response.data);
 };
 /**
  * Findings handlers registry

package/dist/handlers/git-issues.js

@@ -56,7 +56,7 @@ export const addGitIssue = async (args, ctx) => {
         task_id
     }, ctx.session.currentSessionId || undefined);
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to add git issue');
+        return { result: { error: response.error || 'Failed to add git issue' }, isError: true };
     }
     return { result: response.data };
 };
@@ -68,7 +68,7 @@ export const resolveGitIssue = async (args, ctx) => {
         auto_resolved
     }, ctx.session.currentSessionId || undefined);
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to resolve git issue');
+        return { result: { error: response.error || 'Failed to resolve git issue' }, isError: true };
     }
     return { result: response.data };
 };
@@ -82,7 +82,7 @@ export const getGitIssues = async (args, _ctx) => {
         limit
     });
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to fetch git issues');
+        return { result: { error: response.error || 'Failed to fetch git issues' }, isError: true };
     }
     return { result: response.data };
 };
@@ -91,7 +91,7 @@ export const deleteGitIssue = async (args, _ctx) => {
     const apiClient = getApiClient();
     const response = await apiClient.deleteGitIssue(git_issue_id);
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to delete git issue');
+        return { result: { error: response.error || 'Failed to delete git issue' }, isError: true };
     }
     return { result: response.data };
 };

package/dist/handlers/ideas.js

@@ -53,7 +53,7 @@ export const addIdea = async (args, ctx) => {
         status: status
     }, session.currentSessionId || undefined);
     if (!response.ok) {
-        throw new Error(`Failed to add idea: ${response.error}`);
+        return { result: { error: response.error || 'Failed to add idea' }, isError: true };
     }
     return { result: { success: true, idea_id: response.data?.idea_id, title } };
 };
@@ -67,7 +67,7 @@ export const updateIdea = async (args, _ctx) => {
         doc_url
     });
     if (!response.ok) {
-        throw new Error(`Failed to update idea: ${response.error}`);
+        return { result: { error: response.error || 'Failed to update idea' }, isError: true };
     }
     return { result: { success: true, idea_id } };
 };
@@ -81,7 +81,7 @@ export const getIdeas = async (args, _ctx) => {
         search_query
     });
     if (!response.ok) {
-        throw new Error(`Failed to fetch ideas: ${response.error}`);
+        return { result: { error: response.error || 'Failed to fetch ideas' }, isError: true };
     }
     return {
         result: {
@@ -94,7 +94,7 @@ export const deleteIdea = async (args, _ctx) => {
     const apiClient = getApiClient();
     const response = await apiClient.deleteIdea(idea_id);
     if (!response.ok) {
-        throw new Error(`Failed to delete idea: ${response.error}`);
+        return { result: { error: response.error || 'Failed to delete idea' }, isError: true };
     }
     return { result: { success: true } };
 };
@@ -109,7 +109,7 @@ export const convertIdeaToTask = async (args, _ctx) => {
         update_status
     });
     if (!response.ok) {
-        throw new Error(`Failed to convert idea: ${response.error}`);
+        return { result: { error: response.error || 'Failed to convert idea' }, isError: true };
     }
     return { result: response.data };
 };

package/dist/handlers/index.d.ts

@@ -26,6 +26,7 @@ export * from './git-issues.js';
 export * from './sprints.js';
 export * from './file-checkouts.js';
 export * from './roles.js';
+export * from './connectors.js';
 import type { HandlerRegistry } from './types.js';
 /**
  * Build the complete handler registry from all modules

package/dist/handlers/index.js

@@ -26,6 +26,7 @@ export * from './git-issues.js';
 export * from './sprints.js';
 export * from './file-checkouts.js';
 export * from './roles.js';
+export * from './connectors.js';
 import { milestoneHandlers } from './milestones.js';
 import { sessionHandlers } from './session.js';
 import { ideaHandlers } from './ideas.js';
@@ -47,6 +48,7 @@ import { gitIssueHandlers } from './git-issues.js';
 import { sprintHandlers } from './sprints.js';
 import { fileCheckoutHandlers } from './file-checkouts.js';
 import { roleHandlers } from './roles.js';
+import { connectorHandlers } from './connectors.js';
 /**
  * Build the complete handler registry from all modules
  */
@@ -73,5 +75,6 @@ export function buildHandlerRegistry() {
         ...sprintHandlers,
         ...fileCheckoutHandlers,
         ...roleHandlers,
+        ...connectorHandlers,
     };
 }

package/dist/handlers/milestones.js

@@ -46,7 +46,7 @@ export const addMilestone = async (args, ctx) => {
         order_index
     }, session.currentSessionId || undefined);
     if (!response.ok) {
-        throw new Error(`Failed to add milestone: ${response.error}`);
+        return { result: { error: response.error || 'Failed to add milestone' }, isError: true };
     }
     return {
         result: {
@@ -69,7 +69,7 @@ export const updateMilestone = async (args, _ctx) => {
         order_index
     });
     if (!response.ok) {
-        throw new Error(`Failed to update milestone: ${response.error}`);
+        return { result: { error: response.error || 'Failed to update milestone' }, isError: true };
     }
     return {
         result: {
@@ -83,7 +83,7 @@ export const completeMilestone = async (args, _ctx) => {
     const apiClient = getApiClient();
     const response = await apiClient.completeMilestone(milestone_id);
     if (!response.ok) {
-        throw new Error(`Failed to complete milestone: ${response.error}`);
+        return { result: { error: response.error || 'Failed to complete milestone' }, isError: true };
     }
     return {
         result: {
@@ -97,7 +97,7 @@ export const deleteMilestone = async (args, _ctx) => {
     const apiClient = getApiClient();
     const response = await apiClient.deleteMilestone(milestone_id);
     if (!response.ok) {
-        throw new Error(`Failed to delete milestone: ${response.error}`);
+        return { result: { error: response.error || 'Failed to delete milestone' }, isError: true };
     }
     return {
         result: {
@@ -111,7 +111,7 @@ export const getMilestones = async (args, _ctx) => {
     const apiClient = getApiClient();
     const response = await apiClient.getMilestones(task_id);
     if (!response.ok) {
-        throw new Error(`Failed to get milestones: ${response.error}`);
+        return { result: { error: response.error || 'Failed to get milestones' }, isError: true };
     }
     // Stats are calculated server-side now
     return {

package/dist/handlers/organizations.js

@@ -84,7 +84,7 @@ export const listOrganizations = async (_args, _ctx) => {
     const apiClient = getApiClient();
     const response = await apiClient.listOrganizations();
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to list organizations');
+        return { result: { error: response.error || 'Failed to list organizations' }, isError: true };
     }
     return { result: response.data };
 };
@@ -97,7 +97,7 @@ export const createOrganization = async (args, _ctx) => {
         slug
     });
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to create organization');
+        return { result: { error: response.error || 'Failed to create organization' }, isError: true };
     }
     return { result: response.data };
 };
@@ -117,7 +117,7 @@ export const updateOrganization = async (args, _ctx) => {
     const apiClient = getApiClient();
     const response = await apiClient.updateOrganization(organization_id, updates);
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to update organization');
+        return { result: { error: response.error || 'Failed to update organization' }, isError: true };
     }
     return { result: response.data };
 };
@@ -126,7 +126,7 @@ export const deleteOrganization = async (args, _ctx) => {
     const apiClient = getApiClient();
     const response = await apiClient.deleteOrganization(organization_id);
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to delete organization');
+        return { result: { error: response.error || 'Failed to delete organization' }, isError: true };
     }
     return { result: response.data };
 };
@@ -138,7 +138,7 @@ export const listOrgMembers = async (args, _ctx) => {
     const apiClient = getApiClient();
     const response = await apiClient.listOrgMembers(organization_id);
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to list members');
+        return { result: { error: response.error || 'Failed to list members' }, isError: true };
     }
     return { result: response.data };
 };
@@ -147,7 +147,7 @@ export const inviteMember = async (args, _ctx) => {
     const apiClient = getApiClient();
     const response = await apiClient.inviteMember(organization_id, email, role);
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to create invite');
+        return { result: { error: response.error || 'Failed to create invite' }, isError: true };
     }
     return { result: response.data };
 };
@@ -159,7 +159,7 @@ export const updateMemberRole = async (args, _ctx) => {
     const apiClient = getApiClient();
     const response = await apiClient.updateMemberRole(organization_id, user_id, role);
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to update member role');
+        return { result: { error: response.error || 'Failed to update member role' }, isError: true };
     }
     return { result: response.data };
 };
@@ -168,7 +168,7 @@ export const removeMember = async (args, _ctx) => {
     const apiClient = getApiClient();
     const response = await apiClient.removeMember(organization_id, user_id);
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to remove member');
+        return { result: { error: response.error || 'Failed to remove member' }, isError: true };
     }
     return { result: response.data };
 };
@@ -177,7 +177,7 @@ export const leaveOrganization = async (args, _ctx) => {
     const apiClient = getApiClient();
     const response = await apiClient.leaveOrganization(organization_id);
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to leave organization');
+        return { result: { error: response.error || 'Failed to leave organization' }, isError: true };
     }
     return { result: response.data };
 };
@@ -189,7 +189,7 @@ export const shareProjectWithOrg = async (args, _ctx) => {
     const apiClient = getApiClient();
     const response = await apiClient.shareProjectWithOrg(project_id, organization_id, permission);
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to share project');
+        return { result: { error: response.error || 'Failed to share project' }, isError: true };
     }
     return { result: response.data };
 };
@@ -198,7 +198,7 @@ export const updateProjectShare = async (args, _ctx) => {
     const apiClient = getApiClient();
     const response = await apiClient.updateProjectShare(project_id, organization_id, permission);
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to update share');
+        return { result: { error: response.error || 'Failed to update share' }, isError: true };
     }
     return { result: response.data };
 };
@@ -207,7 +207,7 @@ export const unshareProject = async (args, _ctx) => {
     const apiClient = getApiClient();
     const response = await apiClient.unshareProject(project_id, organization_id);
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to unshare project');
+        return { result: { error: response.error || 'Failed to unshare project' }, isError: true };
     }
     return { result: response.data };
 };
@@ -216,7 +216,7 @@ export const listProjectShares = async (args, _ctx) => {
     const apiClient = getApiClient();
     const response = await apiClient.listProjectShares(project_id);
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to list shares');
+        return { result: { error: response.error || 'Failed to list shares' }, isError: true };
     }
     return { result: response.data };
 };

package/dist/handlers/progress.js

@@ -34,7 +34,7 @@ export const logProgress = async (args, ctx) => {
         session_id: session.currentSessionId || undefined
     });
     if (!response.ok) {
-        throw new Error(`Failed to log progress: ${response.error}`);
+        return { result: { error: response.error || 'Failed to log progress' }, isError: true };
     }
     return { result: { success: true, progress_id: response.data?.progress_id } };
 };
@@ -49,7 +49,7 @@ export const getActivityFeed = async (args, _ctx) => {
         created_by
     });
     if (!response.ok) {
-        throw new Error(`Failed to fetch activity feed: ${response.error}`);
+        return { result: { error: response.error || 'Failed to fetch activity feed' }, isError: true };
     }
     return { result: { activities: response.data?.activities || [] } };
 };

package/dist/handlers/project.js

@@ -53,14 +53,14 @@ export const getProjectContext = async (args, _ctx) => {
     if (!project_id && !git_url) {
         const response = await apiClient.listProjects();
         if (!response.ok) {
-            throw new Error(response.error || 'Failed to fetch projects');
+            return { result: { error: response.error || 'Failed to fetch projects' }, isError: true };
         }
         return { result: { projects: response.data?.projects || [] } };
     }
     // Find project by ID or git_url
     const response = await apiClient.getProject(project_id || 'by-git-url', git_url);
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to fetch project');
+        return { result: { error: response.error || 'Failed to fetch project' }, isError: true };
     }
     if (!response.data?.found) {
         return {
@@ -77,7 +77,7 @@ export const getGitWorkflow = async (args, _ctx) => {
     const apiClient = getApiClient();
     const response = await apiClient.getGitWorkflow(project_id, task_id);
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to get git workflow');
+        return { result: { error: response.error || 'Failed to get git workflow' }, isError: true };
     }
     return { result: response.data };
 };
@@ -92,7 +92,7 @@ export const createProject = async (args, _ctx) => {
         tech_stack: tech_stack
     });
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to create project');
+        return { result: { error: response.error || 'Failed to create project' }, isError: true };
     }
     return { result: response.data };
 };
@@ -114,7 +114,7 @@ export const updateProject = async (args, _ctx) => {
         deployment_instructions
     });
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to update project');
+        return { result: { error: response.error || 'Failed to update project' }, isError: true };
     }
     return { result: response.data };
 };
@@ -123,7 +123,7 @@ export const updateProjectReadme = async (args, _ctx) => {
     const apiClient = getApiClient();
     const response = await apiClient.updateProjectReadme(project_id, readme_content);
     if (!response.ok) {
-        throw new Error(response.error || 'Failed to update README');
+        return { result: { error: response.error || 'Failed to update README' }, isError: true };
     }
     return { result: response.data };
 };

package/dist/handlers/requests.js

@@ -27,7 +27,7 @@ export const getPendingRequests = async (args, ctx) => {
     const apiClient = getApiClient();
     const response = await apiClient.getPendingRequests(project_id, session.currentSessionId || undefined);
     if (!response.ok) {
-        throw new Error(`Failed to get pending requests: ${response.error}`);
+        return { result: { error: response.error || 'Failed to get pending requests' }, isError: true };
     }
     return {
         result: {
@@ -42,7 +42,7 @@ export const acknowledgeRequest = async (args, ctx) => {
     const apiClient = getApiClient();
     const response = await apiClient.acknowledgeRequest(request_id, session.currentSessionId || undefined);
     if (!response.ok) {
-        throw new Error(`Failed to acknowledge request: ${response.error}`);
+        return { result: { error: response.error || 'Failed to acknowledge request' }, isError: true };
     }
     return {
         result: {
@@ -56,7 +56,7 @@ export const answerQuestion = async (args, ctx) => {
     const apiClient = getApiClient();
     const response = await apiClient.answerQuestion(request_id, answer, session.currentSessionId || undefined);
     if (!response.ok) {
-        throw new Error(`Failed to answer question: ${response.error}`);
+        return { result: { error: response.error || 'Failed to answer question' }, isError: true };
     }
     return {
         result: {

package/dist/handlers/session.js

@@ -83,20 +83,33 @@ export const startWorkSession = async (args, ctx) => {
             currentPersona: data.persona || null,
         });
     }
-    // Build result with directive at top for visibility
+    // Check for urgent questions - these MUST be handled first
+    const hasUrgentQuestions = data.URGENT_QUESTIONS || (data.pending_requests && data.pending_requests.length > 0);
+    // Build result - URGENT_QUESTIONS at absolute top for maximum visibility
     const result = {
         session_started: true,
-        directive: data.directive || 'ACTION_REQUIRED: Start working immediately.',
-        auto_continue: true,
-        session_id: data.session_id,
-        persona: data.persona,
-        role: data.role,
-        project: data.project,
     };
+    // URGENT_QUESTIONS must be the FIRST thing the agent sees
+    if (data.URGENT_QUESTIONS) {
+        result.URGENT_QUESTIONS = data.URGENT_QUESTIONS;
+    }
+    // Directive comes right after urgent questions
+    result.directive = data.directive || 'ACTION_REQUIRED: Start working immediately.';
+    result.auto_continue = true;
+    // Session info
+    result.session_id = data.session_id;
+    result.persona = data.persona;
+    result.role = data.role;
+    result.project = data.project;
     // Add task data
     if (data.next_task) {
         result.next_task = data.next_task;
     }
+    // Add pending requests (questions from user) - these take priority
+    if (data.pending_requests && data.pending_requests.length > 0) {
+        result.pending_requests = data.pending_requests;
+        result.pending_requests_count = data.pending_requests.length;
+    }
     // Add active tasks for full mode
     if (data.active_tasks) {
         result.active_tasks = data.active_tasks;
@@ -125,8 +138,14 @@ export const startWorkSession = async (args, ctx) => {
             worktree_hint: 'CRITICAL: Create a git worktree before starting work. Run get_help("git") for instructions.',
         };
     }
-    // Add next action at end
-    if (data.next_task) {
+    // Add next action at end - pending requests take priority over tasks
+    if (hasUrgentQuestions) {
+        const firstQuestion = data.URGENT_QUESTIONS?.requests?.[0] || data.pending_requests?.[0];
+        result.next_action = firstQuestion
+            ? `answer_question(request_id: "${firstQuestion.id}", answer: "...")`
+            : 'Check pending_requests and respond using answer_question(request_id, answer)';
+    }
+    else if (data.next_task) {
         result.next_action = `update_task(task_id: "${data.next_task.id}", status: "in_progress")`;
     }
     else if (data.project) {