@vibescope/mcp-server 0.2.1 → 0.2.3

package/src/handlers/organizations.test.ts

@@ -68,14 +68,17 @@ describe('listOrganizations', () => {
 		expect(result.result).toMatchObject({ count: 1 });
 	});
 
-	it('should throw error when query fails', async () => {
+	it('should return error when query fails', async () => {
 		mockApiClient.listOrganizations.mockResolvedValue({
 			ok: false,
 			error: 'Failed to list organizations',
 		});
 		const ctx = createMockContext();
 
-		await expect(listOrganizations({}, ctx)).rejects.toThrow('Failed to list organizations');
+		const result = await listOrganizations({}, ctx);
+
+		expect(result.isError).toBe(true);
+		expect(result.result).toMatchObject({ error: 'Failed to list organizations' });
 	});
 });
 
@@ -91,16 +94,17 @@ describe('createOrganization', () => {
 		await expect(createOrganization({}, ctx)).rejects.toThrow(ValidationError);
 	});
 
-	it('should throw error when slug is taken', async () => {
+	it('should return error when slug is taken', async () => {
 		mockApiClient.createOrganization.mockResolvedValue({
 			ok: false,
 			error: 'Organization slug "test-org" is already taken',
 		});
 		const ctx = createMockContext();
 
-		await expect(
-			createOrganization({ name: 'Test Org' }, ctx)
-		).rejects.toThrow('Organization slug "test-org" is already taken');
+		const result = await createOrganization({ name: 'Test Org' }, ctx);
+
+		expect(result.isError).toBe(true);
+		expect(result.result).toMatchObject({ error: 'Organization slug "test-org" is already taken' });
 	});
 
 	it('should create organization with auto-generated slug', async () => {
@@ -138,16 +142,17 @@ describe('createOrganization', () => {
 		expect(result.result).toMatchObject({ success: true });
 	});
 
-	it('should throw error when insert fails', async () => {
+	it('should return error when insert fails', async () => {
 		mockApiClient.createOrganization.mockResolvedValue({
 			ok: false,
 			error: 'Failed to create organization',
 		});
 		const ctx = createMockContext();
 
-		await expect(
-			createOrganization({ name: 'Test Org' }, ctx)
-		).rejects.toThrow('Failed to create organization');
+		const result = await createOrganization({ name: 'Test Org' }, ctx);
+
+		expect(result.isError).toBe(true);
+		expect(result.result).toMatchObject({ error: 'Failed to create organization' });
 	});
 });
 
@@ -174,9 +179,10 @@ describe('updateOrganization', () => {
 
 	it('should throw error when no updates provided', async () => {
 		const ctx = createMockContext();
+
 		await expect(
 			updateOrganization({ organization_id: VALID_UUID }, ctx)
-		).rejects.toThrow('No updates provided');
+		).rejects.toThrow(ValidationError);
 	});
 
 	it('should update organization successfully', async () => {
@@ -194,16 +200,17 @@ describe('updateOrganization', () => {
 		expect(result.result).toMatchObject({ success: true });
 	});
 
-	it('should throw error when update fails', async () => {
+	it('should return error when update fails', async () => {
 		mockApiClient.updateOrganization.mockResolvedValue({
 			ok: false,
 			error: 'Failed to update organization',
 		});
 		const ctx = createMockContext();
 
-		await expect(
-			updateOrganization({ organization_id: VALID_UUID, name: 'New Name' }, ctx)
-		).rejects.toThrow('Failed to update organization');
+		const result = await updateOrganization({ organization_id: VALID_UUID, name: 'New Name' }, ctx);
+
+		expect(result.isError).toBe(true);
+		expect(result.result).toMatchObject({ error: 'Failed to update organization' });
 	});
 });
 
@@ -241,16 +248,17 @@ describe('deleteOrganization', () => {
 		});
 	});
 
-	it('should throw error when delete fails', async () => {
+	it('should return error when delete fails', async () => {
 		mockApiClient.deleteOrganization.mockResolvedValue({
 			ok: false,
 			error: 'Failed to delete organization',
 		});
 		const ctx = createMockContext();
 
-		await expect(
-			deleteOrganization({ organization_id: VALID_UUID }, ctx)
-		).rejects.toThrow('Failed to delete organization');
+		const result = await deleteOrganization({ organization_id: VALID_UUID }, ctx);
+
+		expect(result.isError).toBe(true);
+		expect(result.result).toMatchObject({ error: 'Failed to delete organization' });
 	});
 });
 
@@ -303,16 +311,17 @@ describe('listOrgMembers', () => {
 		expect(result.result).toMatchObject({ count: 2 });
 	});
 
-	it('should throw error when query fails', async () => {
+	it('should return error when query fails', async () => {
 		mockApiClient.listOrgMembers.mockResolvedValue({
 			ok: false,
 			error: 'Failed to list members',
 		});
 		const ctx = createMockContext();
 
-		await expect(
-			listOrgMembers({ organization_id: VALID_UUID }, ctx)
-		).rejects.toThrow('Failed to list members');
+		const result = await listOrgMembers({ organization_id: VALID_UUID }, ctx);
+
+		expect(result.isError).toBe(true);
+		expect(result.result).toMatchObject({ error: 'Failed to list members' });
 	});
 });
 
@@ -337,16 +346,17 @@ describe('inviteMember', () => {
 		).rejects.toThrow(ValidationError);
 	});
 
-	it('should throw error when invite already exists', async () => {
+	it('should return error when invite already exists', async () => {
 		mockApiClient.inviteMember.mockResolvedValue({
 			ok: false,
 			error: 'A pending invite already exists for test@example.com',
 		});
 		const ctx = createMockContext();
 
-		await expect(
-			inviteMember({ organization_id: VALID_UUID, email: 'test@example.com' }, ctx)
-		).rejects.toThrow('A pending invite already exists for test@example.com');
+		const result = await inviteMember({ organization_id: VALID_UUID, email: 'test@example.com' }, ctx);
+
+		expect(result.isError).toBe(true);
+		expect(result.result).toMatchObject({ error: 'A pending invite already exists for test@example.com' });
 	});
 
 	it('should create invite successfully with default role', async () => {
@@ -371,16 +381,17 @@ describe('inviteMember', () => {
 		});
 	});
 
-	it('should throw error when insert fails', async () => {
+	it('should return error when insert fails', async () => {
 		mockApiClient.inviteMember.mockResolvedValue({
 			ok: false,
 			error: 'Failed to create invite',
 		});
 		const ctx = createMockContext();
 
-		await expect(
-			inviteMember({ organization_id: VALID_UUID, email: 'test@example.com' }, ctx)
-		).rejects.toThrow('Failed to create invite');
+		const result = await inviteMember({ organization_id: VALID_UUID, email: 'test@example.com' }, ctx);
+
+		expect(result.isError).toBe(true);
+		expect(result.result).toMatchObject({ error: 'Failed to create invite' });
 	});
 });
 
@@ -412,20 +423,21 @@ describe('updateMemberRole', () => {
 		).rejects.toThrow(ValidationError);
 	});
 
-	it('should throw error when changing own role', async () => {
+	it('should return error when changing own role', async () => {
 		mockApiClient.updateMemberRole.mockResolvedValue({
 			ok: false,
 			error: 'Cannot change your own role',
 		});
 		const ctx = createMockContext({ userId: VALID_UUID });
 
-		await expect(
-			updateMemberRole({
-				organization_id: OTHER_UUID,
-				user_id: VALID_UUID,
-				role: 'admin',
-			}, ctx)
-		).rejects.toThrow('Cannot change your own role');
+		const result = await updateMemberRole({
+			organization_id: OTHER_UUID,
+			user_id: VALID_UUID,
+			role: 'admin',
+		}, ctx);
+
+		expect(result.isError).toBe(true);
+		expect(result.result).toMatchObject({ error: 'Cannot change your own role' });
 	});
 
 	it('should update member role successfully', async () => {
@@ -444,20 +456,21 @@ describe('updateMemberRole', () => {
 		expect(result.result).toMatchObject({ success: true });
 	});
 
-	it('should throw error when update fails', async () => {
+	it('should return error when update fails', async () => {
 		mockApiClient.updateMemberRole.mockResolvedValue({
 			ok: false,
 			error: 'Failed to update member role',
 		});
 		const ctx = createMockContext();
 
-		await expect(
-			updateMemberRole({
-				organization_id: VALID_UUID,
-				user_id: OTHER_UUID,
-				role: 'admin',
-			}, ctx)
-		).rejects.toThrow('Failed to update member role');
+		const result = await updateMemberRole({
+			organization_id: VALID_UUID,
+			user_id: OTHER_UUID,
+			role: 'admin',
+		}, ctx);
+
+		expect(result.isError).toBe(true);
+		expect(result.result).toMatchObject({ error: 'Failed to update member role' });
 	});
 });
 
@@ -503,16 +516,17 @@ describe('removeMember', () => {
 		});
 	});
 
-	it('should throw error when delete fails', async () => {
+	it('should return error when delete fails', async () => {
 		mockApiClient.removeMember.mockResolvedValue({
 			ok: false,
 			error: 'Failed to remove member',
 		});
 		const ctx = createMockContext();
 
-		await expect(
-			removeMember({ organization_id: VALID_UUID, user_id: OTHER_UUID }, ctx)
-		).rejects.toThrow('Failed to remove member');
+		const result = await removeMember({ organization_id: VALID_UUID, user_id: OTHER_UUID }, ctx);
+
+		expect(result.isError).toBe(true);
+		expect(result.result).toMatchObject({ error: 'Failed to remove member' });
 	});
 });
 
@@ -528,16 +542,17 @@ describe('leaveOrganization', () => {
 		await expect(leaveOrganization({}, ctx)).rejects.toThrow(ValidationError);
 	});
 
-	it('should throw error when user is owner', async () => {
+	it('should return error when user is owner', async () => {
 		mockApiClient.leaveOrganization.mockResolvedValue({
 			ok: false,
 			error: 'Owner cannot leave. Transfer ownership first or delete the organization.',
 		});
 		const ctx = createMockContext();
 
-		await expect(
-			leaveOrganization({ organization_id: VALID_UUID }, ctx)
-		).rejects.toThrow('Owner cannot leave. Transfer ownership first or delete the organization.');
+		const result = await leaveOrganization({ organization_id: VALID_UUID }, ctx);
+
+		expect(result.isError).toBe(true);
+		expect(result.result).toMatchObject({ error: 'Owner cannot leave. Transfer ownership first or delete the organization.' });
 	});
 
 	it('should leave organization successfully', async () => {
@@ -555,16 +570,17 @@ describe('leaveOrganization', () => {
 		});
 	});
 
-	it('should throw error when delete fails', async () => {
+	it('should return error when delete fails', async () => {
 		mockApiClient.leaveOrganization.mockResolvedValue({
 			ok: false,
 			error: 'Failed to leave organization',
 		});
 		const ctx = createMockContext();
 
-		await expect(
-			leaveOrganization({ organization_id: VALID_UUID }, ctx)
-		).rejects.toThrow('Failed to leave organization');
+		const result = await leaveOrganization({ organization_id: VALID_UUID }, ctx);
+
+		expect(result.isError).toBe(true);
+		expect(result.result).toMatchObject({ error: 'Failed to leave organization' });
 	});
 });
 
@@ -589,16 +605,17 @@ describe('shareProjectWithOrg', () => {
 		).rejects.toThrow(ValidationError);
 	});
 
-	it('should throw error when project not found or not owned', async () => {
+	it('should return error when project not found or not owned', async () => {
 		mockApiClient.shareProjectWithOrg.mockResolvedValue({
 			ok: false,
 			error: 'Project not found or you are not the owner',
 		});
 		const ctx = createMockContext();
 
-		await expect(
-			shareProjectWithOrg({ project_id: VALID_UUID, organization_id: OTHER_UUID }, ctx)
-		).rejects.toThrow('Project not found or you are not the owner');
+		const result = await shareProjectWithOrg({ project_id: VALID_UUID, organization_id: OTHER_UUID }, ctx);
+
+		expect(result.isError).toBe(true);
+		expect(result.result).toMatchObject({ error: 'Project not found or you are not the owner' });
 	});
 
 	it('should share project successfully with default permission', async () => {
@@ -616,16 +633,17 @@ describe('shareProjectWithOrg', () => {
 		expect(result.result).toMatchObject({ success: true });
 	});
 
-	it('should throw error when share already exists', async () => {
+	it('should return error when share already exists', async () => {
 		mockApiClient.shareProjectWithOrg.mockResolvedValue({
 			ok: false,
 			error: 'Project is already shared with this organization',
 		});
 		const ctx = createMockContext();
 
-		await expect(
-			shareProjectWithOrg({ project_id: VALID_UUID, organization_id: OTHER_UUID }, ctx)
-		).rejects.toThrow('Project is already shared with this organization');
+		const result = await shareProjectWithOrg({ project_id: VALID_UUID, organization_id: OTHER_UUID }, ctx);
+
+		expect(result.isError).toBe(true);
+		expect(result.result).toMatchObject({ error: 'Project is already shared with this organization' });
 	});
 });
 
@@ -673,20 +691,21 @@ describe('updateProjectShare', () => {
 		expect(result.result).toMatchObject({ success: true });
 	});
 
-	it('should throw error when update fails', async () => {
+	it('should return error when update fails', async () => {
 		mockApiClient.updateProjectShare.mockResolvedValue({
 			ok: false,
 			error: 'Failed to update share',
 		});
 		const ctx = createMockContext();
 
-		await expect(
-			updateProjectShare({
-				project_id: VALID_UUID,
-				organization_id: OTHER_UUID,
-				permission: 'write',
-			}, ctx)
-		).rejects.toThrow('Failed to update share');
+		const result = await updateProjectShare({
+			project_id: VALID_UUID,
+			organization_id: OTHER_UUID,
+			permission: 'write',
+		}, ctx);
+
+		expect(result.isError).toBe(true);
+		expect(result.result).toMatchObject({ error: 'Failed to update share' });
 	});
 });
 
@@ -732,16 +751,17 @@ describe('unshareProject', () => {
 		});
 	});
 
-	it('should throw error when delete fails', async () => {
+	it('should return error when delete fails', async () => {
 		mockApiClient.unshareProject.mockResolvedValue({
 			ok: false,
 			error: 'Failed to unshare project',
 		});
 		const ctx = createMockContext();
 
-		await expect(
-			unshareProject({ project_id: VALID_UUID, organization_id: OTHER_UUID }, ctx)
-		).rejects.toThrow('Failed to unshare project');
+		const result = await unshareProject({ project_id: VALID_UUID, organization_id: OTHER_UUID }, ctx);
+
+		expect(result.isError).toBe(true);
+		expect(result.result).toMatchObject({ error: 'Failed to unshare project' });
 	});
 });
 
@@ -791,15 +811,16 @@ describe('listProjectShares', () => {
 		expect(result.result).toMatchObject({ count: 1 });
 	});
 
-	it('should throw error when query fails', async () => {
+	it('should return error when query fails', async () => {
 		mockApiClient.listProjectShares.mockResolvedValue({
 			ok: false,
 			error: 'Failed to list shares',
 		});
 		const ctx = createMockContext();
 
-		await expect(
-			listProjectShares({ project_id: VALID_UUID }, ctx)
-		).rejects.toThrow('Failed to list shares');
+		const result = await listProjectShares({ project_id: VALID_UUID }, ctx);
+
+		expect(result.isError).toBe(true);
+		expect(result.result).toMatchObject({ error: 'Failed to list shares' });
 	});
 });

package/src/handlers/organizations.ts

@@ -107,7 +107,7 @@ export const listOrganizations: Handler = async (_args, _ctx) => {
 	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 };
@@ -124,7 +124,7 @@ export const createOrganization: Handler = async (args, _ctx) => {
 	});
 
 	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 };
@@ -147,7 +147,7 @@ export const updateOrganization: Handler = async (args, _ctx) => {
 	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 };
@@ -160,7 +160,7 @@ export const deleteOrganization: Handler = async (args, _ctx) => {
 	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 };
@@ -177,7 +177,7 @@ export const listOrgMembers: Handler = async (args, _ctx) => {
 	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 };
@@ -190,7 +190,7 @@ export const inviteMember: Handler = async (args, _ctx) => {
 	const response = await apiClient.inviteMember(organization_id, email, role as AssignableRole);
 
 	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 };
@@ -207,7 +207,7 @@ export const updateMemberRole: Handler = async (args, _ctx) => {
 	const response = await apiClient.updateMemberRole(organization_id, user_id, role as 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 };
@@ -220,7 +220,7 @@ export const removeMember: Handler = async (args, _ctx) => {
 	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 };
@@ -233,7 +233,7 @@ export const leaveOrganization: Handler = async (args, _ctx) => {
 	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 };
@@ -250,7 +250,7 @@ export const shareProjectWithOrg: Handler = async (args, _ctx) => {
 	const response = await apiClient.shareProjectWithOrg(project_id, organization_id, permission as 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 };
@@ -263,7 +263,7 @@ export const updateProjectShare: Handler = async (args, _ctx) => {
 	const response = await apiClient.updateProjectShare(project_id, organization_id, permission as 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 };
@@ -276,7 +276,7 @@ export const unshareProject: Handler = async (args, _ctx) => {
 	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 };
@@ -289,7 +289,7 @@ export const listProjectShares: Handler = async (args, _ctx) => {
 	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/src/handlers/progress.test.ts

@@ -103,19 +103,22 @@ describe('logProgress', () => {
 		expect(mockApiClient.logProgress).toHaveBeenCalled();
 	});
 
-	it('should throw error when API call fails', async () => {
+	it('should return error when API call fails', async () => {
 		mockApiClient.logProgress.mockResolvedValue({
 			ok: false,
 			error: 'Insert failed',
 		});
 		const ctx = createMockContext();
 
-		await expect(
-			logProgress({
-				project_id: '123e4567-e89b-12d3-a456-426614174000',
-				summary: 'Progress',
-			}, ctx)
-		).rejects.toThrow('Failed to log progress: Insert failed');
+		const result = await logProgress({
+			project_id: '123e4567-e89b-12d3-a456-426614174000',
+			summary: 'Progress',
+		}, ctx);
+
+		expect(result.isError).toBe(true);
+		expect(result.result).toMatchObject({
+			error: 'Insert failed',
+		});
 	});
 
 	it('should throw error for missing project_id', async () => {
@@ -246,18 +249,21 @@ describe('getActivityFeed', () => {
 		);
 	});
 
-	it('should throw error when API call fails', async () => {
+	it('should return error when API call fails', async () => {
 		mockApiClient.getActivityFeed.mockResolvedValue({
 			ok: false,
 			error: 'Query failed',
 		});
 		const ctx = createMockContext();
 
-		await expect(
-			getActivityFeed(
-				{ project_id: '123e4567-e89b-12d3-a456-426614174000' },
-				ctx
-			)
-		).rejects.toThrow('Failed to fetch activity feed: Query failed');
+		const result = await getActivityFeed(
+			{ project_id: '123e4567-e89b-12d3-a456-426614174000' },
+			ctx
+		);
+
+		expect(result.isError).toBe(true);
+		expect(result.result).toMatchObject({
+			error: 'Query failed',
+		});
 	});
 });

package/src/handlers/progress.ts

@@ -42,7 +42,7 @@ export const logProgress: Handler = async (args, ctx) => {
 	});
 
 	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 } };
@@ -62,7 +62,7 @@ export const getActivityFeed: Handler = async (args, _ctx) => {
 	});
 
 	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 || [] } };